Fix build with as-needed wrt bug 248548. Thanks Diego for the report. Fix installation of docs

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 125 insertions, 12 deletions

diff --git a/x11-misc/bbappconf/ChangeLog b/x11-misc/bbappconf/ChangeLog
index 5bf382b0907c..a447f61b60c7 100644
--- a/x11-misc/bbappconf/ChangeLog
+++ b/x11-misc/bbappconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/bbappconf
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/ChangeLog,v 1.11 2008/09/22 12:33:58 omp Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/ChangeLog,v 1.12 2010/06/08 16:46:38 xarthisius Exp $
+
+  08 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  bbappconf-0.0.2.ebuild, +files/bbappconf-0.0.2-asneeded.patch,
+  +files/bbappconf-0.0.2-docs.patch:
+  Fix build with as-needed wrt bug 248548. Thanks Diego for the report.
+  Fix installation of docs
 
   22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml:
   Change herd from commonbox to desktop-wm.
diff --git a/x11-misc/bbappconf/bbappconf-0.0.2.ebuild b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
index 6ac3fcf1bf1e..08f72858613f 100644
--- a/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
+++ b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/bbappconf-0.0.2.ebuild,v 1.8 2006/12/07 02:20:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/bbappconf-0.0.2.ebuild,v 1.9 2010/06/08 16:46:39 xarthisius Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="utility that allows you to specify window properties in blackbox"
 HOMEPAGE="http://bbtools.windsofstorm.net/"
@@ -10,23 +10,27 @@ SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND="virtual/blackbox"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-sigsegv.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-sigsegv.diff \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-docs.patch
+	eautoreconf
 }
 
 src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
+	econf $(use_enable debug)
+	emake || die
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO data/README.bbappconf || die
 }
diff --git a/x11-misc/bbappconf/files/bbappconf-0.0.2-asneeded.patch b/x11-misc/bbappconf/files/bbappconf-0.0.2-asneeded.patch
new file mode 100644
index 000000000000..1a2008218c69
--- /dev/null
+++ b/x11-misc/bbappconf/files/bbappconf-0.0.2-asneeded.patch
@@ -0,0 +1,89 @@
+Fixing build with --as-needed
+
+https://bugs.gentoo.org/show_bug.cgi?id=248548
+
+--- configure.in
++++ configure.in
+@@ -5,38 +5,25 @@
+ 
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
+-
+-
+ AC_CHECK_PROGS(regex_cmd, sed)
+ if test x$regex_cmd = "x"; then
+  AC_MSG_ERROR([error. sed is required to build the default bbtoolsrc file.])
+ fi
+ 
+-
+-dnl get the debug values right
+-AC_DEFUN(AC_SET_DEBUG,
+-[
+- test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+-])
+-
+-AC_DEFUN(AC_SET_NODEBUG,
+-[
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
+-])
+-      
+-
++dnl Check for debug
++DEBUG=""
++AC_MSG_CHECKING([whether to enable debug code])
+ AC_ARG_ENABLE(debug,[  --enable-debug	create debugging code [default=no]],
+-[
+-if test $enableval = "no";
+- then AC_SET_NODEBUG
+- else AC_SET_DEBUG
+-fi
+-],
+-AC_SET_NODEBUG)
++  if test x$enableval = "xyes"; then
++    AC_MSG_RESULT([yes])
++    DEBUG="-DDEBUG"
++  else
++    AC_MSG_RESULT([no])
++  fi,
++  AC_MSG_RESULT([no])
++  DEBUG=""
++)
++AC_SUBST(DEBUG)
+ 
+ dnl Check for Interlacing
+ INTERLACE=""
+@@ -69,15 +56,8 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+-
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+-
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++AC_CHECK_LIB(X11, XOpenDisplay,,AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- Makefile.am
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@  @INTERLACE@ \
++AM_CPPFLAGS =	@DEBUG@ @INTERLACE@ \
+ 		-DGLOBAL_BB=\"$(datadir)/bbtools/bbappconf.bb\" \
+ 		-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbappconf.nobb\"
+ 
+@@ -18,4 +18,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbappconf_LDADD = @X_LIBS@
++bbappconf_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
diff --git a/x11-misc/bbappconf/files/bbappconf-0.0.2-docs.patch b/x11-misc/bbappconf/files/bbappconf-0.0.2-docs.patch
new file mode 100644
index 000000000000..b92e92faae73
--- /dev/null
+++ b/x11-misc/bbappconf/files/bbappconf-0.0.2-docs.patch
@@ -0,0 +1,14 @@
+Don't install README to /usr/share/${PN}
+
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -1,8 +1,7 @@
+ configdir = $(datadir)/bbtools
+ 
+ config_DATA =	bbappconf.bb \
+-		bbappconf.nobb \
+-		README.bbappconf
++		bbappconf.nobb
+ 
+ EXTRA_DIST = $(config_DATA)
+