Version bump; bug #143770.

Package-Manager: portage-2.1.1_pre5

4 files changed, 193 insertions, 5 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index fa14ca122c68..6ded6047659e 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2006/08/07 01:07:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.24 2006/08/14 08:42:13 pylon Exp $
+
+*openttd-0.4.8 (14 Aug 2006)
+
+  14 Aug 2006; Lars Weiler <pylon@gentoo.org> +openttd-0.4.8.ebuild:
+  Version bump; bug #143770.
 
 *openttd-0.4.8_rc2 (07 Aug 2006)
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 29d2c69270aa..babe616cfac2 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -12,6 +12,8 @@ DIST openttd-0.4.7-source.tar.bz2 2202261 RMD160 14817f7c87f8086a60f058b6d046ed2
 DIST openttd-0.4.8-RC1-source.tar.bz2 3876677 RMD160 a956fa20c03f0aa98b37fcc4d5b2feca19b8b153 SHA1 9851c07f804efc839cb476145823f44dc862b4fc SHA256 43f7f4c682999164ba6e3469cb595c54ffebaa567e0e8b7fb2e6143f061b951f
 DIST openttd-0.4.8-RC2-scenarios.tar.bz2 5000799 RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 SHA1 88b3caff739fbf7bd4eb143ae97925556e813ce4 SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca
 DIST openttd-0.4.8-RC2-source.tar.bz2 2211442 RMD160 59a66b05ce563a1c5d12b0f5ebe4bee818c8fe94 SHA1 26351512d98e81fb06d5964683aea8c24c9606f8 SHA256 f9e791b57a19b8e9889a620d1d46a5400c1b45dfbf2659a3dbead8de4d3a8c73
+DIST openttd-0.4.8-scenarios.tar.bz2 5000799 RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 SHA1 88b3caff739fbf7bd4eb143ae97925556e813ce4 SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca
+DIST openttd-0.4.8-source.tar.bz2 2212990 RMD160 9ec9d8ee3531dc5a4f421eae6844a50299c22455 SHA1 8161079003dadbd7153d65cc88f373f16a0c0aab SHA256 39556ac3524e762c7bfbd6b1438590c9d5010bed99b4aff725e68897a0d62f8f
 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
@@ -20,6 +22,10 @@ EBUILD openttd-0.4.7.ebuild 4961 RMD160 1fb8e9d905416c77149b5a2cba3301d3fd954691
 MD5 59779e011b80cfcca4ed5dd0151ee823 openttd-0.4.7.ebuild 4961
 RMD160 1fb8e9d905416c77149b5a2cba3301d3fd954691 openttd-0.4.7.ebuild 4961
 SHA256 84eb373e76aa973f4b92956d5175fbc267249d5dcdfca1b5bbe4cd657b1ce7b1 openttd-0.4.7.ebuild 4961
+EBUILD openttd-0.4.8.ebuild 4897 RMD160 749df67bbcd7337813fc0e4bfca013806d6edc76 SHA1 1223dcc4831383c894160a691504d6110f717671 SHA256 722dabd89c62a38d8ba07dc0ac5ca9d7c431a3ba91054379773e15f158bf14f9
+MD5 b649ce55b9061ce923a812b0c6517418 openttd-0.4.8.ebuild 4897
+RMD160 749df67bbcd7337813fc0e4bfca013806d6edc76 openttd-0.4.8.ebuild 4897
+SHA256 722dabd89c62a38d8ba07dc0ac5ca9d7c431a3ba91054379773e15f158bf14f9 openttd-0.4.8.ebuild 4897
 EBUILD openttd-0.4.8_rc1.ebuild 5075 RMD160 3031aabe4c57c2ddcb7b11b4717fdf874f71cb56 SHA1 c498937049623decd7c7e0763e13f3abbc4d53be SHA256 bd49ed8fbc80fb54287dfec6e116885f9439d2dc53ae9ef306078dbaa249e823
 MD5 7ac663ebc1b046a2d8fbef0c22e41ee6 openttd-0.4.8_rc1.ebuild 5075
 RMD160 3031aabe4c57c2ddcb7b11b4717fdf874f71cb56 openttd-0.4.8_rc1.ebuild 5075
@@ -28,10 +34,10 @@ EBUILD openttd-0.4.8_rc2.ebuild 5125 RMD160 191cf2147f13ecf540cdc527c36e8befa193
 MD5 160dac7af2d4189c16690c968e12bc49 openttd-0.4.8_rc2.ebuild 5125
 RMD160 191cf2147f13ecf540cdc527c36e8befa1939abc openttd-0.4.8_rc2.ebuild 5125
 SHA256 a9ef1d46c62d5caebb86dbcf327bc7de051adf9bb60a2f5e905d0283fb85441d openttd-0.4.8_rc2.ebuild 5125
