Detect timidity enabled sdl-mixer. Fix bug #68259

Package-Manager: portage-2.1.1-r2

4 files changed, 47 insertions, 20 deletions

diff --git a/games-rpg/xu4/ChangeLog b/games-rpg/xu4/ChangeLog
index 57f574906d1c..15be8ab6be74 100644
--- a/games-rpg/xu4/ChangeLog
+++ b/games-rpg/xu4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/xu4
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.4 2004/10/22 11:30:34 blubb Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.5 2006/12/21 23:29:29 tupone Exp $
+
+  21 Dec 2006; <tupone@gentoo.org> xu4-0.9.ebuild:
+  Detect timidity enabled sdl-mixer. Fix bug #68259 by Marc Benstein
 
   22 Oct 2004; Simon Stelling <blubb@gentoo.org> xu4-0.9.ebuild:
   added ~amd64
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
index ca7205f47b9a..80e72726328a 100644
--- a/games-rpg/xu4/Manifest
+++ b/games-rpg/xu4/Manifest
@@ -1,22 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.9-savegame.patch 1861 RMD160 8246605a0dcf36769d6e4c4c0356a38d21f95728 SHA1 7a61912d20c551c2a5327f1e40340cc906dfb15c SHA256 29f2d391e59f91ce79b07efb036476d1f21cdcf150d9286e094dcdc56e1b575d
 MD5 c8204dbb0ebe1821538ef2ff0fc4fb00 files/0.9-savegame.patch 1861
 RMD160 8246605a0dcf36769d6e4c4c0356a38d21f95728 files/0.9-savegame.patch 1861
 SHA256 29f2d391e59f91ce79b07efb036476d1f21cdcf150d9286e094dcdc56e1b575d files/0.9-savegame.patch 1861
-DIST u4upgrad.zip 632072
-DIST ultima4-1.01.zip 537487
-DIST xu4-0.9.tar.gz 320090
-EBUILD xu4-0.9.ebuild 1773 RMD160 624f8d121ce3aee0aabf52ef95bb8d5f547ea7c0 SHA1 2aa0526c3657501fbc70017ce2dc3cafbd369ad5 SHA256 2a6bf96032c54a1d4c81f34cc97647e17baffd723b5f0375f747553f65dc1cf1
-MD5 334a18319a0cee66357d2f76fa8a3eb2 xu4-0.9.ebuild 1773
-RMD160 624f8d121ce3aee0aabf52ef95bb8d5f547ea7c0 xu4-0.9.ebuild 1773
-SHA256 2a6bf96032c54a1d4c81f34cc97647e17baffd723b5f0375f747553f65dc1cf1 xu4-0.9.ebuild 1773
-MISC ChangeLog 548 RMD160 2cdd4e95717e1e2c3306a064e3bdd9e4e5d263ad SHA1 6a996ef0c5f8f79255e571914d007bf2bc71b24c SHA256 6012813455f0171ac17c88f4282906b88b265eeabae1111562cec2144b66e501
-MD5 891a7a116b3e1c3395e757502ca21451 ChangeLog 548
-RMD160 2cdd4e95717e1e2c3306a064e3bdd9e4e5d263ad ChangeLog 548
-SHA256 6012813455f0171ac17c88f4282906b88b265eeabae1111562cec2144b66e501 ChangeLog 548
+DIST u4upgrad.zip 632072 RMD160 863f4626089ad511a1b4dc60f9115c5f8a5b6a70 SHA1 052fb6ef53a689576d7a8148acb3380e859504d2 SHA256 400ac37311f3be74c1b2d7836561b2ead2b146f5162586865b0f4881225cca58
+DIST ultima4-1.01.zip 537487 RMD160 9711d2b1041d7d5577fed09d5271bcdeab9f1fdc SHA1 e8b633cefb107caaf618171652c92684261b54c2 SHA256 ec84ef08e9e38156622300065aa62260276fc8f1c1ff2774f7916e7c10db40dc
+DIST xu4-0.9.tar.gz 320090 RMD160 2129a2bd7e8789ffa901082c248957335b1e5e9d SHA1 6103c3903aeb771da946af5dfac6d83549de6f01 SHA256 26d7a957411e98474d3a06a0bf63a683208d3c35c0cf7afe90db992a934b0bf3
+EBUILD xu4-0.9.ebuild 1988 RMD160 57d712b1861e1b2b6dfd2b2da4497f65620d64b0 SHA1 051332f9d87b040fadea9a3789a083497f0702a7 SHA256 9495c91d63e4f9f17cfde249c7756bee681dd0b7a7838be0d2322ca392515e3e
+MD5 1a65c81ff8e750e61984d94fb293f92d xu4-0.9.ebuild 1988
+RMD160 57d712b1861e1b2b6dfd2b2da4497f65620d64b0 xu4-0.9.ebuild 1988
+SHA256 9495c91d63e4f9f17cfde249c7756bee681dd0b7a7838be0d2322ca392515e3e xu4-0.9.ebuild 1988
+MISC ChangeLog 670 RMD160 a27eda02a0903fdf66a75ec79d6f49e419c4899d SHA1 71ebfda1eec31b50fdf928c102c92e0854a047c3 SHA256 b708c21b1cdf273ede3872a376e9f8c5af576ee29c3107d0d903dd18cb6787b5
+MD5 5544bde3ae020f4a875896effbce2814 ChangeLog 670
+RMD160 a27eda02a0903fdf66a75ec79d6f49e419c4899d ChangeLog 670
+SHA256 b708c21b1cdf273ede3872a376e9f8c5af576ee29c3107d0d903dd18cb6787b5 ChangeLog 670
 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 6c0078d6a0b637f6fb6a862894f9734b files/digest-xu4-0.9 177
