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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 135 insertions, 18 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/Manifest b/x11-misc/bbappconf/Manifest
index 7ebabf9325a2..d813a4be4b0c 100644
--- a/x11-misc/bbappconf/Manifest
+++ b/x11-misc/bbappconf/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bbappconf-0.0.2-asneeded.patch 2061 RMD160 e5c7d78c416f367b13bd031361c40bf144313575 SHA1 f4989d597da59ec4481929169927cebbaddd2ec6 SHA256 43c907ee9c890cb602e4f9a65822f2573282d8c4561666d193deb1d2448b8a26
+AUX bbappconf-0.0.2-docs.patch 255 RMD160 0f0828053949a0d71c70b1f043b4d8d1e60e3199 SHA1 c004f5e1256d85ba31d3d6d23f1ccc59f06b2c36 SHA256 165a4bea6beda3f7aaf2e081cb5fbb6023d9b35df0b2628a84fa0fcf095d4132
 AUX bbappconf-0.0.2-fix-sigsegv.diff 651 RMD160 cd0d8b195e0030435fe6155fb210aab15bf3036b SHA1 4b3d13c9bcd77b09bcb2da533fa07da28a278222 SHA256 83c30beb08254332409812acd9f03a6a8e7f72fbf01918a3d78063ae1d71b3ee
 DIST bbappconf-0.0.2.tar.gz 80107 RMD160 040e735e37394efb8d748fa63c01a4c46a4aa59f SHA1 13b5746f7977eea1c1175ec39ceec66926151f18 SHA256 90f02de8f9b507e53232c77f179382d1734fa63c2978070c4582dea575434705
-EBUILD bbappconf-0.0.2.ebuild 840 RMD160 df11650ffa881715192fd8c3939c382ab122fedc SHA1 1fa1912725840fdf02dc8db8d79340caea4a63ee SHA256 2392f465274548d22159ff6bd22bd88ab6d99e4ac7e7787f8ae43185cd7f5acb
-MISC ChangeLog 1688 RMD160 2cd0f1327e11c1ffb3836a522b58de1bff4b975d SHA1 5c24be5002c043ee43edb3763915d22fbbe8ab1d SHA256 c633586eefb0c9936e3e56781da71520d7e9edbca97765a7ce95e1ec93e5844d
+EBUILD bbappconf-0.0.2.ebuild 930 RMD160 6f905c6f712abafcb0ea7dbe34ef07038ccc1840 SHA1 4e52212b0fab6309c1fc5e12de23db56ee5c1b67 SHA256 346856e8647ce75fb7ac92dd917d288a6e6e75d33849ab8f5c80eedb1c60acd9
+MISC ChangeLog 1951 RMD160 153e8e56100beda16b3aebba297a82ada7ba5426 SHA1 2e0257e4efcbca42af47c85236ddee920bdc0bc3 SHA256 39df7689b85039ecc2b0d90776c0450f38f8c14f6a24b4f5b88c9b20144634cd
 MISC metadata.xml 292 RMD160 7a213dd478287d062479e19ff45f20d74169c21f SHA1 70578ac041faba6d9ed104d7c89e809d72b6038b SHA256 ec6d16323cac00c388d4b0beefb27ee61909c89c0c37e00f480fc534d1ceb946
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkjXkMIACgkQvSApE0uP4UvOkwCcDNDZ69eeIHrSl40Is05GR7VZ
-PzsAoIjJUIGVGpi8ZrqwBxe3GXc9BtQz
-=mjLe
+iJwEAQECAAYFAkwOc/kACgkQIiMqcbOVdxQTlgP9G0plWsJVoQ+NPr58LJEnceIT
+J4BNf61OjphCYI50ThnLM2tFe+36za6uFxJSQFg4izBMLcSJRZPochQU8SYNH9fn
+fFlElQyxcT0V+SRL6fhwrWYfaUen3hihtU/Ye3wsXxBui8rkN3CxA7HYH31rRBfT
+uFfgFXhte3tbg4iqRsA=
+=lO/O
 -----END PGP SIGNATURE-----
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)
+