Stable on ppc and x86. Cleanout of old version.

(Portage version: 2.1_rc3)
 (Unsigned Manifest commit)

3 files changed, 8 insertions, 161 deletions

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 53c393f9e7b0..55bcdecce6cd 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -7,25 +7,20 @@ MD5 a169eb5c8572ee01be52c4accf2608a2 files/openttd.initd 529
 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd files/openttd.initd 529
 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 files/openttd.initd 529
 DIST openttd-0.4.0.1-source.tar.gz 2950778
-DIST openttd-0.4.6-source.tar.bz2 2197008 RMD160 e40b858dcd1fd8ae764d5907d8b58b345d030bac SHA256 74238cfe7b159134f45eff815beed1196b4633390b1259b5ed2d9a16386e91d0
 DIST openttd-0.4.7-source-scenarios.zip 4969396 RMD160 d0a18925f6e06881d86217621dbe09a39d9f7543 SHA256 b6f3c2d65a28d7cbcbb0236ba88675ad2862dc953bd7cdc143fedb7271d68358
 DIST openttd-0.4.7-source.tar.bz2 2202261 RMD160 14817f7c87f8086a60f058b6d046ed2c6183e8d0 SHA256 a408328949909715042a2b803647d2261f37b82877052bda82992631da915565
 EBUILD openttd-0.4.0.1-r1.ebuild 4349 RMD160 c7135e693ebe3910137e038be68b5701daacee82 SHA1 a976cdc8d80e146a94da35940762153065e23d65 SHA256 f614b93eebc09e2966f6f99bc722d363e8a24226b31d1107ac14c5f3d4a0ac66
 MD5 44e37a7863de4415a5b4506e41cac6cc openttd-0.4.0.1-r1.ebuild 4349
 RMD160 c7135e693ebe3910137e038be68b5701daacee82 openttd-0.4.0.1-r1.ebuild 4349
 SHA256 f614b93eebc09e2966f6f99bc722d363e8a24226b31d1107ac14c5f3d4a0ac66 openttd-0.4.0.1-r1.ebuild 4349
-EBUILD openttd-0.4.6.ebuild 4271 RMD160 f068b9b2d3c887cc6c7b64c1dd7d2bfcde32d4a7 SHA1 829d2757b607a92baf30c2bf0b132d9fc16f574b SHA256 69b5832b0bc4276e864b3e76789cd6a72315d77659ff054aaee384b542664982
-MD5 f7ecb7450bd69672cdf3eae646e7fe4b openttd-0.4.6.ebuild 4271
-RMD160 f068b9b2d3c887cc6c7b64c1dd7d2bfcde32d4a7 openttd-0.4.6.ebuild 4271
-SHA256 69b5832b0bc4276e864b3e76789cd6a72315d77659ff054aaee384b542664982 openttd-0.4.6.ebuild 4271
-EBUILD openttd-0.4.7.ebuild 4920 RMD160 0ed04e178930a6e200342d377a891a3c114ffd98 SHA1 4156f55918fa8753dcf057cd31c6c8ac18e6acdf SHA256 a87144dc58d941d3d149bb434ff73e4b975a7a972d183373d40d8f782e1f06bb
-MD5 45d82a69351bc1cdd8e829ae53cc5af2 openttd-0.4.7.ebuild 4920
-RMD160 0ed04e178930a6e200342d377a891a3c114ffd98 openttd-0.4.7.ebuild 4920
-SHA256 a87144dc58d941d3d149bb434ff73e4b975a7a972d183373d40d8f782e1f06bb openttd-0.4.7.ebuild 4920
-MISC ChangeLog 3433 RMD160 1d85491fc88c51c9ab366287bbdbb1296e655042 SHA1 66554b03b04900da4a4af3288747f7115cf83518 SHA256 876baf0d2b5f878cbbf8c415a1294534ebea6d8650cb0ce491c7325727e21c49
-MD5 853cdc2e2e1c70f0029bac751a66780f ChangeLog 3433
-RMD160 1d85491fc88c51c9ab366287bbdbb1296e655042 ChangeLog 3433
-SHA256 876baf0d2b5f878cbbf8c415a1294534ebea6d8650cb0ce491c7325727e21c49 ChangeLog 3433
+EBUILD openttd-0.4.7.ebuild 4914 RMD160 b4926f81255109c790bcbe4316e3dca7537ab609 SHA1 325b2f194acbf0e6fc6017100853e0f5dc1df19c SHA256 2e06dff30d01e22286321fbeae48ee5353e3facf5ef606169f76e457ed5ffe30
+MD5 bbcfdf953d7abef9dad89ae9ca7f3839 openttd-0.4.7.ebuild 4914
+RMD160 b4926f81255109c790bcbe4316e3dca7537ab609 openttd-0.4.7.ebuild 4914
+SHA256 2e06dff30d01e22286321fbeae48ee5353e3facf5ef606169f76e457ed5ffe30 openttd-0.4.7.ebuild 4914
+MISC ChangeLog 3527 RMD160 6c147c26bd4f1c949402f1fb5ade06fbb4d50287 SHA1 2112826d614d057ab8346e5970b2b2c2f60d0412 SHA256 bca241e0c66d8bdde9d2c52ccebc0811e2c6b642fb35724f7eba0e86b20b028d
+MD5 8e7e89036810b837c9437c80031a7073 ChangeLog 3527
+RMD160 6c147c26bd4f1c949402f1fb5ade06fbb4d50287 ChangeLog 3527
+SHA256 bca241e0c66d8bdde9d2c52ccebc0811e2c6b642fb35724f7eba0e86b20b028d ChangeLog 3527
 MISC metadata.xml 245 RMD160 092488417a4ecd8286f803d499d3ee5efc121c56 SHA1 7f30c4065217499320aaab7f0f7650002656a981 SHA256 af1085b55f2132ed23fffa8e738e32260c4d32b4211739bc3f6f8d436af87199
 MD5 7efefbbe81a05cbc5d4e96203f047fda metadata.xml 245
 RMD160 092488417a4ecd8286f803d499d3ee5efc121c56 metadata.xml 245