-RMD160 9cc75a35f326b7f068fc12e1e10343c5250e28a8 files/digest-xu4-0.9 177
-SHA256 6333f6e1f5d102d7556187a2c1cd9f790657c3b1c342d1e232c8b748619d9764 files/digest-xu4-0.9 177
+MD5 f952e2cc35817b40fc409d0f59aecf58 files/digest-xu4-0.9 669
+RMD160 22ea322a35828c1b3e004964c6c1a6903fca7c6a files/digest-xu4-0.9 669
+SHA256 0310f24fbc576edd3973d3978a953ffb4d7da62c4a74b5558a5ba238b41bd815 files/digest-xu4-0.9 669
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFixjmbfN2jvlVAhwRAs5hAKC6aRX4yRHLt+OV8quNzMbdDP+IaQCfdDHX
+DZ4mB+T+GHiGPsFRoyJXDPQ=
+=vPZL
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/xu4/files/digest-xu4-0.9 b/games-rpg/xu4/files/digest-xu4-0.9
index 481c0adb33a3..50bf9fd6fa5d 100644
--- a/games-rpg/xu4/files/digest-xu4-0.9
+++ b/games-rpg/xu4/files/digest-xu4-0.9
@@ -1,3 +1,9 @@
-MD5 b2c71b0a292ff7d39d7fa1d056ffd63a xu4-0.9.tar.gz 320090
-MD5 9b668cc1a2d508a6325442c28cbe53ba ultima4-1.01.zip 537487
 MD5 4ce9c9cd9dab111275e0ebfde7a482c4 u4upgrad.zip 632072
+RMD160 863f4626089ad511a1b4dc60f9115c5f8a5b6a70 u4upgrad.zip 632072
+SHA256 400ac37311f3be74c1b2d7836561b2ead2b146f5162586865b0f4881225cca58 u4upgrad.zip 632072
+MD5 9b668cc1a2d508a6325442c28cbe53ba ultima4-1.01.zip 537487
+RMD160 9711d2b1041d7d5577fed09d5271bcdeab9f1fdc ultima4-1.01.zip 537487
+SHA256 ec84ef08e9e38156622300065aa62260276fc8f1c1ff2774f7916e7c10db40dc ultima4-1.01.zip 537487
+MD5 b2c71b0a292ff7d39d7fa1d056ffd63a xu4-0.9.tar.gz 320090
+RMD160 2129a2bd7e8789ffa901082c248957335b1e5e9d xu4-0.9.tar.gz 320090
+SHA256 26d7a957411e98474d3a06a0bf63a683208d3c35c0cf7afe90db992a934b0bf3 xu4-0.9.tar.gz 320090
diff --git a/games-rpg/xu4/xu4-0.9.ebuild b/games-rpg/xu4/xu4-0.9.ebuild
index 2fb4adbc3ead..cee72813de8d 100644
--- a/games-rpg/xu4/xu4-0.9.ebuild
+++ b/games-rpg/xu4/xu4-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.4 2004/10/22 11:30:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.5 2006/12/21 23:29:29 tupone Exp $
 
 inherit eutils games
 
@@ -24,6 +24,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/u4"
 
+pkg_setup() {
+	if ! built_with_use media-libs/sdl-mixer timidity ; then
+		eerror "${PN} needs sdl-mixer compiled with timidity use-flag enabled!"
+		die "sdl-mixer without timidity detected"
+	fi
+	games_pkg_setup
+}
+
 src_unpack() {
 	# xu4 will read the data files right out of the zip files
 	# but we want the docs from the original.