diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2009-02-08 17:35:24 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2009-02-08 17:35:24 +0000 |
commit | b5093f664543a93d57bafa0d4dc37340c9a25a0f (patch) | |
tree | 51240545254615330895401553e5114d0919421d /games-puzzle/anagramarama | |
parent | Sync to branch plus various fixes. (diff) | |
download | gentoo-2-b5093f664543a93d57bafa0d4dc37340c9a25a0f.tar.gz gentoo-2-b5093f664543a93d57bafa0d4dc37340c9a25a0f.tar.bz2 gentoo-2-b5093f664543a93d57bafa0d4dc37340c9a25a0f.zip |
Fix --as-needed bug #247416
(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686)
Diffstat (limited to 'games-puzzle/anagramarama')
-rw-r--r-- | games-puzzle/anagramarama/ChangeLog | 8 | ||||
-rw-r--r-- | games-puzzle/anagramarama/anagramarama-0.2.ebuild | 18 | ||||
-rw-r--r-- | games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch | 34 |
3 files changed, 46 insertions, 14 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/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 |