x86 stable wrt #350446. punt old, no more stable for ppc and ppc64

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

5 files changed, 8 insertions, 80 deletions

diff --git a/games-puzzle/bastet/ChangeLog b/games-puzzle/bastet/ChangeLog
index fd4556972dfb..7fc63f602643 100644
--- a/games-puzzle/bastet/ChangeLog
+++ b/games-puzzle/bastet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/bastet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/ChangeLog,v 1.11 2011/01/04 23:11:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/ChangeLog,v 1.12 2011/01/05 21:29:32 ssuominen Exp $
+
+  05 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> bastet-0.43.ebuild:
+  x86 stable wrt #350446
 
   04 Jan 2011; Markos Chandras <hwoarang@gentoo.org> bastet-0.43.ebuild:
   Stable on amd64 wrt bug #350446
diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest
index 80195b2041dc..13854f69f804 100644
--- a/games-puzzle/bastet/Manifest
+++ b/games-puzzle/bastet/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX bastet-0.41-as-needed.patch 511 RMD160 f0cf61c9fce8b9a2850074019d89114940445228 SHA1 5e9347e19b33c85e7c1b2e0642effa11358905ba SHA256 99745089c082671cd989c21410172021728ac08463eadd7507cd988bc294769e
 AUX bastet-0.43-gentoo.patch 474 RMD160 4f3cba11eed23fde2f4e6155b1fcec841210f8ef SHA1 bb23a89e93c931a3c48e69d1a3f423912f2e1708 SHA256 a9bac74bfabf05c186676a7ef4520fc4cf80a9814ef806b82464bea5642cbe65
-DIST bastet-0.41.tgz 24195 RMD160 00801881e8ee5d42f91fe5f231d3151606032851 SHA1 644a0f76adedef84946159520c1639ff0c6c47ec SHA256 32e58210499d4c525a2b2c82e08e1bbbc53de455b74922c94ac25a1fb7e17463
 DIST bastet-0.43.tgz 29115 RMD160 d84fe09316238443ee884d2932b3ecb4c0191cb0 SHA1 1d7d42f93831b903e1fccee106a71c0bd4822c3d SHA256 e208c68684cc9b818a08b0d3f5f1e7ef381b1e4d8bc801a90b5ff6a8f00d8168
-EBUILD bastet-0.41.ebuild 1118 RMD160 061e0b306ce737c29c002b6654de277d2ba9c82d SHA1 0ac595d721a37c6ad53d2596fd27c1eb74cc2612 SHA256 d325375c336f4de571f794de337988117402b68fdff3bc9834b28999be73ce21
-EBUILD bastet-0.43.ebuild 842 RMD160 bf0360e6bd5c20d9c093474c444ab97c03adc455 SHA1 653b19d5a408117a63985bd867bdc476f1c317cc SHA256 4db5f5acc7699914213a2499170b74b62aad5b91e99791dee6a8a6629fb9c65b
-MISC ChangeLog 1439 RMD160 7283f1ffcbbd099ac10f488f0ac2d9bf14fe232d SHA1 a4730fa7ac0432e92a2992e785377ea730d37bbe SHA256 2c8addf170a3cfd5c02667b4e2a72f6adec6714f3b3bd5859a542b05714400d0
+EBUILD bastet-0.43.ebuild 842 RMD160 80c68941a15110adc1374d9f7c556c659a9f0a4b SHA1 d535760019678579fba38c13811f2374143a078d SHA256 373f5d6b2aec7d72142f7defa8abc1d8ad77cff1fd98cce9715a0909173ffefd
+MISC ChangeLog 1540 RMD160 580227705177fb68655631fb666e24e8caa0f60a SHA1 18c219e48a5a83aba7e5ec3cf2263469f8183e1f SHA256 1ece6fe10a9c07e1fdc441a1a081bbbcec0c719580a78c740da0887792618d52
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0jqPkACgkQ9/cejkQaxBA5vACfd1HVJ6jjjP3QohcJpP5o0m6+
-yc4An3hzjk9Y+DHObwnFkXxBOTD6rkua
-=g/mF
------END PGP SIGNATURE-----
diff --git a/games-puzzle/bastet/bastet-0.41.ebuild b/games-puzzle/bastet/bastet-0.41.ebuild
deleted file mode 100644
index 4cc0b1500223..000000000000
--- a/games-puzzle/bastet/bastet-0.41.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.9 2009/02/08 18:27:16 tupone Exp $
-
-EAPI=2
-inherit toolchain-funcs eutils games
-
-DESCRIPTION="a simple, evil, ncurses-based Tetris(R) clone"
-HOMEPAGE="http://fph.altervista.org/prog/bastet.shtml"
-SRC_URI="http://fph.altervista.org/prog/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5"
-
-src_prepare() {
-	sed -i \
-		-e '/^include/s/^/-/' \
-		-e "/^CC/s/gcc/$(tc-getCC)/" \
-		-e "/^DATA_PREFIX/s:=.*:=${GAMES_STATEDIR}/:" \
-		-e '/^CFLAGS/s/=/+=/' \
-		Makefile \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	sed -i \
-		-e 's/ch;/ch = 0;/' \
-		main.c game.c \
-		|| die "sed failed"
-}
-
-src_install() {
-	dogamesbin bastet || die "dogamesbin failed"
-	doman bastet.6
-	dodoc AUTHORS BUGS NEWS README* TODO
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/bastet.scores" || die "touch failed"
-	fperms 664 "${GAMES_STATEDIR}/bastet.scores"
-	prepgamesdirs
-}
diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild
index 41a00c472520..952abba6e71c 100644
--- a/games-puzzle/bastet/bastet-0.43.ebuild
+++ b/games-puzzle/bastet/bastet-0.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/bastet-0.43.ebuild,v 1.3 2011/01/04 23:11:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bastet/bastet-0.43.ebuild,v 1.4 2011/01/05 21:29:32 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://fph.altervista.org/prog/files/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses
diff --git a/games-puzzle/bastet/files/bastet-0.41-as-needed.patch b/games-puzzle/bastet/files/bastet-0.41-as-needed.patch
deleted file mode 100644
index efb1efc01809..000000000000
--- a/games-puzzle/bastet/files/bastet-0.41-as-needed.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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) $< \