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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 65 insertions, 10 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/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@