Fix --as-needed bug #247473

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

4 files changed, 27 insertions, 12 deletions

diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog
index d651bcd2fffc..27c27224fed1 100644
--- a/games-sports/gracer/ChangeLog
+++ b/games-sports/gracer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/gracer
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.17 2008/01/19 00:43:31 mr_bones_ Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.18 2009/02/11 13:31:26 tupone Exp $
+
+  11 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/gracer-0.1.5-as-needed.patch, gracer-0.1.5.ebuild:
+  Fix --as-needed bug #247473 by flameeyes@gentoo.org
 
   19 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> gracer-0.1.5.ebuild:
   deps actually are hard (bug #206415)
diff --git a/games-sports/gracer/Manifest b/games-sports/gracer/Manifest
index b427f61db6c4..f38d75b87c15 100644
--- a/games-sports/gracer/Manifest
+++ b/games-sports/gracer/Manifest
@@ -1,7 +1,8 @@
 AUX 0.1.5-gldefs.patch 1068 RMD160 47d1b371534831dd5d1980db9c6f30d1bf78bdfd SHA1 8f49a7358f924d2219e1aced7a8bc35a8ee89b69 SHA256 78e0b8c0e38ed16bb55207d76cdce192508371f624567d4c27633b6d44b97241
+AUX gracer-0.1.5-as-needed.patch 1134 RMD160 f914206ed44c1aa98d87b17b68aaa12b92505f5a SHA1 cdb91529219f59119a62134efacdf693b6929320 SHA256 332d7c5fcf810139f4c7f759e79636d7cb98ce3ee5fe83a8367a1051bb6a8144
 AUX gracer-0.1.5-gcc41.patch 414 RMD160 b0571a4eb2ce8c399afa50fa2ce43966b8ee947a SHA1 9f1e56f54468c0d9600df46cf5ccd9b22d9d7f5b SHA256 2f5b3cd8620aa8e9df3b8fcc61aa0d901d329a7734a9a89e850d726e3fc60f2a
 AUX gracer-gcc-3.4.patch 1755 RMD160 17083ad43ac9694313e573e1d9cba36a18b07cc9 SHA1 db8fad5111bfa07ec28163f5227e42b93ab476db SHA256 50680ff8fe9e51dbbb9fd07953c2be0e028cb7a89db703413ad448052bc47427
 DIST gracer-0.1.5.tar.gz 520599 RMD160 31cfda3061c025cbdd454ec537f7f3c3621c4271 SHA1 f459ae644c7f74553354e7cc10285ee31ed63b99 SHA256 dc478610d60cd5f00a52cc52877a333bd4b3a2d96ed1660ba8d26ad7143367c0
-EBUILD gracer-0.1.5.ebuild 1166 RMD160 61884b456e92fee6911877dcf0e2f5034a54b544 SHA1 bca3b166981001713a2481a498fbfac58e80582f SHA256 215613dcb400e071f6bfdd5914bb0e3bef2963a6af272abdc139f8316535a333
-MISC ChangeLog 1873 RMD160 03d3f2e2fd0a6833b87e8bedb618cc3d13aba5eb SHA1 d85e151600a33e325acdf8f2975776411433940c SHA256 803ed3793917fc8ff92d19d90ac8e0ed5b1e32b73ba68bd9d1cd5c1e988b822f
+EBUILD gracer-0.1.5.ebuild 1159 RMD160 de6f6f26b3d48bbfe217ba6c066bb4ef30127c53 SHA1 455522ecf0fe52bf1bb13f2b8a29692fde1f5f2b SHA256 82db1f864ba3bb288b9cbc79e317cfef8eae8a350d09af7493d706124eef9b9a
+MISC ChangeLog 2035 RMD160 af419b5043d9a1d523a9f7c1dd7e72319ada6390 SHA1 9e81da2db5bcf22ef2f96c1cb902c5b94418d13d SHA256 6ab14686d30b03aaf2e6e9a334b1ae587a2a350bfcbfb1d085b33d6fb7103060
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-sports/gracer/files/gracer-0.1.5-as-needed.patch b/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
new file mode 100644
index 000000000000..3d3c53bcd46e
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old	2009-02-11 14:31:56.000000000 +0100
++++ src/Makefile.in	2009-02-11 14:32:29.000000000 +0100
+@@ -109,7 +109,7 @@
+ INCLUDES =  	-I$(top_srcdir) 	@X_CFLAGS@ 	@GL_CFLAGS@ 	@GLUT_CFLAGS@ 	@TCL_CFLAGS@ 	@GIF_CFLAGS@ 	@JPEG_CFLAGS@ 	@PNG_CFLAGS@ 	@PLIB_CFLAGS@
+ 
+ 
+-gracer_LDADD =  	@PLIB_LDFLAGS@ 	@GIF_LDFLAGS@ 	@JPEG_LDFLAGS@ 	@PNG_LDFLAGS@ 	@GL_LDFLAGS@ 	@GLUT_LDFLAGS@ 	@X_LDFLAGS@ 	@TCL_LDFLAGS@ 	@TCL_LIBS@ 	@X_LIBS@ 	@GL_LIBS@ 	@GLUT_LIBS@ 	@GIF_LIBS@ 	@JPEG_LIBS@ 	@PNG_LIBS@ 	@SOUND_LIBS@ 	$(top_builddir)/common/libcommon.a
++gracer_LDADD = $(top_builddir)/common/libcommon.a 	@PLIB_LDFLAGS@ 	@GIF_LDFLAGS@ 	@JPEG_LDFLAGS@ 	@PNG_LDFLAGS@ 	@GL_LDFLAGS@ 	@GLUT_LDFLAGS@ 	@X_LDFLAGS@ 	@TCL_LDFLAGS@ 	@TCL_LIBS@ 	@X_LIBS@ 	@GL_LIBS@ 	@GLUT_LIBS@ 	@GIF_LIBS@ 	@JPEG_LIBS@ 	@PNG_LIBS@ 	@SOUND_LIBS@
+ 
+ 
+ gracer_SOURCES =  		control.h 		glbind.c 		glbind.h 		glutwidgets.c 		glutwidgets.h 		gluttclwidgets.c 		gluttclwidgets.h 		glutgame.c 		glutgame.h 		gr_world.c 		gr_world.h 		glhash.h 		gluthash.h 		vehicle.c 		vehicle.h 		lap.c 		lap.h 		joystick.c 		joystick.h 		tcldefs.h 		sound.h 		sound.cxx 		main.cxx
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index 76ad27115b3f..ea8e1a33fb74 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.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-sports/gracer/gracer-0.1.5.ebuild,v 1.17 2008/01/19 00:43:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.18 2009/02/11 13:31:26 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="3D motor sports simulator"
@@ -24,15 +25,14 @@ DEPEND="x11-libs/libXi
 	media-libs/libpng
 	media-libs/plib"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gldefs.patch \
 		"${FILESDIR}"/${PN}-gcc-3.4.patch \
-		"${FILESDIR}/${P}"-gcc41.patch
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 }
 
-src_compile() {
+src_configure() {
 	egamesconf \
 		--enable-gif \
 		--enable-jpeg \
@@ -42,7 +42,6 @@ src_compile() {
 	sed -i \
 		-e 's:-lplibsl:-lplibsl -lplibul:' $(find -name Makefile) \
 			|| die "sed Makefiles failed"
-	emake || die "emake failed"
 }
 
 src_install() {