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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 48 insertions, 2 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/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)