Fix --as-needed bug #247350

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

6 files changed, 46 insertions, 17 deletions

diff --git a/games-emulation/gens/ChangeLog b/games-emulation/gens/ChangeLog
index 9ea77a1f81ac..2d9606fc55df 100644
--- a/games-emulation/gens/ChangeLog
+++ b/games-emulation/gens/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/gens
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/ChangeLog,v 1.18 2008/10/14 16:22:27 mr_bones_ Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/ChangeLog,v 1.19 2009/02/04 15:39:31 tupone Exp $
+
+  04 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/gens-2.15.4-as-needed.patch, +files/gens-2.15.5-as-needed.patch,
+  gens-2.15.4.ebuild, gens-2.15.5.ebuild:
+  Fix --as-needed bug #247350 by flameeyes@gentoo.org
 
 *gens-2.15.5 (14 Oct 2008)
 
diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
index 2efa90398c6a..3ba6979c3202 100644
--- a/games-emulation/gens/Manifest
+++ b/games-emulation/gens/Manifest
@@ -1,12 +1,14 @@
 AUX gens-2.12b-gcc4.patch 1056 RMD160 82963b061977b52ca80bd7941fd4908b3a7f84df SHA1 9b42f4ee97303716c4a2574242b0137630311d9c SHA256 16d69f8e757bd387fc39a3569fa3bfcf8fd19fdeae255171220ae575a3bb9026
 AUX gens-2.12b-romsdir.patch 605 RMD160 51da63dfcd4c42b348f1a9ef8eec38f55130f18b SHA1 e4ef5af4cfb2d581a4c00bceee30f62de32c32c0 SHA256 7bd2ef04a6947e289d6ea6a1c7e3113e7994757f3da8504e80172ce3a3fb730a
+AUX gens-2.15.4-as-needed.patch 363 RMD160 afee4d299fbae72499fa6c592ac8f8a3b0ec87b6 SHA1 13397c5112382916ef36eaba8e88b4fc8307909b SHA256 098425ef1bbd9f3c851dcbf709021faf97f25b34688a76e5173007efa47a13fa
 AUX gens-2.15.4-romsdir.patch 571 RMD160 1898a37a9fcdc8fb746b1bd4f89efadb4a849b0f SHA1 a08b11d1e9703f1ceb4ca49efdde607af69eab2c SHA256 f03f74259712ac3d9a2d536e69583d69019d9bce87d699ce831039b1c722f00a
+AUX gens-2.15.5-as-needed.patch 363 RMD160 afee4d299fbae72499fa6c592ac8f8a3b0ec87b6 SHA1 13397c5112382916ef36eaba8e88b4fc8307909b SHA256 098425ef1bbd9f3c851dcbf709021faf97f25b34688a76e5173007efa47a13fa
 AUX gens-2.15.5-romsdir.patch 571 RMD160 1898a37a9fcdc8fb746b1bd4f89efadb4a849b0f SHA1 a08b11d1e9703f1ceb4ca49efdde607af69eab2c SHA256 f03f74259712ac3d9a2d536e69583d69019d9bce87d699ce831039b1c722f00a
 DIST gens-2.15.4.tar.gz 737812 RMD160 d68742adc457ed9350717bdec239df9df22e4be2 SHA1 b1fb02fd3a55adea4031cd326b7c50e6ea9be9e6 SHA256 f5fd92c80c11904e198e98b4d436784a43bde6824440dd745e9594c36ebd743f
 DIST gens-2.15.5.tar.gz 741852 RMD160 2ad70bfb30bde98e39fdc4c71795c8f173fcecc1 SHA1 85f31741ea9e230ff10b060593140b2740bb9d7a SHA256 51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a
 DIST gens-rc3.tar.gz 658729 RMD160 d2a36a5bdca8948b12624cba15dab0c5b527a688 SHA1 6057564665007686c9ea8df364be3220499f9917 SHA256 a6bbf9ed2cd46a766ed529667f84ea93171fadd28ab39710f702926595def0c5
 EBUILD gens-2.12b.ebuild 844 RMD160 16560c3333db4ceb75d5e2936744d385444b4d38 SHA1 f4148ee88659e757e41b796d7c5737f2a068b65b SHA256 4694c74cb1d038552fd994e39dcf23de620e911c40ce8ed2c055415295fe5108
