Fix --as-needed bug #247353

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

4 files changed, 35 insertions, 20 deletions

diff --git a/games-emulation/snes9express/ChangeLog b/games-emulation/snes9express/ChangeLog
index 69918f4e1c78..05c6c3ea563d 100644
--- a/games-emulation/snes9express/ChangeLog
+++ b/games-emulation/snes9express/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/snes9express
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9express/ChangeLog,v 1.11 2008/05/02 19:15:45 nyhm Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9express/ChangeLog,v 1.12 2009/02/04 16:27:22 tupone Exp $
+
+  04 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/snes9express-1.42-as-needed.patch, snes9express-1.42.ebuild:
+  Fix --as-needed bug #247353 by flameeyes@gentoo.org
 
   02 May 2008; Tristan Heaven <nyhm@gentoo.org>
   -files/snes9express-1.42-fix.patch, +files/snes9express-1.42-gcc43.patch,
diff --git a/games-emulation/snes9express/Manifest b/games-emulation/snes9express/Manifest
index ee515c9fae19..5f639ceb5816 100644
--- a/games-emulation/snes9express/Manifest
+++ b/games-emulation/snes9express/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX snes9express-1.42-as-needed.patch 1116 RMD160 54be8d5f88f8e2c6873a94004c75aab5ac8b3a8e SHA1 66fd4789ff4564c33855ca1574b4a89796498b4a SHA256 ba1fab10e268e5d817a3e102c9a1ab70cbc482d075a7bd2ffe1102de3f917105
 AUX snes9express-1.42-gcc41.patch 332 RMD160 d2bbb5f048d96af986bbac5e7f671e2f35dc4b2b SHA1 516b559e8ca1515f542bc36e5f4d655ab504f249 SHA256 c54b8ca53e8ef7743ffa0ccc7a8e8776c353e730c87436d7aa497408f469887d
 AUX snes9express-1.42-gcc43.patch 846 RMD160 916da4a80967589a2475d7ceb4e7a542f192b4ca SHA1 41529a807c7bf41860dffafbe17eeb7318a3107c SHA256 877e6a31b143efe6903e91f6808bc00dd4e5ac35422aef94236e7785e6457cb9
 DIST snes9express-1.42.tar.gz 367561 RMD160 37ccfd0319d4d9038000acd87301b543d0aca59b SHA1 9712f6643bdd456110a45463c90891c2b82682dc SHA256 f2b57f7dd24a6771d1c2304e88cbd8afab512891d762c2f54fb632711c7eca7a
-EBUILD snes9express-1.42.ebuild 853 RMD160 9c8d98d9c40374d5c5704991c00fc3b2fb900941 SHA1 699f9577240d51f9502c03b36b4c181b90cd02bb SHA256 a1b9a4976fed2017ab46601edc80da6d6607367671ca9e8f468922b68a7ed46d
-MISC ChangeLog 1423 RMD160 9cef2e32832c90f892356f8478243db9424a52d5 SHA1 be513aed18a83072dffc41e4533d8088ee28ea79 SHA256 1d478e8a585b4117dbee6dda2f183174f0f448faff9df189e2fe625e0e766179
+EBUILD snes9express-1.42.ebuild 878 RMD160 3888d0cf445e7ef97f49f5dd6464a0e80684343e SHA1 80fb7f7484a0226bf240b70c12e7ce7fc189ad61 SHA256 f32cb5d7a28f0797e77f612a010f009aaaf03abd89ba578f42ea074040f1b437
+MISC ChangeLog 1600 RMD160 12e46ff15ec59ef36dc01a79a019a443fc1cf8bf SHA1 254604c2e5159862d19d1502bd5014c8d8c5a07a SHA256 8c967302c648021c96ddfceab4d509db396262392e8633828e14f7e78893c758
 MISC metadata.xml 159 RMD160 9ce79fb2f245a86f0fd9896ef34c65b6dc2a97bf SHA1 e8d4e28f664e8bd524cb04b5077852adc2f57d90 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgbaGYACgkQdz7hIScOURHEmgCeN6IEAhD8YYVv8eOmtnyxiicz
-rbsAnRuKKOSyOROLXK8sRYHzXyk7L8IN
-=gJQB
------END PGP SIGNATURE-----
diff --git a/games-emulation/snes9express/files/snes9express-1.42-as-needed.patch b/games-emulation/snes9express/files/snes9express-1.42-as-needed.patch
new file mode 100644
index 000000000000..c8b67fe00041
--- /dev/null
+++ b/games-emulation/snes9express/files/snes9express-1.42-as-needed.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.old     2009-02-04 17:16:29.000000000 +0100
++++ Makefile.in 2009-02-04 17:17:40.000000000 +0100
+@@ -72,7 +72,7 @@
+ snes9express_SOURCES = frend.h frend.cc defines.h controller.h controller.cc profiler.h profiler.cc rom.h rom.cc sound.h sound.cc video.h video.cc cpu.h cpu.cc netplay.h netplay.cc extra.h extra.cc prefs.h prefs.cc misc.h misc.cc s9xskin.h s9xskin.cc skins.h skins.cc interface.h interface.cc 
+ snes9express_DEPENDENCIES = frend.h defines.h Makefile config.h
+ AM_CXXFLAGS = @GTK_CFLAGS@
+-snes9express_LDFLAGS = $(GTK_LIBS) @LIBOBJS@
++snes9express_LDFLAGS = 
+ EXTRA_DIST = snes.s9xskin snsp.s9xskin snes9express.spec
+ pkgdata_DATA = snes.s9xskin snsp.s9xskin
+ AM_CPPFLAGS = -DS9XDATADIR=\"$(pkgdatadir)\"
+@@ -90,7 +90,7 @@
+ snes9express_OBJECTS =  frend.o controller.o profiler.o rom.o sound.o \
+ video.o cpu.o netplay.o extra.o prefs.o misc.o s9xskin.o skins.o \
+ interface.o
+-snes9express_LDADD = $(LDADD)
++snes9express_LDADD = $(GTK_LIBS) @LIBOBJS@
+ CXXFLAGS = @CXXFLAGS@
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
diff --git a/games-emulation/snes9express/snes9express-1.42.ebuild b/games-emulation/snes9express/snes9express-1.42.ebuild
index eaa715617b74..0e717bb1eac8 100644
--- a/games-emulation/snes9express/snes9express-1.42.ebuild
+++ b/games-emulation/snes9express/snes9express-1.42.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-emulation/snes9express/snes9express-1.42.ebuild,v 1.11 2008/05/02 19:15:45 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9express/snes9express-1.42.ebuild,v 1.12 2009/02/04 16:27:22 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="A graphical interface for the X11 versions of snes9x"
@@ -19,12 +20,11 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_install() {