Hotfix release for 0.4.6; bug #127663.

(Portage version: 2.1_pre6-r4)

4 files changed, 190 insertions, 4 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index bdc762f0b20b..2e742b58da9a 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.17 2006/03/25 23:25:20 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.18 2006/03/26 22:15:58 pylon Exp $
+
+*openttd-0.4.7 (26 Mar 2006)
+
+  26 Mar 2006; Lars Weiler <pylon@gentoo.org> +openttd-0.4.7.ebuild:
+  Hotfix release for 0.4.6; bug #127663.  The scenarios are also back now, but
+  they will be installed with the scenario USE-flag only (not everybody wants
+  to download the 4.7MB).  Thanks to Luca Spiller who found the
+  scenario-package.
 
 *openttd-0.4.6 (25 Mar 2006)
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 74dfdc4d68f8..e0103bcea55e 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,12 +1,15 @@
-MD5 5cbfd38f0b113625e021adccdf540b6e ChangeLog 3092
-RMD160 ab0f1b2cd13237c82fdf87476bb9fd29804a9e6d ChangeLog 3092
-SHA256 b991487cf64f8056688adc329a99d8b428af0cc363b68f21cb24d6b8a216104e ChangeLog 3092
+MD5 46d2656db9f422b6134e9f801e8d9cf4 ChangeLog 3234
+RMD160 17e86bf0b84aefb13d8991a110a6422bad5d7589 ChangeLog 3234
+SHA256 73fe55ee1c81ace668623b63e75e7c974dd141f54543395f0692e95e61067928 ChangeLog 3234
 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
 MD5 43ec527a9d656d58d852c2a828458840 files/openttd-0.4.0.1-buffer-checks.patch 6632
 RMD160 444629d2d4b33e7eac3ed962f43d8f0dee23d149 files/openttd-0.4.0.1-buffer-checks.patch 6632
 SHA256 809f28bc4233641312e07c4305a3d6f15e3a609d420fca66d4aadcf68fbd65c8 files/openttd-0.4.0.1-buffer-checks.patch 6632
@@ -22,3 +25,6 @@ SHA256 f614b93eebc09e2966f6f99bc722d363e8a24226b31d1107ac14c5f3d4a0ac66 openttd-
 MD5 f7ecb7450bd69672cdf3eae646e7fe4b openttd-0.4.6.ebuild 4271
 RMD160 f068b9b2d3c887cc6c7b64c1dd7d2bfcde32d4a7 openttd-0.4.6.ebuild 4271
 SHA256 69b5832b0bc4276e864b3e76789cd6a72315d77659ff054aaee384b542664982 openttd-0.4.6.ebuild 4271
+MD5 4e374c3be615820004ade1136581f11d openttd-0.4.7.ebuild 4921
+RMD160 5187876084f3b1f6f38462048c40bc6ad843b183 openttd-0.4.7.ebuild 4921
+SHA256 b0aa0f505b29de5ee7f68a979eedbd7d4c28b7568ddd999fc2130918a1fbd20a openttd-0.4.7.ebuild 4921
diff --git a/games-simulation/openttd/files/digest-openttd-0.4.7 b/games-simulation/openttd/files/digest-openttd-0.4.7
new file mode 100644
index 000000000000..c2f16d388b97
--- /dev/null
+++ b/games-simulation/openttd/files/digest-openttd-0.4.7
@@ -0,0 +1,6 @@
+MD5 e64a3599f81409adfacf1699a2eeee3e openttd-0.4.7-source-scenarios.zip 4969396
+RMD160 d0a18925f6e06881d86217621dbe09a39d9f7543 openttd-0.4.7-source-scenarios.zip 4969396
+SHA256 b6f3c2d65a28d7cbcbb0236ba88675ad2862dc953bd7cdc143fedb7271d68358 openttd-0.4.7-source-scenarios.zip 4969396
+MD5 7a7201ed0f6c1727ac22a977d20c7611 openttd-0.4.7-source.tar.bz2 2202261
+RMD160 14817f7c87f8086a60f058b6d046ed2c6183e8d0 openttd-0.4.7-source.tar.bz2 2202261
+SHA256 a408328949909715042a2b803647d2261f37b82877052bda82992631da915565 openttd-0.4.7-source.tar.bz2 2202261
diff --git a/games-simulation/openttd/openttd-0.4.7.ebuild b/games-simulation/openttd/openttd-0.4.7.ebuild
new file mode 100644
index 000000000000..ce2da311e9e7
--- /dev/null
+++ b/games-simulation/openttd/openttd-0.4.7.ebuild
@@ -0,0 +1,166 @@
+# 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.7.ebuild,v 1.1 2006/03/26 22:15:58 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
+	scenarios? ( mirror://sourceforge/openttd/${P}-source-scenarios.zip)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug png zlib timidity alsa dedicated scenarios"
+
+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_unpack() {
+	unpack ${P}-source.tar.bz2
+	if use scenarios; then
+		cd ${S}/scenario/
+		unpack ${P}-source-scenarios.zip
+	fi
+	cd ${S}
+}
+
+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)"
+
+	if use scenarios; then
+		insinto "${GAMES_DATADIR}/${PN}/scenario"
+		doins scenario/* || die "doins failed (scenario)"
+	fi
+
+	insinto "${GAMES_DATADIR}/${PN}/scripts"
+	doins scripts/*.example || die "doins failed (scripts)"
+
+	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 "File names are case sensitive so make sure they are "
+	einfo "correct for whichever version you have."
+	echo
+
+	if ! use scenarios; then
+		einfo "Scenarios are now included in a seperate package. To "
+		einfo "install them as well please remerge with the "
+		einfo "\"scenarios\" USE flag."
+		echo
+	else
+		einfo "Scenarios are installed to ${GAMES_DATADIR}/${PN}/scenario,"
+		einfo "you will have to symlink them to ~/.openttd/scenario in order"
+		einfo "to use them."
+		einfo "Example:"
+		einfo "  mkdir -p ~/.openttd/scenario"
+		einfo "  ln -s ${GAMES_DATADIR}/${PN}/scenario/* ~/.openttd/scenario/"
+		echo
+	fi
+
+	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
+}