-EBUILD gens-2.15.4.ebuild 795 RMD160 ba3b0b221ae327452e8b208e1bfab42df412a139 SHA1 8c13a3a9fae6ef18ab9012b9f83f2fb19de9658d SHA256 499a43dd79d113ac1e8979ab576c49740a717871d92880aa1a8bded1bdd01345
-EBUILD gens-2.15.5.ebuild 795 RMD160 1a56f663f64790ce45f5a8d0133397341b717ee5 SHA1 8f732671f36307fc7ef435d1944ee97a938477b5 SHA256 768e48f18c81d9e72a4dcf79abbf946e2d005afb25da59ce164722e77dd9dc88
-MISC ChangeLog 2390 RMD160 22ed5928bcf453798bb077030f19baf3f2647855 SHA1 1fd72afd8abc55497a9a8db1f4a2c0020bf9b46e SHA256 8e87b9c9ba3d697e637e688c0013b1fcaf00bfd2cb9dd1cf545cab94008b1fce
+EBUILD gens-2.15.4.ebuild 815 RMD160 33589c6b0a8bafe48a9449a5b5beefffc4a05066 SHA1 8e160bf2a8ff786473e7c1cf6068d4d55a0d3394 SHA256 3522d001913af681a68c2210f4e6b60b6c818167be6aaec35af6c4cd425d0ea2
+EBUILD gens-2.15.5.ebuild 815 RMD160 46ca5461887ce2deacc51dfdf546b5552ee892ee SHA1 82657ad3791460af4ba7be85adf9a18d5a7772fb SHA256 511675251c89c03eca88fc6fe6b63f0315d5520f8207c2fac51dd06586795626
+MISC ChangeLog 2608 RMD160 f331505a5215a2a27a44d7982c2c39c238b50972 SHA1 443baad8d467b46af50e78e2df7246dc05e878ce SHA256 e753f5b3310cf5ff1e8988a37d0f8a048ef4d08892fb806e83ceff4963fb27d9
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-emulation/gens/files/gens-2.15.4-as-needed.patch b/games-emulation/gens/files/gens-2.15.4-as-needed.patch
new file mode 100644
index 000000000000..02aed32b802c
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.4-as-needed.patch
@@ -0,0 +1,11 @@
+--- configure.old       2009-02-04 14:41:40.000000000 +0100
++++ configure   2009-02-04 14:48:52.000000000 +0100
+@@ -4929,7 +4929,7 @@
+        { echo "$as_me:$LINENO: result: $with_opengl" >&5
+ echo "${ECHO_T}$with_opengl" >&6; }
+        if test x$with_opengl = xyes; then
+-               LDFLAGS="$LDFLAGS -lGL"
++               LIBS="$LIBS -lGL"
+ 
+        fi
+ fi
diff --git a/games-emulation/gens/files/gens-2.15.5-as-needed.patch b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
new file mode 100644
index 000000000000..02aed32b802c
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
@@ -0,0 +1,11 @@
+--- configure.old       2009-02-04 14:41:40.000000000 +0100
++++ configure   2009-02-04 14:48:52.000000000 +0100
+@@ -4929,7 +4929,7 @@
+        { echo "$as_me:$LINENO: result: $with_opengl" >&5
+ echo "${ECHO_T}$with_opengl" >&6; }
+        if test x$with_opengl = xyes; then
+-               LDFLAGS="$LDFLAGS -lGL"
++               LIBS="$LIBS -lGL"
+ 
+        fi
+ fi
diff --git a/games-emulation/gens/gens-2.15.4.ebuild b/games-emulation/gens/gens-2.15.4.ebuild
index dc7b40f257ee..bd4c4cd914bd 100644
--- a/games-emulation/gens/gens-2.15.4.ebuild
+++ b/games-emulation/gens/gens-2.15.4.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/gens/gens-2.15.4.ebuild,v 1.1 2008/09/10 22:00:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/gens-2.15.4.ebuild,v 1.2 2009/02/04 15:39:31 tupone Exp $
 
+EAPI=2
 inherit eutils flag-o-matic games
 
 DESCRIPTION="A Sega Genesis/CD/32X emulator"
@@ -19,10 +20,9 @@ RDEPEND="virtual/opengl
 DEPEND="${RDEPEND}
 	>=dev-lang/nasm-0.98"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-romsdir.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-romsdir.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 	append-ldflags -Wl,-z,noexecstack
 }
 
diff --git a/games-emulation/gens/gens-2.15.5.ebuild b/games-emulation/gens/gens-2.15.5.ebuild
index 89f5f916a5d3..9674e668c3e6 100644
--- a/games-emulation/gens/gens-2.15.5.ebuild
+++ b/games-emulation/gens/gens-2.15.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-emulation/gens/gens-2.15.5.ebuild,v 1.1 2008/10/14 16:22:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/gens-2.15.5.ebuild,v 1.2 2009/02/04 15:39:31 tupone Exp $
 
+EAPI=2
 inherit eutils flag-o-matic games
 
 DESCRIPTION="A Sega Genesis/CD/32X emulator"
@@ -19,10 +20,9 @@ RDEPEND="virtual/opengl
 DEPEND="${RDEPEND}
 	>=dev-lang/nasm-0.98"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-romsdir.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-romsdir.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 	append-ldflags -Wl,-z,noexecstack
 }