-MISC ChangeLog 4287 RMD160 bcefc8035d0ca2aa31b0eaf6e57908fe0c6e08e9 SHA1 92d169c9e13fed72d32829bd5d8939961ccb1f56 SHA256 d7c286b0eca9734ddc45514f8c367d4043c9b7160781130ae8fcc8600486384f
-MD5 64a8c73f5850ebbf6e9abeee41acddc8 ChangeLog 4287
-RMD160 bcefc8035d0ca2aa31b0eaf6e57908fe0c6e08e9 ChangeLog 4287
-SHA256 d7c286b0eca9734ddc45514f8c367d4043c9b7160781130ae8fcc8600486384f ChangeLog 4287
+MISC ChangeLog 4414 RMD160 5a60ba110be5fe2a29b1bf7b4a5f36802d326b1e SHA1 64976bba9d061efb11325f551f77b5d128164577 SHA256 201a2055786072faf278d8c2ad0c2f33c6c6ba04b9fe702596c1349f6b03d6b2
+MD5 ac75bd6e316231391e88bf36511f0bca ChangeLog 4414
+RMD160 5a60ba110be5fe2a29b1bf7b4a5f36802d326b1e ChangeLog 4414
+SHA256 201a2055786072faf278d8c2ad0c2f33c6c6ba04b9fe702596c1349f6b03d6b2 ChangeLog 4414
 MISC metadata.xml 379 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e SHA1 8b42b16535813e370be26ed1be6c97e947aca724 SHA256 8ba83d4305e1fa7698ab48d81f15053607da61690be4ec95e9c6a2aa499160c3
 MD5 255758e5fa9c77c52b49ed29dc311262 metadata.xml 379
 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e metadata.xml 379
@@ -42,6 +48,9 @@ SHA256 ec1fadc684d60a41010a1fdd3c4a272f33e5f7743b630dbd41b35ef97f8b8aa0 files/di
 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 1a49c8b2959f0618c4a12f58ff83cced files/digest-openttd-0.4.8 545
+RMD160 2af8d61920d6263abd46684419cccedd167bfb13 files/digest-openttd-0.4.8 545
+SHA256 9c2a511409d19728dee9a737ca130fe715d43bd9f35ec4a34e8ca46b6c1cd3f3 files/digest-openttd-0.4.8 545
 MD5 3d4157c26d1e89abb9fa845467dba2b8 files/digest-openttd-0.4.8_rc1 566
 RMD160 b08102790f6f66e55d543c30cafa0dd2865ad4cd files/digest-openttd-0.4.8_rc1 566
 SHA256 97013c752dafed766395f12f9ce150898f95522684e2217d814895a05a7f4bd4 files/digest-openttd-0.4.8_rc1 566
diff --git a/games-simulation/openttd/files/digest-openttd-0.4.8 b/games-simulation/openttd/files/digest-openttd-0.4.8
new file mode 100644
index 000000000000..92921dde9b58
--- /dev/null
+++ b/games-simulation/openttd/files/digest-openttd-0.4.8
@@ -0,0 +1,6 @@
+MD5 34e8cb13ce1d4e6b5b24887c628c1ac8 openttd-0.4.8-scenarios.tar.bz2 5000799
+RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 openttd-0.4.8-scenarios.tar.bz2 5000799
+SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca openttd-0.4.8-scenarios.tar.bz2 5000799
+MD5 de9643ee2009db73763941489ad08569 openttd-0.4.8-source.tar.bz2 2212990
+RMD160 9ec9d8ee3531dc5a4f421eae6844a50299c22455 openttd-0.4.8-source.tar.bz2 2212990
+SHA256 39556ac3524e762c7bfbd6b1438590c9d5010bed99b4aff725e68897a0d62f8f openttd-0.4.8-source.tar.bz2 2212990
diff --git a/games-simulation/openttd/openttd-0.4.8.ebuild b/games-simulation/openttd/openttd-0.4.8.ebuild
new file mode 100644
index 000000000000..256abcb07891
--- /dev/null
+++ b/games-simulation/openttd/openttd-0.4.8.ebuild
@@ -0,0 +1,168 @@
+# 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.8.ebuild,v 1.1 2006/08/14 08:42:13 pylon Exp $
+
+inherit eutils games
+
+SCENARIOS_A="${P}-scenarios.tar.bz2"
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.com/"
+SB="mirror://sourceforge/openttd"
+SRC_URI="${SB}/${P}-source.tar.bz2
+		scenarios? ( ${SB}/${SCENARIOS_A} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug png zlib timidity alsa dedicated scenarios"
+
+DEPEND="!dedicated? ( media-libs/libsdl )
+	png? ( media-libs/libpng )
+	scenarios? ( app-arch/unzip )
+	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 ${SCENARIOS_A}
+	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
+
+	# parallel build not supported
+	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
+		newins media/openttd.${i}.png 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 known-bugs.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
+}