Fix build with glibc-2.10. Bug #272655

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 99 insertions, 13 deletions

diff --git a/games-action/xpilot-ng/ChangeLog b/games-action/xpilot-ng/ChangeLog
index 6aeebff2df97..7aab0f704c4e 100644
--- a/games-action/xpilot-ng/ChangeLog
+++ b/games-action/xpilot-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xpilot-ng
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.10 2007/10/02 03:53:18 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.11 2009/06/08 10:45:13 tupone Exp $
+
+  08 Jun 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/xpilot-ng-4.7.2-glibc210.patch, xpilot-ng-4.7.2-r1.ebuild:
+  Fix build with glibc-2.10. Bug #272655 by Diego Petteno'
 
   02 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> xpilot-ng-4.7.2-r1.ebuild:
   Lock wxpython to 2.6.
diff --git a/games-action/xpilot-ng/Manifest b/games-action/xpilot-ng/Manifest
index af1c88c6d91d..24648e3406e2 100644
--- a/games-action/xpilot-ng/Manifest
+++ b/games-action/xpilot-ng/Manifest
@@ -1,6 +1,7 @@
+AUX xpilot-ng-4.7.2-glibc210.patch 2583 RMD160 cb4e486551c6726e792fa79453be82d283bfffe9 SHA1 d851356286d3f27b3ee436cf2ad0bf5dc1c57b8e SHA256 43f6d1130151a9274396a04d3a7d2cf27fd057e5b93c0d9d6b32c76bcbf4f4a7
 AUX xpilot-ng-4.7.2-xpngcc.patch 648 RMD160 f5bae034c80cb972ee6235ca2bf8d23c1b5df3bb SHA1 76dcaeed120b7f95daa6ac50806fbd250922ba49 SHA256 12973a163663e6a5f560737742dc51b0f0ba258ac01ea255184a8c70eda3d870
 DIST xpilot-ng-4.7.2.tar.gz 2807988 RMD160 acc4266fd14467168cf3412ed747c5377b34ed41 SHA1 b61f05c9041866bcb58d7808dfd1dba09a6e930e SHA256 31ef0f6b40779dd0ac5eb1bd17dd0908174e52991413fe25d623b6336d480fc0
 DIST xpilot-ng.png 3898 RMD160 a68fe7ffb0b2d4225b95233be950d65dc527c3ad SHA1 3461e7cccd99d006542bfa97d8f1dd63abd8967d SHA256 6c9ba1bb1d0bf20428df32453cc66b2fa93b28bebcb75237ccb3052e8e8c8dde
