Fix data loading, bug #158759

(Portage version: 2.1.2_rc4-r3)
 (Signed Manifest commit)

3 files changed, 18 insertions, 80 deletions

diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 520c658f80ab..6fbbf6a51a14 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -5,20 +5,24 @@ AUX enigma-0.92-gcc41.patch 778 RMD160 8bc42f3e2395d8c905a9484df9b7e8520678e631
 MD5 cb27de800d7da933c03632dbab166cb0 files/enigma-0.92-gcc41.patch 778
 RMD160 8bc42f3e2395d8c905a9484df9b7e8520678e631 files/enigma-0.92-gcc41.patch 778
 SHA256 4e45c082000c0a6f577042944b98560bd1daaec58fd8704f23399463ac83b701 files/enigma-0.92-gcc41.patch 778
+AUX enigma-1.00-build.patch 2350 RMD160 42766cc37b6136d38ba1e68f9767998f2f48e84c SHA1 5131a807f2fbdf164ca161268518ffe49408280d SHA256 d0ed7b661620672147180cc3c5ee73738d1e49b879eed9c552df0efcb38265ac
+MD5 881beb5eecee4fd2d8906bdef43b797f files/enigma-1.00-build.patch 2350
+RMD160 42766cc37b6136d38ba1e68f9767998f2f48e84c files/enigma-1.00-build.patch 2350
+SHA256 d0ed7b661620672147180cc3c5ee73738d1e49b879eed9c552df0efcb38265ac files/enigma-1.00-build.patch 2350
 DIST enigma-0.92.tar.gz 10768245 RMD160 cdbe27425534792ac0199525db1d6068aefacebd SHA1 39aa8f4222945d91243387b42935ca074c2f0506 SHA256 027725d540076605ce60644c7aa5f175f7ab81c9e10c6cdd9be90c6b4bfd3cda
 DIST enigma-1.00.tar.gz 10466968 RMD160 a2ddd9600cddaf6b52c02af1c5631c8c4cd69045 SHA1 693a76e9f94e5188839c3bf7bcf32ccd0b04d84e SHA256 c44f36ef28c8bed1f5d5090edbe4cedda6f37472e729eed3406a350365ca32be
 EBUILD enigma-0.92.ebuild 1530 RMD160 67d5123e59f7d70f55a3cd39c8da575eb89f21de SHA1 39649212055888efabbe0d43770c1e55b406f34d SHA256 43f66514fb070ed6ab78f444456e208a32d4fb49194a72d6412d20ee13a0ef56
 MD5 1d4f72994d03b5a54aace0ca0aa64490 enigma-0.92.ebuild 1530
 RMD160 67d5123e59f7d70f55a3cd39c8da575eb89f21de enigma-0.92.ebuild 1530
 SHA256 43f66514fb070ed6ab78f444456e208a32d4fb49194a72d6412d20ee13a0ef56 enigma-0.92.ebuild 1530
-EBUILD enigma-1.00.ebuild 1497 RMD160 7a9d42f8fed8f48bae18c5355f335a08a6afd7a7 SHA1 60dbe7af09574b94170396c8d7c171050a2df544 SHA256 31c5d35d84439bc8e8325c9a62742672520c20041843d2bc2a48bb65c2c0cb03
-MD5 84b1da0420a3e17f47308232a82aacdd enigma-1.00.ebuild 1497
-RMD160 7a9d42f8fed8f48bae18c5355f335a08a6afd7a7 enigma-1.00.ebuild 1497
-SHA256 31c5d35d84439bc8e8325c9a62742672520c20041843d2bc2a48bb65c2c0cb03 enigma-1.00.ebuild 1497
-MISC ChangeLog 4532 RMD160 ebb3096ad52e993a2615dee246fa4d3b7c703f4f SHA1 d9fdd359d5c1aa7bb39f0321260daf5c6d983222 SHA256 bdfaa10aa8d361b804823c3e3c6b5eb7adc1d2f870907c6fc61f40919990f9f2
-MD5 bda4177249b125f2bdc58f822cc9d8e9 ChangeLog 4532
-RMD160 ebb3096ad52e993a2615dee246fa4d3b7c703f4f ChangeLog 4532
-SHA256 bdfaa10aa8d361b804823c3e3c6b5eb7adc1d2f870907c6fc61f40919990f9f2 ChangeLog 4532
+EBUILD enigma-1.00-r1.ebuild 1044 RMD160 1cf947d23a2479dd6d10a01011272dd81d896c01 SHA1 36bd8b1411a889352801c5ae4359462f0ee80caa SHA256 0d7661eb1e44a0e90286306c41e1a2ca6e4cfae7fb8cd59e537ac62760fd075f
+MD5 f7ed15ff00c736d8e09cc286b7661965 enigma-1.00-r1.ebuild 1044
+RMD160 1cf947d23a2479dd6d10a01011272dd81d896c01 enigma-1.00-r1.ebuild 1044
+SHA256 0d7661eb1e44a0e90286306c41e1a2ca6e4cfae7fb8cd59e537ac62760fd075f enigma-1.00-r1.ebuild 1044
+MISC ChangeLog 4720 RMD160 a3cbec07640d28e626f24ca5d7ed6755a6192f29 SHA1 c1603e11e7dafe9b029824b179f655bd524aff64 SHA256 fcd27f9449d5e91a9b7f7e133192c5435f3005ef8631145543de279545ea7408
+MD5 c42e7d61ed13ce7c3de981f7b7d68b79 ChangeLog 4720
+RMD160 a3cbec07640d28e626f24ca5d7ed6755a6192f29 ChangeLog 4720
+SHA256 fcd27f9449d5e91a9b7f7e133192c5435f3005ef8631145543de279545ea7408 ChangeLog 4720
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,13 +30,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 4051ec551b28596af13f8a7fef5f3d62 files/digest-enigma-0.92 241
 RMD160 8151863d7082549b51c57ceb34e4a68a5375928d files/digest-enigma-0.92 241
 SHA256 3aa602e1e1816ffe5920440cb79426ea11eed5e26fe6b4f4bec5e6a984ebe0f5 files/digest-enigma-0.92 241
