Fix --as-needed bug #247511

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

4 files changed, 34 insertions, 13 deletions

diff --git a/games-strategy/xscorch/ChangeLog b/games-strategy/xscorch/ChangeLog
index 867a12e4e127..f80083e1ff92 100644
--- a/games-strategy/xscorch/ChangeLog
+++ b/games-strategy/xscorch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/xscorch
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/ChangeLog,v 1.12 2008/03/25 15:42:11 coldwind Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/ChangeLog,v 1.13 2009/02/12 14:57:18 tupone Exp $
+
+  12 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/xscorch-0.2.0-as-needed.patch, xscorch-0.2.0-r1.ebuild:
+  Fix --as-needed bug #247511 by flameeyes@gentoo.org
 
   25 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
   xscorch-0.2.0-r1.ebuild:
diff --git a/games-strategy/xscorch/Manifest b/games-strategy/xscorch/Manifest
index e14512d8a409..80461849fcb0 100644
--- a/games-strategy/xscorch/Manifest
+++ b/games-strategy/xscorch/Manifest
@@ -1,6 +1,7 @@
+AUX xscorch-0.2.0-as-needed.patch 1334 RMD160 27bccc0baf1a6575b1586a35a295a3e1e07679b2 SHA1 f281a31738c2d9dec19368c7219474a002a6dbbc SHA256 736a4229cdc41107357fa2aba7096eb043b07e0129f06bc7d9f0ed70eeed6bab
 DIST xscorch-0.2.0-64bit.patch.gz 3122 RMD160 297fd79a3417a86a96debd36c0d5c3bb1a9ac789 SHA1 4b109f0dbbec0d216943e8fb96ed9f2ef4e39ab9 SHA256 20c0bec41907bbb560a9a8bdea9553c2e8972b6cdb7e45ade69b7ad102e46970
 DIST xscorch-0.2.0-stack-smash.patch.gz 727 RMD160 ffddf0057c48fd372e99d316093b18735d0a4b26 SHA1 c8fa2efecc7c99f23d31c36fe0b77d5a40e9c6a9 SHA256 aa38cd5191b68877718ec77210c130d32f80c9f4a3cf770bd773ab8fb8824948
 DIST xscorch-0.2.0.tar.gz 818449 RMD160 243a97eaadd6b29c354c6e0fe679055c0cdb53e2 SHA1 b6d36e2b68e86e1f828d1312bf7789afd4085386 SHA256 f91ebdaf3d11cb5681d1bcca7540fab3b0262cd0b4375785122fdf269ccac68a
-EBUILD xscorch-0.2.0-r1.ebuild 1191 RMD160 2c0f37fd150b7bd287b1ab3371888342914617d0 SHA1 50de47af83243fbeb7333751aa7a9525f2fb9267 SHA256 2ecedbb54f61ae348461f818549ca656e0c7d29ebcd6a9f573cb22157c7c3231
-MISC ChangeLog 2467 RMD160 125822b3371a9617a5f46c1ba3a31b45b50233ac SHA1 17024bccb07e445fd3b4211ade546d9ebdbe5f82 SHA256 8e8e791cf7a996245bfa83e1be5e3436121f2029809033ede0161d1d46c7c3b4
+EBUILD xscorch-0.2.0-r1.ebuild 1172 RMD160 717983fe8e3507154746a8c5d5d1f88ed326a8ff SHA1 d3631ab829452aaa4e1b83ca6b7cf8bbe4838291 SHA256 4df63841029c1cd03878f284d5197e7b233cf5d299c6101283589ad86a0b0bac
+MISC ChangeLog 2635 RMD160 5205e16f295c833d33041d92e23821d3161c656d SHA1 563e032aff63b0117fbc58901ca2a3d44e8e07e9 SHA256 6fc97d46e9db8b5a205e002ad3318df86aad3710737666e57b4d9e8f8afc8173
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/xscorch/files/xscorch-0.2.0-as-needed.patch b/games-strategy/xscorch/files/xscorch-0.2.0-as-needed.patch
new file mode 100644
index 000000000000..1b937abbdabb
--- /dev/null
+++ b/games-strategy/xscorch/files/xscorch-0.2.0-as-needed.patch
@@ -0,0 +1,17 @@
+--- Makefile.in.old	2009-02-12 15:56:38.000000000 +0100
++++ Makefile.in	2009-02-12 15:58:38.000000000 +0100
+@@ -153,12 +153,12 @@
+ 
+ xscorch_SOURCES =  	xscorch.c
+ 
+-xscorch_LDADD =  	-lm 	$(GTK_LIBS) 	$(LIBMIKMOD_LIBS) 	sgame/libscorch_game.a 	sgtk/libscorch_gtk.a 	sgtk/swidgets/libscorch_widget_gtk.a 	sai/libscorch_ai.a 	$(MIKMOD_LD_ADD) 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
++xscorch_LDADD = sgame/libscorch_game.a 	sgtk/libscorch_gtk.a 	sgtk/swidgets/libscorch_widget_gtk.a 	sai/libscorch_ai.a 	$(MIKMOD_LD_ADD) 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a $(GTK_LIBS) $(LIBMIKMOD_LIBS) -lm
+ 
+ 
+ xscorch_server_SOURCES =  	xscorch.c
+ 
+-xscorch_server_LDADD =  	-lm 	$(LIBREADLINE_LIBS) 	sgame/libscorch_game.a 	sconsole/libscorch_console.a 	sai/libscorch_ai.a 	ssound/libscorch_sound_null.a 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
++xscorch_server_LDADD = $(LIBREADLINE_LIBS) 	sgame/libscorch_game.a 	sconsole/libscorch_console.a 	sai/libscorch_ai.a 	ssound/libscorch_sound_null.a 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a -lm
+ 
+ 
+ INCLUDES = -Isgame -Isgtk
diff --git a/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild b/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild
index b997508ba412..10abf9d6f75c 100644
--- a/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild
+++ b/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild
@@ -1,7 +1,8 @@
-# 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-strategy/xscorch/xscorch-0.2.0-r1.ebuild,v 1.4 2008/03/25 15:42:11 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild,v 1.5 2009/02/12 14:57:18 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="clone of the classic DOS game, 'Scorched Earth'"
@@ -18,15 +19,14 @@ IUSE="gtk mikmod"
 DEPEND="gtk? ( =x11-libs/gtk+-1* )
 	mikmod? ( media-libs/libmikmod )"
 
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
+src_prepare() {
 	epatch \
-		"${DISTDIR}/${P}-64bit.patch.gz" \
-		"${DISTDIR}/${P}-stack-smash.patch.gz"
+		"${WORKDIR}"/${P}-64bit.patch \
+		"${WORKDIR}"/${P}-stack-smash.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 }
 
-src_compile() {
+src_configure() {
 	#configure failed on readline support
 	egamesconf \
 		--enable-network \
@@ -34,7 +34,6 @@ src_compile() {
 		$(use_enable mikmod sound) \
 		$(use_with gtk) \
 		|| die
-	emake || die "emake failed"
 }
 
 src_install() {