Add --as-needed patch by Kevin Pyle (bug #248017); fix building with glibc 2.10.

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

5 files changed, 56 insertions, 8 deletions

diff --git a/net-irc/ezbounce/ChangeLog b/net-irc/ezbounce/ChangeLog
index e745f2ab4e21..b08c6e77dd40 100644
--- a/net-irc/ezbounce/ChangeLog
+++ b/net-irc/ezbounce/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/ezbounce
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ChangeLog,v 1.17 2009/01/14 03:59:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ChangeLog,v 1.18 2009/06/02 12:53:35 flameeyes Exp $
+
+  02 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  ezbounce-1.99.14.ebuild, +files/ezbounce-1.99.14+glibc-2.10.patch,
+  +files/ezbounce-1.99.14-asneeded.patch:
+  Add --as-needed patch by Kevin Pyle (bug #248017); fix building with glibc
+  2.10.
 
   14 Jan 2009; Mike Frysinger <vapier@gentoo.org>
   +files/ezbounce-1.99.14-build.patch, ezbounce-1.99.14.ebuild:
diff --git a/net-irc/ezbounce/Manifest b/net-irc/ezbounce/Manifest
index 8e87391a4874..32253c11134a 100644
--- a/net-irc/ezbounce/Manifest
+++ b/net-irc/ezbounce/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ezbounce-1.99.14+glibc-2.10.patch 881 RMD160 f5c6061c28cfca50638a6722f7613a914c7bbc0a SHA1 4634552a162e29edc6a5bcdc3e035021dab2e4fb SHA256 0ac92e1b1be2431f29fd60235b73368a76009a53a38e87d2c89b87c6a1116743
+AUX ezbounce-1.99.14-asneeded.patch 485 RMD160 a95ad8c2a2bf95754336a4cdd2bdd5ab3e0f700b SHA1 674c897890ef2b1d451bebbf573c05b07986cc58 SHA256 7d25d8f7ac4b3adcf5105d2a5ab9c7b954f035d8b981090415e14b1fc485ec96
 AUX ezbounce-1.99.14-build.patch 785 RMD160 c5107e8c22d68749a827d1963b74cbd7b5dc8655 SHA1 be9ed599b612a0f03a6eacf0ac0f3d67292a41d6 SHA256 d2c0f7fbe0c83bd0644c8cc80382b065c65e217307699eecbf2b3a8cdd21b6ae
 DIST ezbounce-1.04c.tar.gz 192630 RMD160 b5c35757a5b6cfab26177f3dcadd3aa0d1e3caac SHA1 9770609f4575a6e09173d2132f2a66f536956a86 SHA256 5be7b903e3682aee9d1758f60957486e4aa08da717fc763caab1415454eaebd8
 DIST ezbounce-1.99.14.tar.gz 428628 RMD160 275ac1a18264a3d302d9086bdbfcf6df86acb6b1 SHA1 1dda6ca2a20f1f3b83c1268c919b55fb8f86f2f3 SHA256 44d0ae05340c5ca5f8936a7990d119d98f3806e5550c6c5fe9d9cf7d0e1287ca
 EBUILD ezbounce-1.04c.ebuild 749 RMD160 ce942fac6a80b2ec5a7fd2a7f1c96701ba8530ed SHA1 c75e79fc9e57290df64bf19bfd05359b76fe34a1 SHA256 6af842f6a81f40def8d36d8f5db1480bc16750f45f0cdcf3e132d1037bd10e2a
-EBUILD ezbounce-1.99.14.ebuild 906 RMD160 06befb2365ee01975dd79733687e98a32c4cb8eb SHA1 0ba706e36723b2c98f7ab4706f10839a5e526099 SHA256 8f299b5f2cde513df37c301492f21620c665fa70b1a4aacb513ce3fe90137061
-MISC ChangeLog 1608 RMD160 7bed4bda72c534ca8dd6cda682cfda0a9d5aa155 SHA1 0cfeaa529669443d87ed177d389d2216b9c1d300 SHA256 33d7249716027b1c8e98372bc9aa9d9a62ff7372734b110fab1ddc70f7760c67
+EBUILD ezbounce-1.99.14.ebuild 995 RMD160 46f1ab4b80ee3eb4bd996db9f73e92712399f189 SHA1 3e9945ad14f7c71df214f38cbe97456f11b28b29 SHA256 61ea82dc97e940fa96e17896d3e9b02361118b161164bfb4debcef15004052ee
+MISC ChangeLog 1864 RMD160 d848c491ea838244d1d6cc133fc71cf5592f5e29 SHA1 140bad9abf2e2b259c96da6b0178110e524aa1d4 SHA256 e22132e52e57fcd8e3de72f960309c27f0d749b7fabd8601b3c5c5959653a8ac
 MISC metadata.xml 254 RMD160 2a8464f6a5044c49a0c78798d48f379e54331998 SHA1 6922488c7fe583e4b73a0ca4cd6cb0c376d49671 SHA256 2ca67534860e9030ee74b603ddaeebfca9b4fcfdb0c362810393a9bcee697e53
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkltYzwACgkQn/5bYzqsSmGWsQCfffV+zDF224bZoC6vjRuh6qCd
-icIAn2zcxFcdbt4Bti7/tddRYzzEGBOy
-=sf7U
+iEYEARECAAYFAkolINQACgkQAiZjviIA2XjEmQCfT9MhO6wuST6pVpH4U1U4FYUB
+qJEAoLFZ4QD4licdGTqfBsu/N/2EuWFN
+=hHtQ
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ezbounce/ezbounce-1.99.14.ebuild b/net-irc/ezbounce/ezbounce-1.99.14.ebuild
index 528697377f70..16322663ca9d 100644
--- a/net-irc/ezbounce/ezbounce-1.99.14.ebuild
+++ b/net-irc/ezbounce/ezbounce-1.99.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ezbounce-1.99.14.ebuild,v 1.2 2009/01/14 03:59:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ezbounce-1.99.14.ebuild,v 1.3 2009/06/02 12:53:35 flameeyes Exp $
 
 inherit eutils
 
@@ -22,6 +22,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-build.patch #251445
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}+glibc-2.10.patch
 }
 
 src_compile() {
diff --git a/net-irc/ezbounce/files/ezbounce-1.99.14+glibc-2.10.patch b/net-irc/ezbounce/files/ezbounce-1.99.14+glibc-2.10.patch
new file mode 100644
index 000000000000..d3be181150d0
--- /dev/null
+++ b/net-irc/ezbounce/files/ezbounce-1.99.14+glibc-2.10.patch
@@ -0,0 +1,26 @@
+Index: ezbounce-1.99.14/src/irc/server_info.cc
+===================================================================
+--- ezbounce-1.99.14.orig/src/irc/server_info.cc
++++ ezbounce-1.99.14/src/irc/server_info.cc
+@@ -131,7 +131,7 @@ int server_info::parse_numeric(const tex
+ /* static */ int server_info::get_005_token(const char * text,
+ 			const char * token, char * buf, int bufflen)
+ {
+-        char * tok = strstr(text, token);
++        const char * tok = strstr(text, token);
+ 	int c = 0;
+ 	if (!tok) {
+ 	        return 0;
+Index: ezbounce-1.99.14/src/util/tokenizer.cc
+===================================================================
+--- ezbounce-1.99.14.orig/src/util/tokenizer.cc
++++ ezbounce-1.99.14/src/util/tokenizer.cc
+@@ -45,7 +45,7 @@ char * modifying_tokenizer::next()
+ {
+ 	int state = 0;
+ 	char * p;
+-	char * d;
++	const char * d;
+ 
+ 	if (end) {
+ 		if (end_char == 0)
diff --git a/net-irc/ezbounce/files/ezbounce-1.99.14-asneeded.patch b/net-irc/ezbounce/files/ezbounce-1.99.14-asneeded.patch
new file mode 100644
index 000000000000..bb1cc2a79b9e
--- /dev/null
+++ b/net-irc/ezbounce/files/ezbounce-1.99.14-asneeded.patch
@@ -0,0 +1,12 @@
+diff -ur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2008-04-09 23:12:05.000000000 -0500
++++ b/Makefile.in	2009-01-25 16:25:43.000000000 -0600
+@@ -91,7 +91,7 @@
+ 
+ $(EXE):		$(OBJECTS)
+ 	@echo "  [LINK]    " $@ "    (options: $(CXX_LINKER_FLAGS) $(CXX_LIBS))"
+-	@$(CXX_LINKER) -o $@ $(CXX_LINKER_FLAGS) $(CXX_LIBS) $(CXX_OPTIMIZATIONS) $(OBJECTS)
++	@$(CXX_LINKER) -o $@ $(CXX_LINKER_FLAGS) $(CXX_OPTIMIZATIONS) $(OBJECTS) $(CXX_LIBS)
+ 
+ $(SYMLINK):	$(EXE)
+ 	@ln -sf $(EXE) $(SYMLINK)