@@ -33,9 +28,6 @@ SHA256 af1085b55f2132ed23fffa8e738e32260c4d32b4211739bc3f6f8d436af87199 metadata
 MD5 58b6f8b5a58925f558524fcb4c2711fc files/digest-openttd-0.4.0.1-r1 75
 RMD160 8e24c352f50e87baa00dba9fc9d39f920f8864f3 files/digest-openttd-0.4.0.1-r1 75
 SHA256 c0add6a15064c39308b64eabdf2b03e893a4e21d3b71d184904b02d8baca0dbc files/digest-openttd-0.4.0.1-r1 75
-MD5 ef1a0ddb777ddab13946e801fd189a52 files/digest-openttd-0.4.6 268
-RMD160 a147a8851e0d7fea3bc68ea68258aa02968cdf25 files/digest-openttd-0.4.6 268
-SHA256 96d52977d2b212cc09e4669cda5d585d42964a037980527d35a2d46a3a763436 files/digest-openttd-0.4.6 268
 MD5 83c994f9799a4e6ca03d4223efc870b2 files/digest-openttd-0.4.7 554
 RMD160 1c3a503cf11fbd7a38983a4ae2d10a5455de9d52 files/digest-openttd-0.4.7 554
 SHA256 d4c9365a3eba4078de3859e3b7cc28a5d4d47d36da978669d564499d540b2c97 files/digest-openttd-0.4.7 554
