5 files changed, 37 insertions, 48 deletions
diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 986ad406e968..05b6e7179b98 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.7 2004/09/19 05:16:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.8 2004/12/25 11:15:23 dholm Exp $
+
+*openttd-0.3.5 (25 Dec 2004)
+
+  25 Dec 2004; David Holm <dholm@gentoo.org> -openttd-0.3.3.ebuild,
+  +openttd-0.3.5.ebuild:
+  Version bumped
 
 *openttd-0.3.4 (18 Sep 2004)
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 8b45d46a7a54..5bec3cb3d525 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 762081c49771d5026f6703266335d28f openttd-0.3.4.ebuild 2041
-MD5 25944d17686e962c3d5b922e39cb2ba4 openttd-0.3.3.ebuild 2118
-MD5 8a68dd2606f29b334f76ea15f806edbc ChangeLog 1325
+MD5 9834a743ac7d407a01d93b1178a34e84 ChangeLog 1462
 MD5 7efefbbe81a05cbc5d4e96203f047fda metadata.xml 245
-MD5 211d365a1cdda11aa6e5e2f7fb307579 files/digest-openttd-0.3.3 130
+MD5 762081c49771d5026f6703266335d28f openttd-0.3.4.ebuild 2041
+MD5 cc5c19a22d3315c3465b292ba592c9d5 openttd-0.3.5.ebuild 2117
 MD5 0a486aa82ad73424c6a6c791c8143b84 files/digest-openttd-0.3.4 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpP8VI1lqEGTUzyQRAnRMAKCwbSN1yGC3c8yFJG2DFu3TWNZskwCgq//x
-+JzPBVFMxZoE39xTt2GMCL0=
-=IsUr
------END PGP SIGNATURE-----
+MD5 94e0df18e09dc754083d5e1247f809b7 files/digest-openttd-0.3.5 73
diff --git a/games-simulation/openttd/files/digest-openttd-0.3.3 b/games-simulation/openttd/files/digest-openttd-0.3.3
deleted file mode 100644
index 0f4a09f7fc55..000000000000
--- a/games-simulation/openttd/files/digest-openttd-0.3.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 141064174eb9dea3435c273012bc8882 openttd-0.3.3.tar.bz2 1075443
-MD5 070d66ed5086515a45f0a40a25c28771 openttd-useful.zip 366311
diff --git a/games-simulation/openttd/files/digest-openttd-0.3.5 b/games-simulation/openttd/files/digest-openttd-0.3.5
new file mode 100644
index 000000000000..c0e2901baa1b
--- /dev/null
+++ b/games-simulation/openttd/files/digest-openttd-0.3.5
@@ -0,0 +1 @@
+MD5 10a97eac9c77b977ddaa11660a3ccb7c openttd-0.3.5-source.tar.gz 2059465
diff --git a/games-simulation/openttd/openttd-0.3.3.ebuild b/games-simulation/openttd/openttd-0.3.5.ebuild
index f5cf2b44decb..ed276e89e14c 100644
--- a/games-simulation/openttd/openttd-0.3.3.ebuild
+++ b/games-simulation/openttd/openttd-0.3.5.ebuild
@@ -1,48 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.3.ebuild,v 1.3 2004/09/06 21:25:10 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.5.ebuild,v 1.1 2004/12/25 11:15:23 dholm Exp $
 
 inherit games
 
 DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
 HOMEPAGE="http://www.openttd.com/"
-SRC_URI="mirror://sourceforge/openttd/${P}.tar.bz2
-	mirror://sourceforge/openttd/openttd-useful.zip"
+SRC_URI="mirror://sourceforge/openttd/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug png zlib"
+IUSE="debug png zlib timidity"
 
 DEPEND="virtual/libc
 	media-libs/libsdl
 	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
-	media-sound/timidity++"
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-
-	# unpack the title screen
-	mkdir "${WORKDIR}/useful"
-	cd "${WORKDIR}/useful"
-	unpack openttd-useful.zip
-
-	# openttd doesn't create ~/.openttd/ so we must do that inside the wrapper
-	cat << EOF > "${T}/openttd"
-#!/bin/sh
-test -d ~/.openttd/ || mkdir -p ~/.openttd
-cd ${GAMES_BINDIR}
-exec ./ttd -m extmidi "\$@"
-EOF
-
-}
+	timidity? ( media-sound/timidity++ )"
 
 src_compile() {
-	local myopts="MANUAL_CONFIG=1 UNIX=1 WITH_SDL=1 WITH_NETWORK=1 USE_HOMEDIR=1 PERSONAL_DIR=.openttd GAME_DATA_DIR=${GAMES_DATADIR}/${PN}/"
+	local myopts="MANUAL_CONFIG=1 UNIX=1 WITH_SDL=1 WITH_NETWORK=1 INSTALL=1 RELEASE=${PV} USE_HOMEDIR=1 PERSONAL_DIR=.openttd PREFIX=/usr DATA_DIR=share/games/${PN}"
 	use debug && myopts="${myopts} DEBUG=1"
 	use png && myopts="${myopts} WITH_PNG=1"
 	use zlib && myopts="${myopts} WITH_ZLIB=1"
@@ -51,28 +30,43 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin "${T}/openttd" ttd || die "dogamesbin failed"
+	dogamesbin openttd || die "dogamesbin failed"
 
 	insinto "${GAMES_DATADIR}/${PN}/data"
-	doins data/* "${WORKDIR}/useful/opntitle.dat" || die "doins failed"
+	doins data/* || die "doins failed"
 
 	insinto "${GAMES_DATADIR}/${PN}/lang"
 	doins lang/*.lng || die "doins failed"
 
+	insinto /usr/share/pixmaps
+	newins media/icon128.png openttd.png || die "doins failed"
+
 	make_desktop_entry openttd "OpenTTD" openttd.png
-	dodoc readme.txt changelog.txt docs/Manual.txt
+	dodoc readme.txt changelog.txt docs/Manual.txt docs/console.txt \
+		  docs/multiplayer.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 "the *WINDOWS* version of TTD to ${GAMES_DATADIR}/${PN}/data/"
 	echo
 	einfo "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
 	echo
-	einfo "If you want music, you must copy the gm/ directory"
-	einfo "to ${GAMES_DATADIR}/${PN}/"
+	if use timidity ; then
+		einfo "If you want music, you must copy the gm/ directory"
+		einfo "to ${GAMES_DATADIR}/${PN}/"
+		echo
+		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 "timidity not in USE so music will not be played during the game."
+	fi
 	echo
 }