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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

6 files changed, 62 insertions, 39 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/Manifest b/x11-misc/bbsload/Manifest
index 724ae97bf78a..0e2447fc462e 100644
--- a/x11-misc/bbsload/Manifest
+++ b/x11-misc/bbsload/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST bbsload-0.2.6.tar.gz 79258 RMD160 ab6d72a9d872ea60251051d26bf1fb84fc06641e SHA1 20e51d2888e7b62d8c8637d9ea66e71e07dcd18e SHA256 6ad6330953b731c96b1abf0b95f4d533a67deea154e8711fddcd982da9548db6
+AUX bbsload-0.2.8-as-needed.patch 728 RMD160 1f2f5630f7f128266531a8a6cc53e2cca1dd052a SHA1 474a9fb7448249169bf4934fd87207b0dab1ed92 SHA256 7a2453f6baf6e29d0ba4d9cfb05eefbc4048e5a1bce1a99efcf4ed2804ab28c1
+AUX bbsload-0.2.8-gcc43.patch 410 RMD160 b83d0a4cced07e010c9e675a58f174af69ba5e09 SHA1 c206ddb73613426c5babc510a23a00f15ca8bed0 SHA256 86bcc4e22f0d9d91418be00912fd5921581259217e9533987c90aed5b0339f1d
 DIST bbsload-0.2.8.tar.gz 108601 RMD160 50cb73bf159f27c92fc22babc3e39f068e6719d2 SHA1 47a19e8352981067426d185cd5296cbc7aba4d4a SHA256 bf0f9e0249e0f4ed095d9e944359b41f604ce5973ad8ec5f635c12c386522b9c
-EBUILD bbsload-0.2.6.ebuild 611 RMD160 249ed5280ff7c3e614a4632db41d070efefffd2e SHA1 f5e98e81de36ba10ba41ab9e9cd5a1603581eb27 SHA256 fdba311247a7bf83d846447c3e32b6a199dc5e3e403cd459959b73a179f2a5c8
-EBUILD bbsload-0.2.8.ebuild 762 RMD160 61ffdf72e2f55ba4b37d936707d72e6741819261 SHA1 320cebe4534a307097c53959118cab325b654743 SHA256 8486c87b694f5bf318b10a1279d51d38f79f871403b7282b3b16335dd3521519
-MISC ChangeLog 2588 RMD160 822424c8d3e6b7ca2f3714aacb23879259cd633a SHA1 2a592fa58d4d6c3fc1562f7d2ae165349b4953a9 SHA256 f7726d5248c3667bd7dadc07f40c78dc726644ad6080e5b7644017b96d565a00
+EBUILD bbsload-0.2.8.ebuild 836 RMD160 0d2581a4ed96f388b7ae3941f87fce3e63de10ac SHA1 ec83961adcfa666e7932dcd74c465dcaa9e69c2c SHA256 1c0477cb861b065bc62eb851160ada51b6461db3b78122fa837c366a55b61927
+MISC ChangeLog 2892 RMD160 75df4b5ef343518680eefeaf0abc4773d538e108 SHA1 9616a3ff9f15826f708ecfe803dab7da1818c21e SHA256 8ec8fb7e29965d81c3c522e645f010a6b91a98ca8bd85d9e415f461688a37dda
 MISC metadata.xml 227 RMD160 5cdbf5932722b3b08a5aed12046b684fdff5d987 SHA1 01175e0263cbd6607327a9fce1fa786314cad130 SHA256 5276d89886b705d53d06ec161bb301f5346012491b49ebd935400aa0639ed528
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjXlqkACgkQvSApE0uP4UtkLwCaA0u5NGtP6I52L3JOw4g9Lvm0
-CecAoJTXbDaw9YifgHHoTovo7nymS+/0
-=pcJ4
------END PGP SIGNATURE-----
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;