Fix autotools stuff and an arithmetic exception, bug #125374

Package-Manager: portage-2.1.2_pre3-r9

4 files changed, 67 insertions, 20 deletions

diff --git a/games-puzzle/gemhun/ChangeLog b/games-puzzle/gemhun/ChangeLog
index a1b401829fbd..9d537716d3c9 100644
--- a/games-puzzle/gemhun/ChangeLog
+++ b/games-puzzle/gemhun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/gemhun
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/ChangeLog,v 1.7 2006/03/23 19:47:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/ChangeLog,v 1.8 2006/10/26 22:50:03 nyhm Exp $
+
+  26 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/gemhun-20040529-srand.patch, gemhun-20040529.ebuild:
+  Fix autotools stuff and an arithmetic exception, bug #125374
 
   23 Mar 2006; Michael Hanselmann <hansmi@gentoo.org>
   gemhun-20040529.ebuild:
diff --git a/games-puzzle/gemhun/Manifest b/games-puzzle/gemhun/Manifest
index ee20e89ef877..5892d7a00f8e 100644
--- a/games-puzzle/gemhun/Manifest
+++ b/games-puzzle/gemhun/Manifest
@@ -1,24 +1,48 @@
-MD5 d64f623a9353c2322c0cf42f0bf19a95 ChangeLog 1052
-RMD160 e6b30578a852b8421791af41cfb1c26df0848116 ChangeLog 1052
-SHA256 74dfb3fd773a09c6fd60e85445f4e68c8fbd619017a4e7228af34cbdd16fe2ef ChangeLog 1052
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 20031016-gentoo-paths.patch 456 RMD160 6b529dbfbd902f21518fc0359c6f4219f46a2bf6 SHA1 44c523f1441ffa487ea6a8e0ba99d7b995db36ab SHA256 c668a1a978dad4afc4624f54bbae32efb8da68bfde63ac2fe719f1a0bbc7f3bd
 MD5 393571e3c21b30fd4e04becaeefb7abb files/20031016-gentoo-paths.patch 456
 RMD160 6b529dbfbd902f21518fc0359c6f4219f46a2bf6 files/20031016-gentoo-paths.patch 456
 SHA256 c668a1a978dad4afc4624f54bbae32efb8da68bfde63ac2fe719f1a0bbc7f3bd files/20031016-gentoo-paths.patch 456
+AUX 20040529-gentoo.patch 4537 RMD160 db4dfed43e55f26882a412697fa0f979866a832e SHA1 46660938ae65ee9971decd0f85e30166aabb3863 SHA256 e0526ea0e4e3358f47d86fbbfee56bd29e73191ce0cbb9047979c96fbdcdd32c
 MD5 77fcf519c1220cf073853e148621e725 files/20040529-gentoo.patch 4537
 RMD160 db4dfed43e55f26882a412697fa0f979866a832e files/20040529-gentoo.patch 4537
 SHA256 e0526ea0e4e3358f47d86fbbfee56bd29e73191ce0cbb9047979c96fbdcdd32c files/20040529-gentoo.patch 4537
