Fix --as-needed bug #247416

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686

4 files changed, 59 insertions, 16 deletions

diff --git a/games-puzzle/anagramarama/ChangeLog b/games-puzzle/anagramarama/ChangeLog
index b2096aee023f..6fb86df31ee5 100644
--- a/games-puzzle/anagramarama/ChangeLog
+++ b/games-puzzle/anagramarama/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/anagramarama
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/anagramarama/ChangeLog,v 1.6 2006/08/15 13:41:08 tcort Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/anagramarama/ChangeLog,v 1.7 2009/02/08 17:35:24 tupone Exp $
+
+  08 Feb 2009; Tupone Alfredo <tupone@gentoo.org>
+  +files/anagramarama-0.2-gentoo.patch, anagramarama-0.2.ebuild:
+  Fix --as-needed bug #247416 by flameeyes@gentoo.org
 
   15 Aug 2006; Thomas Cort <tcort@gentoo.org> anagramarama-0.2.ebuild:
   Stable on amd64 wrt Bug #143961
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
index a34bdb31eea6..ba72d76d8f53 100644
--- a/games-puzzle/anagramarama/Manifest
+++ b/games-puzzle/anagramarama/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX anagramarama-0.2-gentoo.patch 914 RMD160 4f2190360446bc3680140efd175c4b6423ddbeeb SHA1 2a26b689ba89aa3f73e177108ace8b96a3bc9885 SHA256 f3c885f5925f6a949f5716aac6485933a82a8480f672d9e0349f9f21f415a3fe
 DIST anagramarama-0.2.tar.gz 861484 RMD160 01bff7c11cd15e6f4197d9bd489beb873a69d91f SHA1 1cd4a0f90419630bbda31c7ea585719e98e59215 SHA256 3ebb57468025e38c205d6f34f1f1647b593b371beda8032e69ba94aca516bccf
-EBUILD anagramarama-0.2.ebuild 1377 RMD160 517c005a6e182dd29d70866d5591c65c7a4cf452 SHA1 285707435ef3883c8296bf25c69c7cee3d3d649b SHA256 83715d8db92828a6d452eaef5cf37c23cb07eaf36baa59e811d9687fc45d14d1
-MISC ChangeLog 940 RMD160 0705750969b158ce35b74d9bca9928eedc1869db SHA1 b625e34b2387498963d48d81bd04e86ef1bb6abf SHA256 0f5ec744241fd70da941d7557d25d167c7b9fd4138574139b8324959a061238a
+EBUILD anagramarama-0.2.ebuild 1209 RMD160 70dd5b8ad780cfdee0d81b725a9e3daa0a36cb5f SHA1 5e2f87e97cf02903b5bad0adeefd4f797ba4a4ab SHA256 202b9b93ba187a7d5fe9459e0ce916f7fb9be0dc97bf9a127cbe7908e1f4bb90
+MISC ChangeLog 1111 RMD160 223a9bd156cc53cba1968c58a16cdadb7f29f5af SHA1 60fb975a4115a126479217be0f9baf5a1c9fde52 SHA256 35b9d1613897ce6d9dd08e13d38cf30afd660aec6855d75035ac690ee5b47570
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmPF+cACgkQSYz9rjec82YGugCfSqRXp9YGvuhwHMSrpl3Y07an
+q/sAoLZINSORsPkrjviDtR7Hd5UtNT80
+=7lh2
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/anagramarama/anagramarama-0.2.ebuild b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
index ecc21135f373..59a5f399e585 100644
--- a/games-puzzle/anagramarama/anagramarama-0.2.ebuild
+++ b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/anagramarama/anagramarama-0.2.ebuild,v 1.7 2006/08/15 13:41:08 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/anagramarama/anagramarama-0.2.ebuild,v 1.8 2009/02/08 17:35:24 tupone Exp $
 
-inherit games
+EAPI=2
+inherit eutils games
 
 DESCRIPTION="Create as many words as you can before the time runs out"
 HOMEPAGE="http://www.coralquest.com/anagramarama/"
@@ -21,22 +22,15 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i \
 		-e "s:wordlist.txt:${GAMES_DATADIR}\/${PN}\/wordlist.txt:" \
 		-e "s:\"audio\/:\"${GAMES_DATADIR}\/${PN}\/audio\/:" \
 		-e "s:\"images\/:\"${GAMES_DATADIR}\/${PN}\/images\/:" \
 		src/{ag.c,dlb.c} \
 		|| die "sed failed"
-	sed -i \
-		-e "/^LFLAGS/s:-funroll-loops -fomit-frame-pointer -pipe -O9:${CFLAGS}:" \
-		-e "/^CFLAGS/s:-funroll-loops -fomit-frame-pointer -pipe -O9:${CFLAGS}:" \
-		makefile \
-		|| die "sed failed"
 	rm -rf $(find . -type d -name CVS)
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_install() {
diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
new file mode 100644
index 000000000000..85b194ea7928
--- /dev/null
+++ b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
@@ -0,0 +1,34 @@
+--- makefile.old	2009-02-08 18:24:33.000000000 +0100
++++ makefile	2009-02-08 18:29:12.000000000 +0100
+@@ -1,5 +1,4 @@
+-LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9
+-CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer
++LDLIBS=`sdl-config --cflags --libs` -lSDL_mixer
+ CC=gcc
+ 
+ C_FILES=src/dlb.c src/linked.c src/sprite.c src/ag.c
+@@ -9,19 +8,19 @@
+ all:ag
+ 
+ ag: $(OBJ_FILES)
+-	$(CC) $(CFLAGS) -o $(OUT_FILE) $(OBJ_FILES)
++	$(CC) $(LDFLAGS) -o $(OUT_FILE) $(OBJ_FILES) $(LDLIBS)
+ 
+ src/dlb.o: src/dlb.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ src/linked.o: src/linked.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 	
+ src/sprite.o: src/sprite.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ src/ag.o: src/ag.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ clean:
+ 	rm -f src/*.o