Fix --as-needed bug #247331

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64

4 files changed, 26 insertions, 12 deletions

diff --git a/games-arcade/xgalaga/ChangeLog b/games-arcade/xgalaga/ChangeLog
index e6f466a8860b..5ee763add74e 100644
--- a/games-arcade/xgalaga/ChangeLog
+++ b/games-arcade/xgalaga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xgalaga
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xgalaga/ChangeLog,v 1.12 2008/12/18 21:30:29 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xgalaga/ChangeLog,v 1.13 2009/02/02 13:26:38 tupone Exp $
+
+  02 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/xgalaga-2.0.34-as-needed.patch, xgalaga-2.0.34-r6.ebuild:
+  Fix --as-needed bug #247331 by flameeyes@gentoo.org
 
   18 Dec 2008; Jeremy Olexa <darkside@gentoo.org> xgalaga-2.0.34-r6.ebuild:
   (non maintainer commit) games-arcade/xgalaga doesn't build with --as-needed,
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
index 1f904e3c54e9..2678bc604e7d 100644
--- a/games-arcade/xgalaga/Manifest
+++ b/games-arcade/xgalaga/Manifest
@@ -1,6 +1,7 @@
+AUX xgalaga-2.0.34-as-needed.patch 427 RMD160 f48b3cad458d1daa0e632bb8fd525f3df4e7ca6b SHA1 4e046562c30bd7d2d78648a30d4656d5982c942a SHA256 45d3797bf1815fef8eef42d6789a51b01c8ca46d7b8bd355bfa5bf60c05c98d3
 AUX xgalaga-2.0.34-xpaths.patch 324 RMD160 e21c40b249fbb6556a010f1c6742a5eac8190906 SHA1 be0d9c5e09c836a433936a31f1a32c7189270342 SHA256 41eea179b25c55859fcea5654d728d448d88ca8787c62731ccf2bb06f7916ba9
 DIST xgalaga_2.0.34-30.diff.gz 49219 RMD160 4f23b79d8fdd86a887be157df60ec6c992096f76 SHA1 83a2019a0ca775690dfe06d25419b7d18023f7ae SHA256 b96dfad71ce6b10a6978869297015156f60f2298fa0223f306c7059cb0d50e1d
 DIST xgalaga_2.0.34.orig.tar.gz 314189 RMD160 bf2cc91820c1cdb8e02bd35347b309cac27b3ba4 SHA1 82dcb328af0d9e779c566f4225d7f072b1c17b7d SHA256 070ad0bd3c3b2e04723f185d26b1aea4f7564677e74e865628f1933c47f37a00
-EBUILD xgalaga-2.0.34-r6.ebuild 1783 RMD160 02e23b12f3f367e8a1b119e1c836e7a7ae9c6eb9 SHA1 4e52c3d0ef617ec4c1e7dbb88813a672b76068f8 SHA256 4ffcfd56836d3867efa5345d07bd9a0f86f9b5e20e1e0d94e942b80e536dd836
-MISC ChangeLog 2675 RMD160 8860a0c8a254a6c11eb5f55c58c2e9a5a1730623 SHA1 58a22afe2f80763ba141efae1a8f22ccb85df3e3 SHA256 258952c667bf3a25f805c109a23ee0947a71fc2e75a4b7e0772e90f62b246bf6
+EBUILD xgalaga-2.0.34-r6.ebuild 1732 RMD160 242bd29caec54930265945f41707086e8d42ba62 SHA1 f482521c1cbabb13c3fd0a852be9ee83a3c446c8 SHA256 9e5a76a251e84c3b24b9f18dd68b7ab7dec7e4a7430caa16bbb4793e272f8a4d
+MISC ChangeLog 2845 RMD160 6f74f25e7740cff4f06b9b8bed75e7e24e6c7ffc SHA1 f0655e831cfbc9ef21900eba961e71bdd9aeb11d SHA256 61a67b7b615bef23a33c77443ff4b62e2773df1538e8d87bcb6ee5099b184cfc
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/xgalaga/files/xgalaga-2.0.34-as-needed.patch b/games-arcade/xgalaga/files/xgalaga-2.0.34-as-needed.patch
new file mode 100644
index 000000000000..530cc6711eaf
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.0.34-as-needed.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.old	2009-02-02 14:25:06.000000000 +0100
++++ Makefile.in	2009-02-02 14:25:34.000000000 +0100
+@@ -26,7 +26,7 @@
+ CC = @CC@
+ CFLAGS = -I. @CFLAGS@ @DEFS@ @X_CFLAGS@ -DXGALAGADIR=\"@prefix@/\" $(SOUNDDEFS)
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@ libsprite/libsprite.a @X_LIBS@
++LIBS = libsprite/libsprite.a @LIBS@ @X_LIBS@
+ INSTALL = @INSTALL@
+ 
+ OBJS = main.o images.o data.o paths.o pathfile.o title.o explosions.o \
diff --git a/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild b/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild
index a2cb7b3ab7c6..a3969781df8e 100644
--- a/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild
@@ -1,8 +1,9 @@
-# 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/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild,v 1.7 2008/12/18 22:37:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild,v 1.8 2009/02/02 13:26:38 tupone Exp $
 
-inherit eutils flag-o-matic games
+EAPI=2
+inherit eutils games
 
 DEB_VER=30
 DESCRIPTION="A Galaga clone with additional features"
@@ -23,9 +24,7 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-xpaths.patch #79496
 	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
 	sed -i \
@@ -35,11 +34,10 @@ src_unpack() {
 	sed -i \
 		-e '/SOUNDDEFS/ s:@prefix@:@prefix@/bin:' Makefile.in \
 		|| die "sed Makefile.in failed"
-	append-ldflags -Wl,--no-as-needed #247331
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_compile() {
-	egamesconf || die
 	emake CPPFLAGS="-D__NO_STRING_INLINES" || die "emake failed"
 }