-MD5 545a10ee3fb3fce9589db37ed100cc17 files/digest-gemhun-20031016 274
-RMD160 c93d0a7259d6f97d9ea6fbe4da46b9d6145654c4 files/digest-gemhun-20031016 274
-SHA256 60c334a1d47a001ccf8feed3f4368c9146f1f91ccb2284075489c50cf783b77b files/digest-gemhun-20031016 274
-MD5 6bec1584cad08f234c4b5882ce6537e9 files/digest-gemhun-20040529 846
-RMD160 e60b5bc14f0f1b6d672469f686d2b19f23de6656 files/digest-gemhun-20040529 846
-SHA256 a8934b1f425c1c8f2f7e523f149083b8e9eaf9285cfc4c8e34c0d232177c20f6 files/digest-gemhun-20040529 846
+AUX gemhun-20040529-srand.patch 342 RMD160 693b8e422ec7d37c1b57a774828426e1d3ce249d SHA1 e1d1b0554b3cea870de6906e1766a6b93f4a8b30 SHA256 0ed2b27127550e662c6221cdc9f7b65a922100f6d115db11271fd6357cffdbbb
+MD5 b456bc37c2d7eb4ee4f82bc79ba3add1 files/gemhun-20040529-srand.patch 342
+RMD160 693b8e422ec7d37c1b57a774828426e1d3ce249d files/gemhun-20040529-srand.patch 342
+SHA256 0ed2b27127550e662c6221cdc9f7b65a922100f6d115db11271fd6357cffdbbb files/gemhun-20040529-srand.patch 342
+DIST GemHunters-src-20031016.tar.gz 4393549 RMD160 e658f711230722f002ce2e09e29525683b1e3abf SHA256 f37df174e71b4f8c1bbc7b3eff4fa0ac51b46a7c89b6328255fe2b340d41d56f
+DIST GemHunters-src-20040529.tar.gz 3888860 RMD160 2cb87f5d20116a287137bc809ed480f160056de0 SHA1 accbd3b79d3d6b62c44e89b9f45b76c6b991e7bb SHA256 829cb1b44933211b5487c056e9521c9232cea5f2f1abc0a74ae10d2aae9143a5
+DIST fairylands-bin-20040529.tar.gz 1237487 RMD160 75d83d816ea351479c25c114332cf6a5e112c66c SHA1 9152671e40961f298c8fc97fc6d8a57fb358816d SHA256 9b5abccdff7c5df8532f09548b9a925d98463a23da15619a830c25dfd27c0c22
+DIST stars_in_the_night-bin-20040529.tar.gz 1539453 RMD160 b84e07cb08fe0102335edb0e05ef40dfb000bf47 SHA1 4edc7f31f03c98fd75ad130e6c13b3b9c05465a8 SHA256 1c8637aa6ac013517128ae7b202da245e68d36c7bb28e90409adc8f586092a4b
+EBUILD gemhun-20031016.ebuild 1202 RMD160 26665b49eae946e9d53b26d05d98a341f6c93dda SHA1 ed4c58c4061df079e552d0dbe65bfd31608fe1ac SHA256 e73b734705ef34911bd1e81c73de6f082287be80807c333199e9618bd95d9ad3
 MD5 bb46bbfdadd6666e4549508c7d034f0a gemhun-20031016.ebuild 1202
 RMD160 26665b49eae946e9d53b26d05d98a341f6c93dda gemhun-20031016.ebuild 1202
 SHA256 e73b734705ef34911bd1e81c73de6f082287be80807c333199e9618bd95d9ad3 gemhun-20031016.ebuild 1202
