summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Holm <dholm@gentoo.org>2005-05-16 15:09:34 +0000
committerDavid Holm <dholm@gentoo.org>2005-05-16 15:09:34 +0000
commit39cd0b2c23952f43aa40285405aae1bb5d10d4ab (patch)
tree7758ebac442b3c3f0339ec37a3a2ab3896e92edf /games-simulation/openttd
parentnew upstream version, fixes #87626 (diff)
downloadgentoo-2-39cd0b2c23952f43aa40285405aae1bb5d10d4ab.tar.gz
gentoo-2-39cd0b2c23952f43aa40285405aae1bb5d10d4ab.tar.bz2
gentoo-2-39cd0b2c23952f43aa40285405aae1bb5d10d4ab.zip
Version bumped
Marked 0.3.6-r1 stable on ppc (Portage version: 2.0.51.21-r1)
Diffstat (limited to 'games-simulation/openttd')
-rw-r--r--games-simulation/openttd/ChangeLog11
-rw-r--r--games-simulation/openttd/Manifest10
-rw-r--r--games-simulation/openttd/files/digest-openttd-0.3.51
-rw-r--r--games-simulation/openttd/files/digest-openttd-0.3.61
-rw-r--r--games-simulation/openttd/files/digest-openttd-0.4.01
-rw-r--r--games-simulation/openttd/openttd-0.3.5.ebuild76
-rw-r--r--games-simulation/openttd/openttd-0.3.6-r1.ebuild4
-rw-r--r--games-simulation/openttd/openttd-0.4.0.ebuild (renamed from games-simulation/openttd/openttd-0.3.6.ebuild)71
8 files changed, 64 insertions, 111 deletions
diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 793427dbbe7d..49a915b5e945 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for games-simulation/openttd
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.12 2005/04/12 11:48:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.13 2005/05/16 15:09:34 dholm Exp $
+
+*openttd-0.4.0 (16 May 2005)
+
+ 16 May 2005; David Holm <dholm@gentoo.org> -openttd-0.3.5.ebuild,
+ -openttd-0.3.6.ebuild, openttd-0.3.6-r1.ebuild, +openttd-0.4.0.ebuild:
+ Version bumped (Bug #92773)
+ Marked 0.3.6-r1 stable on ppc
*openttd-0.3.6-r1 (12 Apr 2005)
@@ -56,6 +63,6 @@
*openttd-20040626 (27 Jun 2004)
27 Jun 2004; David Holm <dholm@gentoo.org> +openttd-20040626.ebuild:
- Initial import, ebuild by Hinrik Örn Sigurðsson <flanders at simnet dot is>
+ Initial import, ebuild by Hinrik Örn Sigurðsson <flanders at simnet dot is>
(bug #49113).
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index ef455f0957fe..21fe76b654af 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,9 +1,7 @@
-MD5 de3bdab616da5353c99f5ef873a84092 ChangeLog 2126
MD5 7efefbbe81a05cbc5d4e96203f047fda metadata.xml 245
-MD5 f4ede9d0e41a8386a7ed0707ba228c4b openttd-0.3.5.ebuild 2248
-MD5 68f4e8df406ce786237ff3fec15d3315 openttd-0.3.6.ebuild 3313
-MD5 a30a74508caaceae38ad0388b9899743 openttd-0.3.6-r1.ebuild 4181
-MD5 94e0df18e09dc754083d5e1247f809b7 files/digest-openttd-0.3.5 73
+MD5 765e5772a62bc6ec91f71ce4daaeac4d ChangeLog 2362
+MD5 f8d76b5d0295d79703d9f1ea0f2485da openttd-0.3.6-r1.ebuild 4180
+MD5 792ef70bb661f371fd0b9641efb0157d openttd-0.4.0.ebuild 4232
MD5 a169eb5c8572ee01be52c4accf2608a2 files/openttd.initd 529
-MD5 2c2239b2fd69956b2e3027818efc62e5 files/digest-openttd-0.3.6 66
MD5 706c1f4a051e6472683d79b75f3def11 files/digest-openttd-0.3.6-r1 73
+MD5 ebb13a7591c4ec12f1bb5e25fb8aff18 files/digest-openttd-0.4.0 70
diff --git a/games-simulation/openttd/files/digest-openttd-0.3.5 b/games-simulation/openttd/files/digest-openttd-0.3.5
deleted file mode 100644
index c0e2901baa1b..000000000000
--- a/games-simulation/openttd/files/digest-openttd-0.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10a97eac9c77b977ddaa11660a3ccb7c openttd-0.3.5-source.tar.gz 2059465
diff --git a/games-simulation/openttd/files/digest-openttd-0.3.6 b/games-simulation/openttd/files/digest-openttd-0.3.6
deleted file mode 100644
index 5b6c60660c37..000000000000
--- a/games-simulation/openttd/files/digest-openttd-0.3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4127f17e45c5dd2e1720ebf2a96e7eac openttd-0.3.6.tar.gz 2511895
diff --git a/games-simulation/openttd/files/digest-openttd-0.4.0 b/games-simulation/openttd/files/digest-openttd-0.4.0
new file mode 100644
index 000000000000..89cab700af99
--- /dev/null
+++ b/games-simulation/openttd/files/digest-openttd-0.4.0
@@ -0,0 +1 @@
+MD5 2dfda64d1aa0f4b789fec9558906fb4e openttd-0.4.0-src.tar.gz 2944631
diff --git a/games-simulation/openttd/openttd-0.3.5.ebuild b/games-simulation/openttd/openttd-0.3.5.ebuild
deleted file mode 100644
index 13dd89b1ae28..000000000000
--- a/games-simulation/openttd/openttd-0.3.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.5.ebuild,v 1.3 2005/01/25 13:55:04 dholm Exp $
-
-inherit games
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.com/"
-SRC_URI="mirror://sourceforge/openttd/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug png zlib timidity alsa"
-
-DEPEND="virtual/libc
- media-libs/libsdl
- png? ( media-libs/libpng )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- timidity? ( media-sound/timidity++ )
- !timidity? ( alsa? ( media-sound/pmidi ) )"
-
-src_compile() {
- 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"
- if ! use timidity; then
- use alsa && myopts="${myopts} MIDI=/usr/bin/pmidi"
- fi
-
- emake -j1 ${myopts} || die "emake failed"
-}
-
-src_install() {
- dogamesbin openttd || die "dogamesbin failed"
-
- insinto "${GAMES_DATADIR}/${PN}/data"
- 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 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
- 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
-}
diff --git a/games-simulation/openttd/openttd-0.3.6-r1.ebuild b/games-simulation/openttd/openttd-0.3.6-r1.ebuild
index 301324725430..24bd45bdcf1d 100644
--- a/games-simulation/openttd/openttd-0.3.6-r1.ebuild
+++ b/games-simulation/openttd/openttd-0.3.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.6-r1.ebuild,v 1.2 2005/04/13 07:17:52 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.6-r1.ebuild,v 1.3 2005/05/16 15:09:34 dholm Exp $
inherit eutils games
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openttd/${P}-source.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ppc ~amd64"
IUSE="debug png zlib timidity alsa dedicated"
DEPEND="media-libs/libsdl
diff --git a/games-simulation/openttd/openttd-0.3.6.ebuild b/games-simulation/openttd/openttd-0.4.0.ebuild
index bfac75f2a4c5..3495810f9215 100644
--- a/games-simulation/openttd/openttd-0.3.6.ebuild
+++ b/games-simulation/openttd/openttd-0.4.0.ebuild
@@ -1,27 +1,26 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.6.ebuild,v 1.2 2005/02/20 13:16:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.4.0.ebuild,v 1.1 2005/05/16 15:09:34 dholm Exp $
-inherit games
+inherit eutils games
DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
HOMEPAGE="http://www.openttd.com/"
-SRC_URI="mirror://sourceforge/openttd/${P}.tar.gz
- http://www.scherer.de/ottd/openttd-0.3.6.tar.gz"
+SRC_URI="mirror://sourceforge/openttd/${P}-src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
IUSE="debug png zlib timidity alsa dedicated"
-DEPEND="virtual/libc"
+DEPEND="media-libs/libsdl
+ png? ( media-libs/libpng )
+ zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}
!dedicated? (
timidity? ( media-sound/timidity++ )
- !timidity? ( alsa? ( media-sound/pmidi ) )
- png? ( media-libs/libpng )
- zlib? ( sys-libs/zlib )
- media-libs/libsdl )"
+ !timidity? ( alsa? ( media-sound/alsa-utils ) )
+ )"
src_compile() {
local myopts="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}"
@@ -32,7 +31,7 @@ src_compile() {
use zlib && myopts="${myopts} WITH_ZLIB=1"
myopts="${myopts} WITH_SDL=1"
if ! use timidity; then
- use alsa && myopts="${myopts} MIDI=/usr/bin/pmidi"
+ use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi"
fi
fi
@@ -43,16 +42,25 @@ src_install() {
dogamesbin openttd || die "dogamesbin failed"
insinto "${GAMES_DATADIR}/${PN}/data"
- doins data/* || die "doins failed"
+ doins data/* || die "doins failed (data)"
insinto "${GAMES_DATADIR}/${PN}/lang"
- doins lang/*.lng || die "doins failed"
+ doins lang/*.lng || die "doins failed (lang)"
- insinto /usr/share/pixmaps
- newins media/openttd.128.png openttd.png || die "doins failed"
+ 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
if ! use dedicated; then
- make_desktop_entry openttd "OpenTTD" openttd.png
+ if use timidity || use alsa; then
+ make_desktop_entry "openttd -m extmidi" "OpenTTD" openttd.64.png
+ else
+ make_desktop_entry openttd "OpenTTD" openttd.64.png
+ fi
else
exeinto /etc/init.d
newexe ${FILESDIR}/openttd.initd openttd
@@ -60,6 +68,7 @@ src_install() {
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
}
@@ -76,6 +85,13 @@ pkg_postinst() {
einfo "OR from the DOS version you need: "
einfo " SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
echo
+ 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
einfo "File names are case sensitive so make sure they are "
einfo "correct for whichever version you have."
echo
@@ -89,18 +105,27 @@ pkg_postinst() {
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 ; then
+ 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
- einfo "You also need soundfonts for timidity, if you don't"
- einfo "know what that is, do:"
- echo
- einfo "emerge media-sound/timidity-eawpatches"
+ 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 not in USE so music will not be played during the game."
+ einfo "timidity and/or alsa not in USE so music will not be played during the game."
fi
- fi
echo
+ fi
}