Fixing build with as-needed wrt bug 248555. Thanks Diego for report

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

4 files changed, 74 insertions, 16 deletions

diff --git a/x11-misc/bbtime/ChangeLog b/x11-misc/bbtime/ChangeLog
index 2ffb6efd1c8f..6935f3608539 100644
--- a/x11-misc/bbtime/ChangeLog
+++ b/x11-misc/bbtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/bbtime
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbtime/ChangeLog,v 1.12 2008/09/22 12:59:51 omp Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbtime/ChangeLog,v 1.13 2010/05/30 17:29:23 xarthisius Exp $
+
+  30 May 2010; Kacper Kowalik <xarthisius@gentoo.org> bbtime-0.1.5.ebuild,
+  +files/bbtime-0.1.5-asneeded.patch:
+  Fixing build with as-needed wrt bug 248555. Thanks Diego for report
 
   22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml:
   Change herd from commonbox to desktop-wm.
diff --git a/x11-misc/bbtime/Manifest b/x11-misc/bbtime/Manifest
index 538d4aef6d8b..5cec48a0fad2 100644
--- a/x11-misc/bbtime/Manifest
+++ b/x11-misc/bbtime/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bbtime-0.1.5-asneeded.patch 1074 RMD160 8688011d7b3b4472a98455aa795ece2efb11a33f SHA1 a5503cab9bdf37304482965928f2b72c66408cc0 SHA256 b187f4e14a7a80cfbd85dd529d4744a3188d30c4b4e8659073985152d3b67020
 DIST bbtime-0.1.5.tar.gz 68842 RMD160 302d012aea9ffdbaa6409e1893ad6430b559582c SHA1 c6969e484a67e7848609ec93c919d54ebb536f71 SHA256 e5ee51b43e5f7014059ae9e66b00a13410a781ecfac84774dcb66d7f3371dd00
-EBUILD bbtime-0.1.5.ebuild 796 RMD160 1e5554bc91b6555443e7c953b7fce5b2b2831979 SHA1 0c7ddc444a1e7f2666ad0668b0c42987f43d129d SHA256 9e46a898d5ceb6696e011a547d4d085cb59cb7eed0a6593c0b56c90a1b2214eb
-MISC ChangeLog 1466 RMD160 c0905277b6c28a5b54f7185ff596cf9efaaa4ce1 SHA1 b40fd47b644018d58470a899141427f2575e0588 SHA256 880efc3a58c9dc68361746ccafba4323dc1c5cf4a2bcbadfb494124f9f7beca4
+EBUILD bbtime-0.1.5.ebuild 1007 RMD160 d375ee375001e92db0245230c08c57d54c7549af SHA1 ae5628455741c4b4636d50248df5400ea69f289c SHA256 b8e2f170b9bb6758fb0a009a3405dac586aa9550f6b649997d84123dc0b784e1
+MISC ChangeLog 1657 RMD160 555f62a393cc4c8e562eed674dc24d9b6f73a925 SHA1 5c9459f48a9125fb32e27c968fa1a7d0bf1e36c5 SHA256 18453562e1ac1677070cc7ae2958b0c756ba292752f6eed6903bd599f1e9e9da
 MISC metadata.xml 229 RMD160 7f093eeda5b0dbc714903ba4ddf8bcb2ddd0add7 SHA1 cdb01541648905bc0d3c9b7c8402e538b1d433ba SHA256 f9e4248a97ea90a15a67e4500362639dbcfb9629b18033b39ed2bfc7bf84604b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEUEARECAAYFAkjXls4ACgkQvSApE0uP4UvlRQCY4l4JfNiS4pkXbOmy1D3v0umk
-/gCcCe1DgNjue0kA0FglkdJiP/fWslg=
-=g+2w
+iJwEAQECAAYFAkwCoH8ACgkQIiMqcbOVdxQMjAP+ORZnakxnDuADEVueBn7erP1k
++42luZkZzUi+6aY0I0WICEIyB8CoUU2r0cKh6s2aNPJcfTAEv33ONJ3anGCFScXW
+Q9FJmro6ZzsnKDRG+Ggno8XgalXy4oV45BY8m320yvzcVCmrvq/S69ItWXN1dnUN
+F9yIw+z2K1hK54tt2NI=
+=HQSZ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/bbtime/bbtime-0.1.5.ebuild b/x11-misc/bbtime/bbtime-0.1.5.ebuild
index aba5be585b6e..c52daa4bbfda 100644
--- a/x11-misc/bbtime/bbtime-0.1.5.ebuild
+++ b/x11-misc/bbtime/bbtime-0.1.5.ebuild
@@ -1,6 +1,10 @@
-# 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/bbtime/bbtime-0.1.5.ebuild,v 1.8 2006/12/07 02:28:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbtime/bbtime-0.1.5.ebuild,v 1.9 2010/05/30 17:29:23 xarthisius Exp $
+
+EAPI=2
+
+inherit autotools eutils
 
 DESCRIPTION="blackbox time watcher"
 HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbtime"
@@ -8,17 +12,25 @@ SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="virtual/blackbox"
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}
+	virtual/blackbox"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog NEWS TODO
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbtime || die
 
+	rm "${D}"/usr/share/bbtools/README.bbtime
 	# since multiple bbtools packages provide this file, install
 	# it in /usr/share/doc/${PF}
-	mv ${D}/usr/share/bbtools/bbtoolsrc.in \
-		${D}/usr/share/doc/${PF}/bbtoolsrc.example
+	mv "${D}/usr/share/bbtools/bbtoolsrc.in" \
+		"${D}/usr/share/doc/${PF}/bbtoolsrc.example"
 }
diff --git a/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch b/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch
new file mode 100644
index 000000000000..17788812d8a2
--- /dev/null
+++ b/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch
@@ -0,0 +1,39 @@
+Fixing build with as-needed
+
+https://bugs.gentoo.org/show_bug.cgi?id=248555
+
+--- configure.in
++++ configure.in
+@@ -47,14 +47,9 @@
+ 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,5 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@ \
+-		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
++AM_CPPFLAGS =	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
+ 		-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\"
+ 
+ 
+@@ -14,4 +13,5 @@
+ 		 timemenu.cc timemenu.hh \
+ 		 blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbtime_LDADD = @X_LIBS@
++bbtime_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++bbtime_CFLAGS = @X_PRE_CFLAGS@ @X_CGLAGS@ @X_EXTRA_CFLAGS@