Fix --as-needed bug #247334

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

4 files changed, 53 insertions, 19 deletions

diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index ee7a020a75e0..45d0409fca24 100644
--- a/games-board/ace/ChangeLog
+++ b/games-board/ace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ace
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.17 2008/11/17 21:01:07 flameeyes Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.18 2009/02/03 08:27:18 tupone Exp $
+
+  03 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/ace-1.2-as-needed.patch, ace-1.2-r2.ebuild:
+  Fix --as-needed bug #247334 by flameeyes@gentoo.org
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/ace-1.2-mastermind-keys.patch:
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index f6c41136a2bd..79538c75d6d9 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ace-1.2-as-needed.patch 1290 RMD160 83180dff6da94f9bd7c7fdf99393f55f0ca83fc8 SHA1 abb804549082d8452827b508aea72696811ab14e SHA256 6157aecb445db6286eae9d7aafbb285d08dbc153f25e15cd9eceeb34371eb0fa
 AUX ace-1.2-check_for_end_of_game.patch 262 RMD160 f39618a843461e4e8f1d139b87e808b163f071d1 SHA1 c4d7d9b32f0de8882a2b9c59c0873497c7194586 SHA256 16c841454ac9c3552b4aa70c3ec3bafbb8db33fb1e2a85e0f36de1623e09179e
 AUX ace-1.2-gcc41.patch 2020 RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 SHA1 cc83372eb43277d83734dd38aa0286a135d618bd SHA256 45362fb9c87496fe6c0b84502d8e4a37ba37a8d4c389b749a1ef9920a2e85d60
 AUX ace-1.2-mastermind-keys.patch 522 RMD160 bd4556f14cc7f823364d829138edbd075c07eff3 SHA1 6626fa6d1a48115ee7ac7cb2ed540aca3d955064 SHA256 0911f51a28d897f0d6cdf3eee4d8f9ea5541204ed10ee146c6912d64de673117
 DIST ace-1.2.tar.gz 309289 RMD160 ee3b4c4707dba1eb92d06306157c1188bfba616d SHA1 c0bf8e4eaee3128b0f41e7832723a0660146278a SHA256 fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
-EBUILD ace-1.2-r2.ebuild 940 RMD160 7d297c88544c5db18e30ef069163cbb0398beea7 SHA1 973cdbefb0c30e668459b58c7bc6927cce75f72d SHA256 3d099a9c33f46af419a52fa31ccdd04da808eae1b845b691ab8e190f648244b2
-MISC ChangeLog 2236 RMD160 42b31ca8a1dcd2bf3ab4bcedaa9eda162fb939fa SHA1 e857d0cc241356bf79ab5fda2a88166ab7a11398 SHA256 b878db797c1127d80befd8db95d52515a4932fdf1ffcd60f6f7e91642d1e3973
+EBUILD ace-1.2-r2.ebuild 965 RMD160 f1018cb31c05ac4c00deb6d4f385955a23a15339 SHA1 713d7eab3a86de905dd6325740d166cd880961f8 SHA256 a845a7fa8f64523bbac1a80adae7a3dd4abc45d25cf7d1fc171e806f3bc9d99d
+MISC ChangeLog 2391 RMD160 515252d95606d42bf301e613b5020ddbdc23e2ba SHA1 da59f1a1a2cfd4d7d8659775cef346c370cd99a5 SHA256 84ad705a24fe2e8c523fe1e27afdfd27fef7061f83cb823024b37e31cfa6ea8d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh25gACgkQAiZjviIA2XjmBQCg7mSlF3ZYITL/AdHL8hibM9SL
-HD4AoJhElg4oqQXc0uIKIcRfWz6bTQXW
-=hc6q
------END PGP SIGNATURE-----
diff --git a/games-board/ace/ace-1.2-r2.ebuild b/games-board/ace/ace-1.2-r2.ebuild
index 8adacadddec3..fe74f6f8dcbb 100644
--- a/games-board/ace/ace-1.2-r2.ebuild
+++ b/games-board/ace/ace-1.2-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r2.ebuild,v 1.1 2007/07/22 12:23:59 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r2.ebuild,v 1.2 2009/02/03 08:27:18 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
@@ -17,10 +18,9 @@ DEPEND="x11-libs/libXpm
 	media-libs/libpng
 	!games-misc/bsd-games"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
+		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-check_for_end_of_game.patch \
 		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-mastermind-keys.patch
diff --git a/games-board/ace/files/ace-1.2-as-needed.patch b/games-board/ace/files/ace-1.2-as-needed.patch
new file mode 100644
index 000000000000..0ec796eea6b3
--- /dev/null
+++ b/games-board/ace/files/ace-1.2-as-needed.patch
@@ -0,0 +1,39 @@
+--- lib/Makefile.in.old 2009-02-03 09:04:55.000000000 +0100
++++ lib/Makefile.in     2009-02-03 09:08:37.000000000 +0100
+@@ -85,7 +85,6 @@
+ CLEANFILES = images.c images.d
+ 
+ INCLUDES = $(X_CFLAGS) @PDA@
+-LDFLAGS = $(X_LIBS)
+ 
+ BUILD_CC = @BUILD_CC@
+ AR = @AR@
+@@ -107,7 +106,7 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libcards_la_LIBADD = 
++libcards_la_LIBADD = -lpng -lX11
+ libcards_la_OBJECTS =  table.lo help.lo stack.lo imagelib.lo xwin.lo \
+ images.lo table_ai.lo table_ck.lo table_dc.lo table_dg.lo table_dp.lo \
+ table_in.lo table_ky.lo table_rd.lo table_rn.lo table_rs.lo
+--- games/Makefile.in.old       2009-02-03 09:07:26.000000000 +0100
++++ games/Makefile.in   2009-02-03 09:07:35.000000000 +0100
+@@ -90,7 +90,6 @@
+ STRIP = @STRIP@
+ 
+ INCLUDES = -I$(srcdir)/../lib $(X_CFLAGS) @PDA@
+-LDFLAGS = $(X_LIBS)
+ 
+ canfield_SOURCES = canfield.c canfield-img.c
+ freecell_SOURCES = freecell.c freecell-help.c freecell-img.c
+--- tests/Makefile.in.old       2009-02-03 09:10:36.000000000 +0100
++++ tests/Makefile.in   2009-02-03 09:10:47.000000000 +0100
+@@ -85,7 +85,6 @@
+ test6_SOURCES = test6.c test6c.c
+ 
+ INCLUDES = -I$(srcdir)/../lib $(X_CFLAGS) @PDA@
+-LDFLAGS = $(X_LIBS)
+ LDADD = ../lib/libcards.la -lpng -lz -lX11 -lm
+ 
+ EXTRA_DIST = test6.png