fix automagic linking against libtimidity (bug #321559); clarify the midi situation - patches from Locke Shinseiko (Wizzleby)

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 65 insertions, 59 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index ad0b92ff4eb4..e20da0d0196c 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.87 2010/05/21 21:02:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.88 2010/05/26 20:44:30 mr_bones_ Exp $
+
+  26 May 2010; Michael Sterrett <mr_bones_@gentoo.org> openttd-1.0.1.ebuild,
+  metadata.xml:
+  fix automagic linking against libtimidity (bug #321559); clarify the midi
+  situation - patches from Locke Shinseiko (Wizzleby)
 
   21 May 2010; Pacho Ramos <pacho@gentoo.org> openttd-0.7.5.ebuild:
   amd64 stable, bug 300182
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 8327ed5ba5fc..95f8ef6cd8b4 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
 DIST openttd-0.7.3-source.tar.bz2 4876403 RMD160 9455d2e25bc0123f858309906c558544c7f076dc SHA1 3e34ceec85b00c0918423790aad0d72ef4cd14c1 SHA256 eccfa15038c5f7991d2692cb190f34ba1fd9deaff8f181dd99145e41790fdbc3
 DIST openttd-0.7.5-source.tar.bz2 4891206 RMD160 43367ba8b95d0e1f38bbfb6beb3b2dfe81af639d SHA1 dea6eaea56eb96a972c735ca25ccc49c21a252e6 SHA256 635dfcf83b43b2b808d65167a1b37601aee2b8bd873a8f57aa5fa9779e1156c3
 DIST openttd-1.0.1-source.tar.bz2 5341259 RMD160 b14e45853e0475fe25508be888f38e6467ebc495 SHA1 8f1a35b3dea0c41386399d9889e2147c6b6e49c0 SHA256 6067601979736e8b1acb1b67919c13a9f53f3407d0f0704bd310a55ac15bbc1f
 EBUILD openttd-0.7.3.ebuild 3323 RMD160 840a97ad10656b74c9ef7bd30563f607e068f1c2 SHA1 f6d2f75f006fe09925a0c7995ec18e717a7d5a58 SHA256 5f16b7ff6a97d0af6824e2ca463c5d16972175e76117d7320d6fe22151d1a1ab
 EBUILD openttd-0.7.5.ebuild 3334 RMD160 47c013784c512ca623e494c341bed54fdb617c90 SHA1 41387d7536251787967a05a723803537f761602e SHA256 948489f7ab71ffa17502163be89c5c771ad64c5b369f9888c00ee0213ba12376
-EBUILD openttd-1.0.1.ebuild 4475 RMD160 97c58313bb99e23f3afe96fe3301d8cf2714c9fc SHA1 ad7df997179bc35448d417f025d962ce6489e0c1 SHA256 8f8e1962118b9f9222c189f864a4ff4c7be67ea3a5a73860779e1de77fb653db
-MISC ChangeLog 11440 RMD160 f5eeb770a96f4489485dc471e11a114f2199fb30 SHA1 1d1f2306c55e9d1e35e159555681eb6af902209e SHA256 30bcc75b29db35ec113967f47a528107ff8fdd6e07044fe34bda8e9685396781
-MISC metadata.xml 559 RMD160 4041a3c74f53a6904a20090fe4f1bf3d2ef2d87e SHA1 491bbeb0ce5b1df672b540cca2aa326f99f00272 SHA256 416eab88efae17dc46a5a6031f15355b1880b8856111cc6e76ca2d62fd89cf00
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv29NQACgkQCaWpQKGI+9RpLQCePz18nrI251ydfiqzun8ahx2x
-FHcAn1brk+/LCS0qeNrj/rgNqItl0ygl
-=CY6T
------END PGP SIGNATURE-----
+EBUILD openttd-1.0.1.ebuild 5008 RMD160 bc426fcd4ed3921056a0432883a1a9784fa37265 SHA1 67d3a57448a823fc0a4fab5496a864efa9d37fba SHA256 0ffe3dc769238cd3086d9e9a58c2d73cced399c0c0f80be6f58cdb98357a45c5
+MISC ChangeLog 11668 RMD160 e28fb15d3a2afc7d7a462bd18a5ee652850374e8 SHA1 31bd59560b0cff6c8b0784d1b93afd5641c28869 SHA256 5fca0fe6c090e49867999bff2c9dae5bcae709029123bc71eae09dd4e34bf617
+MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml
index c88fa2c3cc9b..031679386643 100644
--- a/games-simulation/openttd/metadata.xml
+++ b/games-simulation/openttd/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
+		<flag name='aplaymidi'>Enables midi music in game, using aplaymidi as an external player</flag>
+
 		<flag name='openmedia'>Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
 		<flag name='lzo'>Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
 		<flag name='dedicated'>Build only the openttd server, and not the client.</flag>
diff --git a/games-simulation/openttd/openttd-1.0.1.ebuild b/games-simulation/openttd/openttd-1.0.1.ebuild
index 7d5eae8178a8..e364d7cd49ed 100644
--- a/games-simulation/openttd/openttd-1.0.1.ebuild
+++ b/games-simulation/openttd/openttd-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild,v 1.1 2010/05/01 04:26:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild,v 1.2 2010/05/26 20:44:30 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa debug dedicated iconv icu lzo +openmedia +png +truetype zlib"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
 RESTRICT="test"
 
 DEPEND="
@@ -33,15 +33,16 @@ DEPEND="
 	iconv? ( virtual/libiconv )
 	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		alsa? ( media-sound/alsa-utils )
-	)"
+
 PDEPEND="
-	openmedia? (
-		games-misc/opengfx
-		games-misc/opensfx
-		games-misc/openmsx
+	!dedicated? (
+		openmedia? (
+			games-misc/opengfx
+			games-misc/opensfx
+			games-misc/openmsx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
 	)"
 
 src_configure() {
@@ -50,12 +51,17 @@ src_configure() {
 	# always built instead.
 	local myopts="${myopts} --without-allegro"
 
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts="${myopts} --without-libtimidity"
+
 	use debug && myopts="${myopts} --enable-debug=3"
 
 	if use dedicated ; then
 		myopts="${myopts} --enable-dedicated"
 	else
-		use alsa && myopts="${myopts} --with-midi=/usr/bin/aplaymidi"
+		use aplaymidi && myopts="${myopts} --with-midi='/usr/bin/aplaymidi'"
 		myopts="${myopts}
 			$(use_with truetype freetype)
 			$(use_with icu)
@@ -106,50 +112,53 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	if ! use openmedia ; then
-		elog
-		elog "OpenTTD was compiled without openmedia USE flags."
-		elog
-		elog "In order to play, you must either install games-misc/opengfx"
-		elog "as well as games-misc/opensfx or copy the following 6 files"
-		elog "from a version of Transport Tycoon Deluxe (windows or DOS)"
-		elog "to ~/.openttd/data/ or ${GAMES_DATADIR}/${PN}/data/."
-		elog
-		elog "From the WINDOWS version you need: "
-		elog "  sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-		elog "OR from the DOS version you need: "
-		elog "  SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-		elog
-		elog "File names are case sensitive so make sure they are "
-		elog "correct for whichever version you have."
-		elog
-	fi
-
 	if ! use lzo ; then
-		elog "OpenTTD was compiled without lzo2 support."
-		elog "While lzo2 is not required, disabling it does mean that"
-		elog "loading old savegames/scenarios from ancient versions (~0.2)"
-		elog "will be disabled"
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
 		elog
 	fi
 
 	if use dedicated ; then
 		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when run, including any running client sessions!"
+		ewarn "processes when triggered, including any running client sessions!"
 	else
-		if use alsa ; then
+		if use aplaymidi ; then
 			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "You have to set the environment variable ALSA_OUTPUT_PORTS."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
 			elog "Available ports can be listed by using 'aplaymidi -l'."
-			if ! use openmedia ; then
-				elog "You have disabled the openmedia use flag, in-game music"
-				elog "will be unavailable unless you install games-misc/openmsx"
-				elog "or install a music set in ~/.openttd/gm or use the in-game"
-				elog "download functionality to get a music set"
-			fi
 		else
-			elog "alsa not in USE so music will not be played during the game."
-
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
 		fi
 	fi
 }