-EBUILD xpilot-ng-4.7.2-r1.ebuild 1805 RMD160 c573cd9ce5dca562b98defafda6239609fe55263 SHA1 3bb9d8051f31abe337d0fa875dd0449ddd002d9f SHA256 c0c3c8962d2475967a9c0231d30a99f65a0eca4c49b725e1fcf7efc5febb3f79
-MISC ChangeLog 1639 RMD160 1ed9f008f03562af8e410db401fb205965184efa SHA1 0bfd03137f72eaa2c0ee9af7fe85727bbefb234e SHA256 3532f44c80f6dcf4cf7b4f9a145e30df42d39cd42194c69c81e11688dbde7396
+EBUILD xpilot-ng-4.7.2-r1.ebuild 1796 RMD160 83f1c19a8ba0340bf58e4637ecb0404028debc73 SHA1 d14e4a1d147a1c0c94316ea288a4e4ec588e5446 SHA256 7c9219a7c4e0a421be6665896aa47c58ebb1469f83f1d8942ba2a8875158819a
+MISC ChangeLog 1814 RMD160 73ee4538dab19f0670cd99349291dfc9ed348ba2 SHA1 0f4876ee39fa71f70689e06d9355b8d0833435be SHA256 53349b9ca191001bd1342538005891196925e96cae7663bab2496ef6797ac2bb
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-action/xpilot-ng/files/xpilot-ng-4.7.2-glibc210.patch b/games-action/xpilot-ng/files/xpilot-ng-4.7.2-glibc210.patch
new file mode 100644
index 000000000000..6c91cd6c6f04
--- /dev/null
+++ b/games-action/xpilot-ng/files/xpilot-ng-4.7.2-glibc210.patch
@@ -0,0 +1,83 @@
+--- src/client/textinterface.c.old	2009-06-08 12:41:13.000000000 +0200
++++ src/client/textinterface.c	2009-06-08 12:41:35.000000000 +0200
+@@ -37,7 +37,7 @@
+ /*
+  * just like fgets() but strips newlines like gets().
+  */
+-static char* getline(char* buf, int len, FILE* stream)
++static char* mygetline(char* buf, int len, FILE* stream)
+ {
+     char		*nl;
+ 
+@@ -251,7 +251,7 @@
+ 	else if (!auto_connect) {
+ 	    printf("*** Server on %s. Enter command> ", conpar->server_name);
+ 
+-	    getline(linebuf, MAX_LINE, stdin);
++	    mygetline(linebuf, MAX_LINE, stdin);
+ 	    if (feof(stdin)) {
+ 		puts("");
+ 		c = 'Q';
+@@ -338,7 +338,7 @@
+ 	    case 'K':
+ 		printf("Enter name of victim: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin)) {
++		if (!mygetline(linebuf, MAX_LINE, stdin)) {
+ 		    printf("Nothing changed.\n");
+ 		    continue;
+ 		}
+@@ -349,7 +349,7 @@
+ 	    case 'M':				/* Send a message to server. */
+ 		printf("Enter message: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin) || !linebuf[0]) {
++		if (!mygetline(linebuf, MAX_LINE, stdin) || !linebuf[0]) {
+ 		    printf("No message sent.\n");
+ 		    continue;
+ 		}
+@@ -364,7 +364,7 @@
+ 	    case 'D':				/* Shutdown */
+ 		if (!auto_shutdown) {
+ 		    printf("Enter delay in seconds or return for cancel: ");
+-		    getline(linebuf, MAX_LINE, stdin);
++		    mygetline(linebuf, MAX_LINE, stdin);
+ 		    /*
+ 		     * No argument = cancel shutdown = arg_int=0
+ 		     */
+@@ -375,7 +375,7 @@
+ 			    delay = 1;
+ 
+ 		    printf("Enter reason: ");
+-		    getline(linebuf, MAX_LINE, stdin);
++		    mygetline(linebuf, MAX_LINE, stdin);
+ 		} else {
+ 		    strlcpy(linebuf, shutdown_reason, sizeof(linebuf));
+ 		    delay = 60;
+@@ -388,7 +388,7 @@
+ 	    case 'O':				/* Tune an option. */
+ 		printf("Enter option: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin)
++		if (!mygetline(linebuf, MAX_LINE, stdin)
+ 		    || (len=strlen(linebuf)) == 0) {
+ 		    printf("Nothing changed.\n");
+ 		    continue;
+@@ -396,7 +396,7 @@
+ 		printf("Enter new value for %s: ", linebuf);
+ 		fflush(stdout);
+ 		strcat(linebuf, ":"); len++;
+-		if (!getline(&linebuf[len], MAX_LINE-len, stdin)
++		if (!mygetline(&linebuf[len], MAX_LINE-len, stdin)
+ 		    || linebuf[len] == '\0') {
+ 		    printf("Nothing changed.\n");
+ 		    continue;
+@@ -450,7 +450,7 @@
+ 	    case 'T':				/* Set team. */
+ 		printf("Enter team: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin)
++		if (!mygetline(linebuf, MAX_LINE, stdin)
+ 		    || (len = strlen(linebuf)) == 0)
+ 		    printf("Nothing changed.\n");
+ 		else {
diff --git a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
index 56c8fb7d91df..4b72d6bcbd8c 100644
--- a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
+++ b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.5 2007/10/02 03:53:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.6 2009/06/08 10:45:13 tupone Exp $
+EAPI=2
 
 inherit python eutils multilib games
 
@@ -30,10 +31,9 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"-xpngcc.patch
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-xpngcc.patch \
+		"${FILESDIR}"/${P}-glibc210.patch
 
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
@@ -41,15 +41,13 @@ src_unpack() {
 		|| die "sed failed"
 }
 
-src_compile() {
+src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
 		$(use_enable sdl sdl-client) \
 		$(use_enable sdl sdl-gameloop) \
 		$(use_enable openal sound) \
 		|| die
-
-	emake || die "emake failed"
 }
 
 src_install() {