Fix bug 248554, thanks Bent Karwatzki <spasswolf@web.de>. Fixed building with forced as-needed to test the gcc-4 patch.

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)

5 files changed, 58 insertions, 25 deletions

diff --git a/x11-misc/bbsload/ChangeLog b/x11-misc/bbsload/ChangeLog
index c74d25c06f9c..571b6a576419 100644
--- a/x11-misc/bbsload/ChangeLog
+++ b/x11-misc/bbsload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/bbsload
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/ChangeLog,v 1.18 2008/09/22 12:59:14 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/ChangeLog,v 1.19 2008/12/17 23:55:11 loki_val Exp $
+
+  17 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/bbsload-0.2.8-as-needed.patch, +files/bbsload-0.2.8-gcc43.patch,
+  -bbsload-0.2.6.ebuild, bbsload-0.2.8.ebuild:
+  Fix bug 248554, thanks Bent Karwatzki <spasswolf@web.de>. Fixed building
+  with forced as-needed to test the gcc-4 patch.
 
   22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml:
   Change herd from commonbox to desktop-wm.
diff --git a/x11-misc/bbsload/bbsload-0.2.6.ebuild b/x11-misc/bbsload/bbsload-0.2.6.ebuild
deleted file mode 100644
index 839c21ff764f..000000000000
--- a/x11-misc/bbsload/bbsload-0.2.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.6.ebuild,v 1.6 2005/07/11 23:00:24 swegener Exp $
-
-IUSE=""
-DESCRIPTION="blackbox load monitor"
-SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
-HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbsload"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-
-DEPEND="virtual/blackbox"
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog NEWS TODO data/README.bbsload
-}
diff --git a/x11-misc/bbsload/bbsload-0.2.8.ebuild b/x11-misc/bbsload/bbsload-0.2.8.ebuild
index 037da2f1b642..2944c8ac958c 100644
--- a/x11-misc/bbsload/bbsload-0.2.8.ebuild
+++ b/x11-misc/bbsload/bbsload-0.2.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.8.ebuild,v 1.11 2006/12/03 10:58:49 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.8.ebuild,v 1.12 2008/12/17 23:55:11 loki_val Exp $
+
+inherit autotools
 
 DESCRIPTION="blackbox load monitor"
 SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
@@ -11,13 +13,19 @@ KEYWORDS="x86 sparc ppc"
 IUSE=""
 
 RDEPEND="virtual/blackbox"
-DEPEND="${RDEPEND}
-	=sys-devel/automake-1.7*"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
 
 src_compile() {
 	econf || die
-	# needs automake 1.7. breaks with emake.
-	WANT_AUTOMAKE="1.7" make || die
+	emake || die
 }
 
 src_install () {
diff --git a/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch b/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch
new file mode 100644
index 000000000000..fd3aa0a42de3
--- /dev/null
+++ b/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch
@@ -0,0 +1,23 @@
+diff -NrU5 bbsload-0.2.8.orig/configure.in bbsload-0.2.8/configure.in
+--- bbsload-0.2.8.orig/configure.in	2008-12-18 00:44:23.000000000 +0100
++++ bbsload-0.2.8/configure.in	2008-12-18 00:46:33.000000000 +0100
+@@ -87,16 +87,16 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(malloc.h)
+ 
diff --git a/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch b/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch
new file mode 100644
index 000000000000..e506ca26d808
--- /dev/null
+++ b/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch
@@ -0,0 +1,14 @@
+diff -aur bbsload-0.2.8.old/resource.hh bbsload-0.2.8/resource.hh
+--- bbsload-0.2.8.old/resource.hh	2008-11-25 18:09:55.000000000 +0100
++++ bbsload-0.2.8/resource.hh	2008-11-25 18:12:49.000000000 +0100
+@@ -121,8 +121,8 @@
+ {
+ 
+ public:
+-    Resource::Resource(ToolWindow *);
+-    Resource::~Resource(void);
++    Resource(ToolWindow *);
++    ~Resource(void);
+ 
+     struct FRAME frame;
+     struct LABEL label;