-MD5 0162e91ab0ab9e3100c64961c9b064f0 files/digest-enigma-1.00 241
-RMD160 015898a8e7bb4125da33da6ad67481b02951d8a8 files/digest-enigma-1.00 241
-SHA256 cdaae290d7150a64930cade4da974b533731c10fea9f9069932349737c3d785c files/digest-enigma-1.00 241
+MD5 0162e91ab0ab9e3100c64961c9b064f0 files/digest-enigma-1.00-r1 241
+RMD160 015898a8e7bb4125da33da6ad67481b02951d8a8 files/digest-enigma-1.00-r1 241
+SHA256 cdaae290d7150a64930cade4da974b533731c10fea9f9069932349737c3d785c files/digest-enigma-1.00-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFlUIcdz7hIScOURERAiFFAJ9FWBD769JIMVSL5riYzsGPl6823wCbBwBU
-EHRcRA5TSG7d/niMq5aSZYk=
-=84fb
+iD8DBQFFmGpUdz7hIScOURERAvjLAKDxjfK5iRRB5KMqGr/AtuQiwBJvEgCfSM1w
+GAP5y6VDBQFkRT+Codv637Q=
+=GHWl
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/enigma/enigma-1.00.ebuild b/games-puzzle/enigma/enigma-1.00.ebuild
deleted file mode 100644
index 084a71f30b18..000000000000
--- a/games-puzzle/enigma/enigma-1.00.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.00.ebuild,v 1.1 2006/12/21 08:47:58 mr_bones_ Exp $
-
-inherit eutils games
-
-DESCRIPTION="puzzle game similar to Oxyd"
-HOMEPAGE="http://www.nongnu.org/enigma/"
-SRC_URI="http://download.berlios.de/enigma-game/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="media-libs/sdl-ttf
-	>=media-libs/libsdl-1.2.0
-	>=media-libs/sdl-mixer-1.2.4
-	>=media-libs/sdl-image-1.2.0
-	>=dev-lang/lua-4.0
-	dev-libs/xerces-c
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix up the locale install location
-	if use nls ; then
-		sed -i \
-			-e "/^datadir/s:=.*:= /usr/share:" \
-			po/Makefile.in.in \
-			src/Makefile.am \
-			|| die "sed failed"
-	fi
-
-	# thanks, we'll handle the doc install ourselves.
-	sed -i \
-		-e 's/: install-docDATA/:/' \
-		-e '/^SUBDIRS/s/doc//' Makefile.in \
-		|| die "sed failed"
-}
-
-src_compile() {
-	egamesconf \
-		--disable-dependency-tracking \
-		--enable-optimize \
-		$(use_enable nls) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mv "${D}/${GAMES_PREFIX}/share/"* "${D}/usr/share/"
-	rm -r "${D}/${GAMES_PREFIX}/share"
-	dodoc ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING
-	dohtml -r doc/*
-	doman doc/enigma.6
-	prepgamesdirs
-}
diff --git a/games-puzzle/enigma/files/digest-enigma-1.00 b/games-puzzle/enigma/files/digest-enigma-1.00
deleted file mode 100644
index 7577edefaf11..000000000000
--- a/games-puzzle/enigma/files/digest-enigma-1.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 428a9cce666cd45812e785f00a483ef9 enigma-1.00.tar.gz 10466968
-RMD160 a2ddd9600cddaf6b52c02af1c5631c8c4cd69045 enigma-1.00.tar.gz 10466968
-SHA256 c44f36ef28c8bed1f5d5090edbe4cedda6f37472e729eed3406a350365ca32be enigma-1.00.tar.gz 10466968