Version bump to 1.0.5 Bug #346229

Package-Manager: portage-2.1.9.24/cvs/Linux i686

3 files changed, 177 insertions, 15 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 540acee88d00..e3d643b193d8 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.100 2010/10/15 13:57:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.101 2010/11/22 13:15:19 tupone Exp $
+
+*openttd-1.0.5 (22 Nov 2010)
+
+  22 Nov 2010; Tupone Alfredo <tupone@gentoo.org> +openttd-1.0.5.ebuild:
+  Version bump to 1.0.5 Bug #346229 by Marek Królikowski
 
   15 Oct 2010; Markus Meier <maekke@gentoo.org> openttd-1.0.4.ebuild:
   add ~arm, bug #316003
@@ -123,7 +128,7 @@
 
 *openttd-0.7.1 (02 Jul 2009)
 
-  02 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  02 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   +openttd-0.7.1.ebuild:
   Version bump per bug #273753
 
@@ -226,7 +231,7 @@
 
   09 Feb 2007; Lars Weiler <pylon@gentoo.org> -openttd-0.5.0_rc3.ebuild,
   +openttd-0.5.0_rc5.ebuild:
-  Just another Release Candidate…
+  Just another Release Candidate…
 
 *openttd-0.5.0_rc4 (19 Jan 2007)
 
@@ -388,6 +393,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 e2656c7b8a6c..c872f97f177c 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
 DIST openttd-1.0.3-source.tar.bz2 5395672 RMD160 cf0bfae7384c965a755cf695755b350436991964 SHA1 0a9c726d484288df388067ceed114c52fb0682d6 SHA256 f52f2381c678de024d26ee465c8203323eb3484300c4dc182c0d68c439ee8c57
 DIST openttd-1.0.4-source.tar.bz2 5684460 RMD160 1f5d585bddfdb4ec649a81ad9317caeb1c69cb24 SHA1 7289f7d8236a65d959d153a5209d4686ebc8de8c SHA256 2c6b1c314f6d5e2d72543cad78769d47837d59b69c98c4356d0076498db6426c
+DIST openttd-1.0.5-source.tar.bz2 5684796 RMD160 8d723e8efeb6de9860b62cf835fa3db09a7848cd SHA1 2e0cfa2d6e4c4bc1235a60de39961728bb727eb8 SHA256 c353626b16b4b781db3c3c61f0ad651f5701e50f87439c4005b4456b63db09f8
 EBUILD openttd-1.0.3.ebuild 5135 RMD160 27415ec44a73c4e17485e6b403640b8732c54837 SHA1 d2994b2a0857a3e6ecce6aa29acafca8fc13fe5f SHA256 d7bc97926021cdcf7882b0c0dbd047453fdc85f4b39963b0baab7b0fcb6608d0
 EBUILD openttd-1.0.4.ebuild 5141 RMD160 f36a6cdcc17e851118964f3cbe0524401d8e03bb SHA1 186986d30bc882a80d0db434406967362cc79ea5 SHA256 2cd30d2c070bf0feea507e9a314d64475329464f6911c20d01378fd98e84e74f
-MISC ChangeLog 13098 RMD160 25168ae4b00ef8eabf84f1ff0fac45d33cef9147 SHA1 5e57a0798a6a8069878460a515f26ea6fcc3d5e6 SHA256 2f960d8958994afb5626ed0d0d0bc1b06e5a6401cb048eb1d7fcd5bf6a575eed
+EBUILD openttd-1.0.5.ebuild 5092 RMD160 cf426a748f3cd08abf6d9315f1276f76d8c65d34 SHA1 d3a14dd414bcb59ffc3fa4fdcdd9ce3288e9813c SHA256 4899855a536fa1411e73a6f61a0c90b38f5268126849bdb0d66f596c2504b276
+MISC ChangeLog 13273 RMD160 42e36894fe7da7d75d6af5712194dae787b44bb5 SHA1 f6d2453f88ef6d9c062de4038272c0e76bf07917 SHA256 3ca1cfbff403421dd2d36ae114f4bdbcf6b6ec72875b993b112175d2094fba52
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky4XfAACgkQkKaRLQcq0GKHIgCdG3UsLYmyfWpodHdrkSXSGeOL
-nMkAoKGXykoOwbVq8zR0d6gAoUL/jo8p
-=a+cf
------END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/openttd-1.0.5.ebuild b/games-simulation/openttd/openttd-1.0.5.ebuild
new file mode 100644
index 000000000000..529b19a26751
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.0.5.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.5.ebuild,v 1.1 2010/11/22 13:15:19 tupone Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.org/"
+SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
+
+DEPEND="
+	!dedicated? (
+		media-libs/libsdl[audio,X,video]
+		icu? ( dev-libs/icu )
+		truetype? (
+			media-libs/fontconfig
+			media-libs/freetype:2
+			sys-libs/zlib
+		)
+	)
+	lzo? ( dev-libs/lzo:2 )
+	iconv? ( virtual/libiconv )
+	png? ( media-libs/libpng )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	!dedicated? (
+		openmedia? (
+			games-misc/openmsx
+			games-misc/opensfx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
+	)
+	openmedia? ( games-misc/opengfx )
+	"
+
+src_configure() {
+	# there is an allegro interface available as well as sdl, but
+	# the configure for it looks broken so the sdl interface is
+	# always built instead.
+	local myopts="${myopts} --without-allegro"
+
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts="${myopts} --without-libtimidity"
+
+	use debug && myopts="${myopts} --enable-debug=3"
+
+	if use dedicated ; then
+		myopts="${myopts} --enable-dedicated"
+	else
+		use aplaymidi && myopts="${myopts} --with-midi='/usr/bin/aplaymidi'"
+		myopts="${myopts}
+			$(use_with truetype freetype)
+			$(use_with icu)
+			--with-sdl"
+	fi
+	if use png || { use !dedicated && use truetype; } || use zlib ; then
+		myopts="${myopts} --with-zlib"
+	else
+		myopts="${myopts} --without-zlib"
+	fi
+
+	# configure is a hand-written bash-script, so econf will not work.
+	# It's all built as C++, upstream uses CFLAGS internally.
+	CFLAGS="" ./configure \
+		--disable-strip \
+		--prefix-dir="${EPREFIX}" \
+		--binary-dir="${GAMES_BINDIR}" \
+		--data-dir="${GAMES_DATADIR}/${PN}" \
+		--install-dir="${D}" \
+		--icon-dir=/usr/share/pixmaps \
+		--menu-dir=/usr/share/applications \
+		--icon-theme-dir=/usr/share/icons/hicolor \
+		--man-dir=/usr/share/man/man6 \
+		--doc-dir=/usr/share/doc/${PF} \
+		--menu-group="Game;Simulation;" \
+		${myopts} \
+		$(use_with iconv) \
+		$(use_with png) \
+		$(use_with lzo liblzo2) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake VERBOSE=1 || die
+}
+
+src_test() {
+	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	emake -j1 test || die "Make test failed. See above for details."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		rm -rf "${D}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+	prepalldocs
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if ! use lzo ; then
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
+		elog
+	fi
+
+	if use dedicated ; then
+		ewarn "Warning: The init script will kill all running openttd"
+		ewarn "processes when triggered, including any running client sessions!"
+	else
+		if use aplaymidi ; then
+			elog "You have emerged with 'aplaymidi' for playing MIDI."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
+			elog "Available ports can be listed by using 'aplaymidi -l'."
+		else
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
+		fi
+	fi
+}