-MD5 9f37f3fd62edc70404ae9a5708123ccf gemhun-20040529.ebuild 1354
-RMD160 5ad3e472c50448ab54611d56ed67665026b1cc2f gemhun-20040529.ebuild 1354
-SHA256 1a602e11db39052d735e720c5351b94d47b8f9eba780088b9c00cffd648efc2d gemhun-20040529.ebuild 1354
+EBUILD gemhun-20040529.ebuild 1464 RMD160 4ca50adf5be734bc04196553d469957439b2bcf6 SHA1 f1174eb86b0f39e95d4873b06791bddaee9714a1 SHA256 e6b2412814c567400022dd352d79c3f7f54217ef9e7e5bd5e753766e5c4b74b9
+MD5 c7735adb3befd6cd4c2912d5d3f8c170 gemhun-20040529.ebuild 1464
+RMD160 4ca50adf5be734bc04196553d469957439b2bcf6 gemhun-20040529.ebuild 1464
+SHA256 e6b2412814c567400022dd352d79c3f7f54217ef9e7e5bd5e753766e5c4b74b9 gemhun-20040529.ebuild 1464
+MISC ChangeLog 1224 RMD160 c2d758d5fa6383cf5ff56f3d05d5f4e42d015383 SHA1 68b049f7e914ed80f6e6c6c48e93742bafc0d3b4 SHA256 029d0f9be5a84f2f1d3827bef675c4e410316583b9bd5e4cbca422dc949b8abd
+MD5 f9b418adf62444c1c885fae86b618159 ChangeLog 1224
+RMD160 c2d758d5fa6383cf5ff56f3d05d5f4e42d015383 ChangeLog 1224
+SHA256 029d0f9be5a84f2f1d3827bef675c4e410316583b9bd5e4cbca422dc949b8abd ChangeLog 1224
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 545a10ee3fb3fce9589db37ed100cc17 files/digest-gemhun-20031016 274
+RMD160 c93d0a7259d6f97d9ea6fbe4da46b9d6145654c4 files/digest-gemhun-20031016 274
+SHA256 60c334a1d47a001ccf8feed3f4368c9146f1f91ccb2284075489c50cf783b77b files/digest-gemhun-20031016 274
+MD5 6bec1584cad08f234c4b5882ce6537e9 files/digest-gemhun-20040529 846
+RMD160 e60b5bc14f0f1b6d672469f686d2b19f23de6656 files/digest-gemhun-20040529 846
+SHA256 a8934b1f425c1c8f2f7e523f149083b8e9eaf9285cfc4c8e34c0d232177c20f6 files/digest-gemhun-20040529 846
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQTuhdz7hIScOURERAgEIAKDaIOAriJNIetGi3387DOGN1ixP1ACgofD/
+K8AFusQ9J6jG5BEUyxw3UII=
+=W+KC
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/gemhun/files/gemhun-20040529-srand.patch b/games-puzzle/gemhun/files/gemhun-20040529-srand.patch
new file mode 100644
index 000000000000..b8b3d40952f7
--- /dev/null
+++ b/games-puzzle/gemhun/files/gemhun-20040529-srand.patch
@@ -0,0 +1,11 @@
+--- src/network.cpp
++++ src/network.cpp
+@@ -68,7 +68,7 @@
+ 		sprintf ( self . alias, "%s", "you" ) ;
+ 	
+ 	srand ( SDL_GetTicks () + self . ip . port + (int) self . alias +
+-			rand () - SDL_GetTicks () + rand () % SDL_GetTicks () ) ;
++			rand () - SDL_GetTicks () + rand () ) ;
+ 	
+ 	sprintf ( self . key, "%s", CreateKey () . c_str () ) ;
+ 	
diff --git a/games-puzzle/gemhun/gemhun-20040529.ebuild b/games-puzzle/gemhun/gemhun-20040529.ebuild
index c262fb5d2eb7..c0a35e2cd211 100644
--- a/games-puzzle/gemhun/gemhun-20040529.ebuild
+++ b/games-puzzle/gemhun/gemhun-20040529.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/gemhun-20040529.ebuild,v 1.3 2006/03/23 19:47:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/gemhun-20040529.ebuild,v 1.4 2006/10/26 22:50:03 nyhm Exp $
 
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
 inherit eutils autotools games
 
 DESCRIPTION="A puzzle game about grouping gems of a chosen amount together"
@@ -16,9 +18,8 @@ KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND="dev-games/kyra
-	>=media-libs/sdl-mixer-1.2.1
+	media-libs/sdl-mixer
 	virtual/opengl
-	sys-libs/ncurses
 	media-libs/sdl-net
 	media-libs/libpng"
 
@@ -30,13 +31,20 @@ src_unpack() {
 	# Fix to comply with gentoo-path
 	# and to remove a nasty violation by commenting a network calls
 	# Until upstream fix, that is
-	epatch "${FILESDIR}/${PV}-gentoo.patch"
-	eautoreconf || die "eautoreconf failed"
+	epatch \
+		"${FILESDIR}/${PV}-gentoo.patch" \
+		"${FILESDIR}"/${P}-srand.patch
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_compile() {
+	egamesconf --disable-nls || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog README README.Install TODO
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
 	insinto "${GAMES_DATADIR}/GemHunters/pax/"
 	doins -r ../fairylands ../stars_in_the_night || die "doins failed"
 	doicon pixmaps/${PN}.png