diff --git a/games-simulation/openttd/files/digest-openttd-0.4.6 b/games-simulation/openttd/files/digest-openttd-0.4.6
deleted file mode 100644
index a5418eafaaee..000000000000
--- a/games-simulation/openttd/files/digest-openttd-0.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e9e3b9e63bc9f244cf9232ea4a1e71d openttd-0.4.6-source.tar.bz2 2197008
-RMD160 e40b858dcd1fd8ae764d5907d8b58b345d030bac openttd-0.4.6-source.tar.bz2 2197008
-SHA256 74238cfe7b159134f45eff815beed1196b4633390b1259b5ed2d9a16386e91d0 openttd-0.4.6-source.tar.bz2 2197008
diff --git a/games-simulation/openttd/openttd-0.4.6.ebuild b/games-simulation/openttd/openttd-0.4.6.ebuild
deleted file mode 100644
index 370c3cd5190e..000000000000
--- a/games-simulation/openttd/openttd-0.4.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.4.6.ebuild,v 1.1 2006/03/25 23:25:20 pylon Exp $
-
-inherit eutils games
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.com/"
-SRC_URI="mirror://sourceforge/openttd/${P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug png zlib timidity alsa dedicated"
-
-DEPEND="media-libs/libsdl
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		timidity? ( media-sound/timidity++ )
-		!timidity? ( alsa? ( media-sound/alsa-utils ) )
-	)"
-
-src_compile() {
-	local myopts=""
-	use debug && myopts="${myopts} DEBUG=1"
-	use dedicated && myopts="${myopts} DEDICATED=1"
-	use png && myopts="${myopts} WITH_PNG=1"
-	use zlib && myopts="${myopts} WITH_ZLIB=1"
-	if ! use dedicated; then
-		myopts="${myopts} WITH_SDL=1"
-		if ! use timidity; then
-			use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi"
-		fi
-	fi
-
-	emake -j1 \
-		MANUAL_CONFIG=1 \
-		UNIX=1 \
-		WITH_NETWORK=1 \
-		INSTALL=1 \
-		RELEASE=${PV} \
-		USE_HOMEDIR=1 \
-		PERSONAL_DIR=.openttd \
-		PREFIX=/usr \
-		DATA_DIR=share/games/${PN} \
-		${myopts} \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin openttd || die "dogamesbin failed"
-
-	insinto "${GAMES_DATADIR}/${PN}/data"
-	doins data/* || die "doins failed (data)"
-
-	insinto "${GAMES_DATADIR}/${PN}/lang"
-	doins lang/*.lng || die "doins failed (lang)"
-
-	insinto "${GAMES_DATADIR}/${PN}/scenario"
-	#doins scenario/* || die "doins failed (scenario)"
-
-	insinto "${GAMES_DATADIR}/${PN}/scripts"
-	doins scripts/*.example || die "doins failed (scripts)"
-
-	#doicon media/openttd.*.png
-	for i in {16,32,48,64,128}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/apps
-		doins media/openttd.${i}.png
-		mv ${D}/usr/share/icons/hicolor/${i}x${i}/apps/openttd.${i}.png \
-			${D}/usr/share/icons/hicolor/${i}x${i}/apps/openttd.png
-	done
-
-	if ! use dedicated; then
-		if use timidity || use alsa; then
-			make_desktop_entry "openttd -m extmidi" "OpenTTD" openttd
-		else
-			make_desktop_entry openttd "OpenTTD" openttd
-		fi
-	else
-		newinitd "${FILESDIR}"/openttd.initd openttd
-	fi
-
-	dodoc readme.txt changelog.txt docs/Manual.txt docs/console.txt \
-		docs/multiplayer.txt
-	newdoc scripts/readme.txt readme_scripts.txt
-	doman docs/openttd.6
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	echo
-	einfo "In order to play, you must copy the following 6 files from "
-	einfo "a version of TTD to ${GAMES_DATADIR}/${PN}/data/."
-	echo
-	einfo "From the WINDOWS version you need: "
-	einfo "  sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-	einfo "OR from the DOS version you need: "
-	einfo "  SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-	echo
-	einfo "Scenarios have been removed from the sources in this version."
-	echo
-	einfo "File names are case sensitive so make sure they are "
-	einfo "correct for whichever version you have."
-	echo
-
-	if use dedicated; then
-		einfo "You have chosen the dedicated USE flag which builds a "
-		einfo "version of OpenTTD to be used as a game server which "
-		einfo "does not require SDL. You will not be able to play the "
-		einfo "game, but if you don't pass this flag you can still use "
-		einfo "it as a server in the same way, but SDL will be required."
-		echo
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when run, including any running client sessions!"
-		echo
-	else
-		if use timidity || use alsa; then
-			einfo "If you want music, you must copy the gm/ directory"
-			einfo "to ${GAMES_DATADIR}/${PN}/"
-			einfo "You can enable MIDI by running:"
-			einfo "  openttd -m extmidi"
-			echo
-			if use timidity; then
-				einfo "You also need soundfonts for timidity, if you don't"
-				einfo "know what that is, do:"
-				echo
-				einfo "emerge media-sound/timidity-eawpatches"
-			else
-				einfo "You have emerged with 'aplaymidi' for playing MIDI."
-				einfo "You have to set the environment variable ALSA_OUTPUT_PORTS."
-				einfo "Available ports can be listed by using 'aplaymidi -l'."
-			fi
-		else
-			einfo "timidity and/or alsa not in USE so music will not be played during the game."
-		fi
-		echo
-	fi
-}