version bump (bug #472726)

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 223 insertions, 2 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index a3b7dc91e49b..2d99e3397492 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.138 2013/04/01 19:28:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.139 2013/06/10 06:29:23 mr_bones_ Exp $
+
+*openttd-1.3.1 (10 Jun 2013)
+
+  10 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/openttd-1.3.1-cflags.patch, +openttd-1.3.1.ebuild:
+  version bump (bug #472726)
 
 *openttd-1.3.0 (01 Apr 2013)
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index be79080b3795..6cb8b7242291 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,10 +1,13 @@
 AUX openttd-1.2.3-cflags.patch 1174 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555 SHA512 4c94f688024c790dec5e57acb957b496f4f3e0b36f4a754f0415b20d1dadbb996209f74b7fe0b7b31981352bb3a38ed24eb04a723442bf6fd5efaf2baf8ba1f5 WHIRLPOOL 1dacb07003a44bee826eaf3aadb4ac58c984e2c83e70b7ec0475b8cb4a1287e439bfbb346de9515c4c5380348653a766515660415ca5dabc72202e1207cdb33f
 AUX openttd-1.3.0-cflags.patch 1077 SHA256 7bbdb96e9fd8a5be6fb32ab8c20b1d5a60f0c2cb96e975cf2159819b249ddb7a SHA512 a3cf52a7c7a2c55b778021e49b642401d6d021fa332b6920fd4f1b6db18b6ec43d6df57520891bca80c0b66c9abd84350633cd982ceb81e30c3a49a26d158778 WHIRLPOOL 1aae0966603c4510705f0779dd897477965b5cde40560be949a680867d3141e870ff36ae352c4cb1b00992b57817255f4dd65f0451c56fd27a90d6d5cfaa12be
+AUX openttd-1.3.1-cflags.patch 1077 SHA256 7bbdb96e9fd8a5be6fb32ab8c20b1d5a60f0c2cb96e975cf2159819b249ddb7a SHA512 a3cf52a7c7a2c55b778021e49b642401d6d021fa332b6920fd4f1b6db18b6ec43d6df57520891bca80c0b66c9abd84350633cd982ceb81e30c3a49a26d158778 WHIRLPOOL 1aae0966603c4510705f0779dd897477965b5cde40560be949a680867d3141e870ff36ae352c4cb1b00992b57817255f4dd65f0451c56fd27a90d6d5cfaa12be
 AUX openttd.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 SHA512 a1be89727fa76ba2104d934367e69c840735024e9abc8e6a32a67d3553e26ee565a9f1680b56e923a959c01f3209bf267ef8421d077ce2ff131b661d4a88c318 WHIRLPOOL c369d4c82da6a68473d25a636b5d1817e5f6035d85759c484fece1d0bd87d74123fabb64bad74898b87985d5a480d5caccd13eb7fafb15e622380dcde89ca1c1
 DIST openttd-1.2.3-source.tar.gz 8722028 SHA256 ebf306bb1911f96118243921055ffea296d7ad5aa39fa20d3bc1f27a22d872fc SHA512 fa96ac210e767e163893c25a5943a77217d78a31b435593417a4498819f62aa16e21530249293e4dd58bdbf44e28e015280ad43078320a7ce18a3bf1a3f4ad35 WHIRLPOOL e6a483de0e84b02a9568eb72d06188c842168903cbe3e5a051265b06180f8bb0634dbd9ae63584a75ca0df262c8949a13958d5a7b51c8108b620b57157929588
 DIST openttd-1.3.0-source.tar.gz 9351230 SHA256 999ae932e9a6b1e1bf29cdddc494725cc2f2e5dce8a43e5171d575611167fe5e SHA512 9987885b5b3c92cab7435761eee7ae6dc927faf1d4d58e72f777e21b5e154a6ca4cbf940085b29bdf4c887544319bfec6043a56d384b736a1d718a09362e5ea4 WHIRLPOOL 49a1523a356891676b7aa9907b1f34b56a75cf481c2a4f12a6eeb83b27599f31d4fd7279ea3fa94f1183621a4afd562e856cee9f0c84f9aee1793f8ad7545309
+DIST openttd-1.3.1-source.tar.gz 9546727 SHA256 e78553e2be26ff98851b87db80b7c3f0a45e4968672e72dcea7b58221cf95966 SHA512 afb214e5d3110f5d819afb3f90cc0d1595ae6f40a2a9c476e7d1e3563ffe542551dd615e8d39355c89d6abff04124fc98910377898f72f3e124401aea000b19a WHIRLPOOL 2f35e972b80ea3b078414d6540cd86f02085ab89d18918e5a470d3a6cb07e087b2a47a784b733a8f95f753c15b2aeaea9502b2fb1f348502f830c20ff56a5b19
 EBUILD openttd-1.2.3-r1.ebuild 5110 SHA256 3489d32873eeeb5afdb864d5152bdd9f58e9b9ff37bad7c9fb0fb9dca0b33720 SHA512 5da40ec645cf615dd0ba81085facb2b700ad998710061ed328a0be66616dcf7b21bf1be006c8e5653a5958ecd63274aa13b836511a4151b389b2eb97439db512 WHIRLPOOL abaa5199373e0bdf037b687fb4e71429926a75bd37219d64d6562aaaf7709a23adcc36ae9206dab2fe22109424366104e0b23f62619bf7261909ed8d6c476668
 EBUILD openttd-1.2.3.ebuild 5154 SHA256 7afd8eeee40d7ef745505fe302783e0260280acecf4699ac3b1c72360b438d0f SHA512 b552a70f828f18f064ad4b8da38a8430d7bfd67023bdb6c1eaa4349ab33fa5ee24eb891031e87b3ae4f55e3095cb29e3c65487b38370d7a14b95f8f45b0f0453 WHIRLPOOL ee9ec6a3c5581aae520a747d988e03ee57ab28140b62d895863a61ee7110aca70e3462cdbdb851a130cb0b7222e98ea523fa633f51a69cf27ddedd48673999de
 EBUILD openttd-1.3.0.ebuild 5075 SHA256 647a0e11062d15bac807d8769781cf04730304ab750b2149c3170c09134c7ad9 SHA512 8634ead2b09cb8b1a22941dc41042426f8f10e1552336259447affc01773fb4a01b73d725ecaaec2aa196d2bfc5e4d14db2933d5d16705b81f9aebe11a3a8013 WHIRLPOOL eb6f97cc1dc52ada1b62c8d5aba253735dafd1f409f87f127b72d9cc1d710fc5d395a8c3bdc5c3d541bb259aeb714dc9fcb153410e22fa4576af18902b9a75f4
-MISC ChangeLog 18524 SHA256 8f325cf782689b09a7ea106069a527e40f7f2b508b4c7895ca9f75fa782fbd78 SHA512 c00a49c838c59a0a992daab64b60feb0e6b692d7636ebbdfe2fc77ea94b7f9414570d6609790ba4d770ec07386b14351f54d2cbd1d8250817b13d15f9f427d8e WHIRLPOOL 8695934c44e5e426293c6eb4b7247f1ca4fe7e1dfe680dfcbe5e95611edee14279fc18bc0a17cc971e5bba687e7d1a8326ae4adf9e0496ad0f71fb1729a5e1cd
+EBUILD openttd-1.3.1.ebuild 5075 SHA256 f6301d3d6310eb82a080549f4ac0738de0b0572fbea8625d7e073c8d01abee6b SHA512 ada4859e7134bccee7b90c25a36e79ac394102270a666eefec3e816eaabc375b744a4e54520fb62971eb3abbaa698c1b3049718f2aa38efef9a589aa509841b3 WHIRLPOOL 27536581af1ff2cc51e8c9167aa0378f2aaded41148435a65e2ce2d9ede740b0aba92d483b6c9ef1863cff165a1d2feecbc704743e754c30bd8e09ab1b01e3e1
+MISC ChangeLog 18699 SHA256 1a9520e1fd64bdd6c320f9a6a9bf4aacf2f874a9eb21ba9ef057f3b186112708 SHA512 07a45fddbb31648b61e0ec2f46fb5553f3feb6ab6cef6f438865cb3636e9d32f5ff9941df644d7a2ffbe524ad56618733273b44dfeab2330a24e77f608b96f9b WHIRLPOOL 505925c6f69e088ae9bb18e92a506b3a40ad788a2e6659c7e85266f8f11cb401c1bd2d5d197f03f1c3c8e37ebc327857468b205e4c9d9e595c3105fd46798ff4
 MISC metadata.xml 658 SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 SHA512 30a2ea245738a34e159d1fdf65a4ffede8de14111804c46176613592c4ae63ce1fd9e3fbc36f639f5c7c41214d3f2e6c741e78b424889417bbe0da180e7d0ab1 WHIRLPOOL 51c8f15d834ba7f0be395ca174a9f388cf3dbee218da358a338ee81797fc73a9aebc7d4759a95466d50f8d333e0ff8d58980d1a4c94701e0647d99b16db9963d
diff --git a/games-simulation/openttd/files/openttd-1.3.1-cflags.patch b/games-simulation/openttd/files/openttd-1.3.1-cflags.patch
new file mode 100644
index 000000000000..135ae6e08f59
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.3.1-cflags.patch
@@ -0,0 +1,42 @@
+--- config.lib.orig	2013-04-01 10:56:04.199921234 -0400
++++ config.lib	2013-04-01 10:57:21.878371374 -0400
+@@ -1426,26 +1426,16 @@
+ 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
+ 			LDFLAGS="$LDFLAGS -noixemul"
+ 		fi
+-
+-		CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
+ 	else
+ 		OBJS_SUBDIR="debug"
+ 
+ 		# Each debug level reduces the optimization by a bit
+ 		if [ $enable_debug -ge 1 ]; then
+-			CFLAGS="$CFLAGS -g -D_DEBUG"
++			CFLAGS="-D_DEBUG $CFLAGS"
+ 			if [ "$os" = "PSP" ]; then
+ 				CFLAGS="$CFLAGS -G0"
+ 			fi
+ 		fi
+-		if [ $enable_debug -ge 2 ]; then
+-			CFLAGS="$CFLAGS -fno-inline"
+-		fi
+-		if [ $enable_debug -ge 3 ]; then
+-			CFLAGS="$CFLAGS -O0"
+-		else
+-			CFLAGS="$CFLAGS -O2"
+-		fi
+ 	fi
+ 
+ 	if [ $enable_debug -le 2 ]; then
+@@ -1466,11 +1456,6 @@
+ 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ 	fi
+ 
+-	if [ "$enable_profiling" != "0" ]; then
+-		CFLAGS="$CFLAGS -p"
+-		LDFLAGS="$LDFLAGS -pg"
+-	fi
+-
+ 	if [ "$with_threads" = "0" ]; then
+ 		CFLAGS="$CFLAGS -DNO_THREADS"
+ 	fi
diff --git a/games-simulation/openttd/openttd-1.3.1.ebuild b/games-simulation/openttd/openttd-1.3.1.ebuild
new file mode 100644
index 000000000000..7037bba0f8a4
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.3.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.3.1.ebuild,v 1.1 2013/06/10 06:29:23 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils gnome2-utils 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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
+RESTRICT="test" # needs a graphics set in order to test
+
+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-0.4.4 )"
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+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=" --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+=" --without-libtimidity"
+
+	use debug && myopts+=" --enable-debug=3"
+
+	if use dedicated ; then
+		myopts+=" --enable-dedicated"
+	else
+		use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'"
+		myopts+="
+			$(use_with truetype freetype)
+			$(use_with icu)
+			--with-sdl"
+	fi
+	if use png || { use !dedicated && use truetype; } || use zlib ; then
+		myopts+=" --with-zlib"
+	else
+		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
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}