summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-02-08 18:27:21 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-02-08 18:27:21 +0000
commitdf3ca6685d42d0f4032d71dc1ee67fca3df24b69 (patch)
tree085beecf7258d45d26b038c84db89c4077a63486 /games-puzzle/bastet
parentFixed unquoted variables, bug #258164, thank Markus Meier for report. (diff)
downloadhistorical-df3ca6685d42d0f4032d71dc1ee67fca3df24b69.tar.gz
historical-df3ca6685d42d0f4032d71dc1ee67fca3df24b69.tar.bz2
historical-df3ca6685d42d0f4032d71dc1ee67fca3df24b69.zip
Fix --as-needed bug #247418
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686
Diffstat (limited to 'games-puzzle/bastet')
-rw-r--r--games-puzzle/bastet/ChangeLog8
-rw-r--r--games-puzzle/bastet/Manifest15
-rw-r--r--games-puzzle/bastet/bastet-0.41.ebuild13
-rw-r--r--games-puzzle/bastet/files/bastet-0.41-as-needed.patch19
4 files changed, 44 insertions, 11 deletions
diff --git a/games-puzzle/bastet/ChangeLog b/games-puzzle/bastet/ChangeLog
index f8b91bfb3041..895587b1a50c 100644
--- a/games-puzzle/bastet/ChangeLog
+++ b/games-puzzle/bastet/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/bastet
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/ChangeLog,v 1.8 2006/10/19 15:20:40 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/ChangeLog,v 1.9 2009/02/08 18:27:16 tupone Exp $
+
+ 08 Feb 2009; Tupone Alfredo <tupone@gentoo.org>
+ +files/bastet-0.41-as-needed.patch, bastet-0.41.ebuild:
+ Fix --as-needed bug #247418 by flameeyes@gentoo.org
19 Oct 2006; Tristan Heaven <nyhm@gentoo.org> bastet-0.41.ebuild:
Use LDFLAGS and install the man page
diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest
index ee1ce957db11..045e74782d81 100644
--- a/games-puzzle/bastet/Manifest
+++ b/games-puzzle/bastet/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bastet-0.41-as-needed.patch 511 RMD160 f0cf61c9fce8b9a2850074019d89114940445228 SHA1 5e9347e19b33c85e7c1b2e0642effa11358905ba SHA256 99745089c082671cd989c21410172021728ac08463eadd7507cd988bc294769e
DIST bastet-0.41.tgz 24195 RMD160 00801881e8ee5d42f91fe5f231d3151606032851 SHA1 644a0f76adedef84946159520c1639ff0c6c47ec SHA256 32e58210499d4c525a2b2c82e08e1bbbc53de455b74922c94ac25a1fb7e17463
-EBUILD bastet-0.41.ebuild 1109 RMD160 57798d144d5d6e72d5e99853ae69c7a1b3dc1432 SHA1 d299bff9ce514cb240d19ee1fb2e62878d1c0f11 SHA256 75c988d6d2943e9b985294fad63e0075ff019caaa2ed1f746fe96f932f0c2c44
-MISC ChangeLog 982 RMD160 768e4dfdca9945446dbdb28b330d44524d9ae082 SHA1 57ec9651520f52baba3a422a33e9eb6f0f4fa466 SHA256 a89313704b113a766ee831d3f44d5397741400578407ab59b647a70d6be0d56e
+EBUILD bastet-0.41.ebuild 1118 RMD160 061e0b306ce737c29c002b6654de277d2ba9c82d SHA1 0ac595d721a37c6ad53d2596fd27c1eb74cc2612 SHA256 d325375c336f4de571f794de337988117402b68fdff3bc9834b28999be73ce21
+MISC ChangeLog 1147 RMD160 b335981bd6f66082537a6907f0eb9564577ba1d3 SHA1 7438b9e893bd2db352cf7b5c6bdd2f958f2c7d47 SHA256 33675a587cc7467e70806d9b35ea31fa25bbadb317c7dfc1e2254b881655cb07
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmPJBYACgkQSYz9rjec82YKnwCffz0wza+v1QdaEGZYWyY+aEBm
+VKYAn1ZTQXm6TWU7qsmkI4ozIzvh+ijK
+=LpZA
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/bastet/bastet-0.41.ebuild b/games-puzzle/bastet/bastet-0.41.ebuild
index 0f14be079fa9..4cc0b1500223 100644
--- a/games-puzzle/bastet/bastet-0.41.ebuild
+++ b/games-puzzle/bastet/bastet-0.41.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/bastet/bastet-0.41.ebuild,v 1.8 2006/10/19 15:20:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/bastet-0.41.ebuild,v 1.9 2009/02/08 18:27:16 tupone Exp $
-inherit toolchain-funcs games
+EAPI=2
+inherit toolchain-funcs eutils games
DESCRIPTION="a simple, evil, ncurses-based Tetris(R) clone"
HOMEPAGE="http://fph.altervista.org/prog/bastet.shtml"
@@ -15,17 +16,15 @@ IUSE=""
DEPEND=">=sys-libs/ncurses-5"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
sed -i \
-e '/^include/s/^/-/' \
-e "/^CC/s/gcc/$(tc-getCC)/" \
-e "/^DATA_PREFIX/s:=.*:=${GAMES_STATEDIR}/:" \
-e '/^CFLAGS/s/=/+=/' \
- -e '/^LDFLAGS/s/=/+=/' \
Makefile \
|| die "sed failed"
+ epatch "${FILESDIR}"/${P}-as-needed.patch
sed -i \
-e 's/ch;/ch = 0;/' \
diff --git a/games-puzzle/bastet/files/bastet-0.41-as-needed.patch b/games-puzzle/bastet/files/bastet-0.41-as-needed.patch
new file mode 100644
index 000000000000..efb1efc01809
--- /dev/null
+++ b/games-puzzle/bastet/files/bastet-0.41-as-needed.patch
@@ -0,0 +1,19 @@
+--- Makefile.old 2009-02-08 19:19:20.000000000 +0100
++++ Makefile 2009-02-08 19:19:48.000000000 +0100
+@@ -12,14 +12,14 @@
+
+ CC=i686-pc-linux-gnu-gcc
+ CFLAGS+=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\"
+-LDFLAGS=-lncurses
++LDLIBS+=-lncurses
+ SOURCES=main.c game.c highscore.c bast.c
+ EXNAME=bastet
+
+ all: $(EXNAME)
+
+ $(EXNAME) : $(SOURCES:.c=.o)
+- $(CC) $(LDFLAGS) -o $(EXNAME) $(SOURCES:.c=.o)
++ $(CC) $(LDFLAGS) -o $(EXNAME) $(SOURCES:.c=.o) $(LDLIBS)
+
+ %.d: %.c
+ set -e; $(CC) -MM $(CFLAGS) $< \