Fix building with -Wl,--as-needed wrt #248013 by Kacper Kowalik.

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

4 files changed, 32 insertions, 19 deletions

diff --git a/net-irc/bobotpp/ChangeLog b/net-irc/bobotpp/ChangeLog
index 2a940d93f93d..31354699ac0d 100644
--- a/net-irc/bobotpp/ChangeLog
+++ b/net-irc/bobotpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/bobotpp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/ChangeLog,v 1.20 2008/04/18 16:37:46 cla Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/ChangeLog,v 1.21 2009/12/21 15:33:35 ssuominen Exp $
+
+  21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> bobotpp-2.2.2.ebuild,
+  +files/bobotpp-2.2.2-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #248013 by Kacper Kowalik.
 
   18 Apr 2008; Dawid Węgliński <cla@gentoo.org>
   +files/bobotpp-2.2.2-gcc43.patch, bobotpp-2.2.2.ebuild:
diff --git a/net-irc/bobotpp/Manifest b/net-irc/bobotpp/Manifest
index 0a3978269df8..4fe1e1ae81f4 100644
--- a/net-irc/bobotpp/Manifest
+++ b/net-irc/bobotpp/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX bobotpp-2.2.2-asneeded.patch 568 RMD160 3729f51a39dad2d31545597eb57fa85d9417a88e SHA1 bee047f69a02ba74730f64a4a0d0991412ec710e SHA256 295ffe8d16f73f7c451e571d306ae036d103471d622672d21247849942b2e300
 AUX bobotpp-2.2.2-gcc43.patch 3810 RMD160 05a5955b996e3c74efa406e6ce4ff8b141310b66 SHA1 67d3d1574bbef07af2f52c108fd7169c30173a06 SHA256 f6a39c5a2b0334c706c6926e461515f2c155546ae1c7ed02d55726e93c7c46ca
 DIST bobotpp-2.2.2.tar.gz 297282 RMD160 66ffe244a3be13da4cdd18be9624e744ad9482d5 SHA1 e832288efe8a2ee1e4860df363df2528657cfab1 SHA256 cb2f471d3eb33b351e1ca37f4806b82a1a16cef3ade5c3a1c0ac7a9e0d50c882
-EBUILD bobotpp-2.2.2.ebuild 1301 RMD160 702f4f518d597139011415e6d9d761234ae68f29 SHA1 6b6508ee7491e0cd98b1ef8f7b2e254f60030bf6 SHA256 0302d17874544f17082f75d7486fce7f77edf3f530bd6b4cad755390d9b8dd78
-MISC ChangeLog 2717 RMD160 b39b619699468721b1a0af39bfe138b56a7a844b SHA1 6322c2e84bde9a083cb1c82c402779f7ea7fd786 SHA256 a1ca865201554064d234bd92034dbdfecc82acae863e90c1aac34a5e26c21fbc
+EBUILD bobotpp-2.2.2.ebuild 1386 RMD160 876090032be3d06a3efbb6d6945512a42fe10fe3 SHA1 99ba272b269a3d56254ef4fa7eb8779a4fd4ad39 SHA256 24c8c4addfc61722caedc3f00f5e07164a346670c9db168b4464d3eb1b069385
+MISC ChangeLog 2906 RMD160 f31f176d238f618ce76c09bb6e3c0c292981cd2e SHA1 4144cfac1e2ff08d8652a81b6edc3a40194eff49 SHA256 091fc6eaa1acd57cf379804460047538bc406ffa9a4f3e0e26bed767a8f06ac7
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFICM5nUPEOwClectkRAgm4AJ9/C7bvLCWN6YA/sococXboPrWC2ACfVDVq
-kW8DK/EkeEEdiKLZGYYwN2o=
-=t6is
------END PGP SIGNATURE-----
diff --git a/net-irc/bobotpp/bobotpp-2.2.2.ebuild b/net-irc/bobotpp/bobotpp-2.2.2.ebuild
index 0f180075de6d..f35f9899e1c3 100644
--- a/net-irc/bobotpp/bobotpp-2.2.2.ebuild
+++ b/net-irc/bobotpp/bobotpp-2.2.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.2.2.ebuild,v 1.5 2008/04/18 16:37:46 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.2.2.ebuild,v 1.6 2009/12/21 15:33:35 ssuominen Exp $
 
-inherit eutils
+WANT_AUTOMAKE=1.7
+
+inherit autotools eutils
 
 DESCRIPTION="A flexible IRC bot scriptable in scheme"
 HOMEPAGE="http://unknownlamer.org/code/bobot.html"
@@ -17,8 +19,9 @@ DEPEND="guile? ( dev-scheme/guile )"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/bobotpp-2.2.2-gcc43.patch"
+	epatch "${FILESDIR}"/bobotpp-2.2.2-gcc43.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch b/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch
new file mode 100644
index 000000000000..e960e008f187
--- /dev/null
+++ b/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch
@@ -0,0 +1,15 @@
+--- bobotpp-2.2.2.orig/configure.ac	2006-06-29 02:02:46.000000000 +0200
++++ bobotpp-2.2.2/configure.ac	2009-10-15 19:31:42.058285332 +0200
+@@ -58,9 +58,9 @@
+ AC_CPP_STL_IOSBASE
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(crypt, crypt, [LDFLAGS="-lcrypt $LDFLAGS]")
+-AC_CHECK_LIB(socket, socket, [LDFLAGS="-lsocket $LDFLAGS]")
+-AC_CHECK_LIB(nsl, connect, [LDFLAGS="-lnsl $LDFLAGS]")
++AC_CHECK_LIB(crypt, crypt)
++AC_CHECK_LIB(socket, socket)
++AC_CHECK_LIB(nsl, connect)
+ 
+ dnl CC++ is special (no function to check_lib on
+ dnl AC_CHECK_PROG(CCGNU_FOUND, [ccgnu2-config],