version bump

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

4 files changed, 236 insertions, 7 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 8096cd82ec2e..fc0317ba753f 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.125 2012/05/31 16:34:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.126 2012/08/03 04:18:44 mr_bones_ Exp $
+
+*openttd-1.2.1 (03 Aug 2012)
+
+  03 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/openttd-1.2.1-cflags.patch, +openttd-1.2.1.ebuild,
+  files/openttd-1.2.0-cflags.patch:
+  version bump
 
   31 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
   +files/openttd-1.2.0-cflags.patch, -files/openttd-1.1.3-cflags.patch,
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index fb7a42b1c9a6..f081ba84ca31 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,6 +1,9 @@
-AUX openttd-1.2.0-cflags.patch 1174 RMD160 922e53f2753cbc330f041fbad156f90062efcb42 SHA1 51b0c521d6056914920403e572f03a90749d1930 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555
-AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
-DIST openttd-1.2.0-source.tar.gz 8702942 RMD160 25f133c3b302b56215d9f46fa5b96fb9ee23f999 SHA1 6094f37c27fd8801c23c588b9945d14919b53132 SHA256 e0d5ac8a972e079331d1bb43e1fbb70156f416254b1d9f220c8288bb417ed414
-EBUILD openttd-1.2.0.ebuild 5004 RMD160 1c257261bcadcd29cb90ac3a47756302fe36bce7 SHA1 397e558148280df65476c7b796a946827c2d4bcf SHA256 953d1279f55ccbb3c630906b01bc4516131d32ce178b63c03fc120bb8fdd4dc4
-MISC ChangeLog 16609 RMD160 20815b3521be84e551123e06aa86f518ce497ca2 SHA1 86fa0a3b204deda9fe8e0c261d53c98b2e2a784e SHA256 b03a98423f422a5263f1b8986ed3ad3441344430be9534b2f2d3ca9a572c025d
-MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
+AUX openttd-1.2.0-cflags.patch 1174 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555 SHA512 4c94f688024c790dec5e57acb957b496f4f3e0b36f4a754f0415b20d1dadbb996209f74b7fe0b7b31981352bb3a38ed24eb04a723442bf6fd5efaf2baf8ba1f5 WHIRLPOOL 1dacb07003a44bee826eaf3aadb4ac58c984e2c83e70b7ec0475b8cb4a1287e439bfbb346de9515c4c5380348653a766515660415ca5dabc72202e1207cdb33f
+AUX openttd-1.2.1-cflags.patch 1174 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555 SHA512 4c94f688024c790dec5e57acb957b496f4f3e0b36f4a754f0415b20d1dadbb996209f74b7fe0b7b31981352bb3a38ed24eb04a723442bf6fd5efaf2baf8ba1f5 WHIRLPOOL 1dacb07003a44bee826eaf3aadb4ac58c984e2c83e70b7ec0475b8cb4a1287e439bfbb346de9515c4c5380348653a766515660415ca5dabc72202e1207cdb33f
+AUX openttd.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 SHA512 a1be89727fa76ba2104d934367e69c840735024e9abc8e6a32a67d3553e26ee565a9f1680b56e923a959c01f3209bf267ef8421d077ce2ff131b661d4a88c318 WHIRLPOOL c369d4c82da6a68473d25a636b5d1817e5f6035d85759c484fece1d0bd87d74123fabb64bad74898b87985d5a480d5caccd13eb7fafb15e622380dcde89ca1c1
+DIST openttd-1.2.0-source.tar.gz 8702942 SHA256 e0d5ac8a972e079331d1bb43e1fbb70156f416254b1d9f220c8288bb417ed414 SHA512 63bf2a69e5372c9c5d032c12de4b2dd21b0637315327e3b83b9cc2a2bfdabe3e2ba63f1fff85fb613ecded16827bcd5bed787f9e21a8f51c091ccc82e5b21135 WHIRLPOOL 372506e5ff31ca6cd28ed9bac38f3247f61238f049265d756e067284436bf251c5096b8721784c7900c027d3b058239bac47f5922cc327ff31d9c489406d5878
+DIST openttd-1.2.1-source.tar.gz 8711769 SHA256 d88025d7ccb469914a2e56a067b779091afabd8791bcc06b4c7ca8a8001688f2 SHA512 cf3819623cbe00682327cc2cc259be6fe17a9f1ae587c0d1abf0d9ce4b0c731e435fe8f897c8d6717081b59d5aa7fb1899e51b19da69b08385f0a250a090bf39 WHIRLPOOL 23bbe7c29284a877f2babb12687409761856cc611a9c76c613d7a5a9e21e4ea284d28627c026711293099c319c0f945a93bd6c355e47a91db15798ee442d6cb9
+EBUILD openttd-1.2.0.ebuild 5004 SHA256 953d1279f55ccbb3c630906b01bc4516131d32ce178b63c03fc120bb8fdd4dc4 SHA512 43e5533320ffb0da829d42de17007135aebef91964fff1771b7e2d67405d9256841dfef4897c6fc3c086c08cc699caf6b9793874308cf43aa32fe381b7668c41 WHIRLPOOL a743a07e83721b6bd7b9d240059604caad5c1dd290b6fb4a8cc1084d2a1dedc376c73d31194f943ca67aded3e657572def91731a932212baf33c81e1bd1bc5ef
+EBUILD openttd-1.2.1.ebuild 5149 SHA256 d55337fc983e2cd57ad64c15144ad6810cea20ea69aa540b598d840bf0655023 SHA512 7e9bf5b6df5032956243aefff7fa1f63f49fad66343f88664399f26143fe510865e61fec5810077faaae717d0638674f5e743001e6c2d39ef255f020ea047041 WHIRLPOOL 277fc7906b1ef83aada3f7e393039ac96842c98e11dae34d3c6a90815915773328925f00e56e9bcf5bca5cc7d73dd9ad3a95e70288b1d28292fbb16634012c2d
+MISC ChangeLog 16806 SHA256 462659a2f3c128c3a45cd1b44f35bd503130e63d19dfe372fc221296e83d7cd4 SHA512 3bf9a8e15253e02694a230de4ce59b5165235f800a8b71006b1fc00575ff0831e6d88622e8a4322396a1db080f99e5e44b23f611896209d72d886ce62d0c78f7 WHIRLPOOL 859a0829242716463c310ab5e3dca9004e06f168119e1119f9f8d4e90c6b3366df812be5f6a1d40ae187212a0c429daec8c3e86227669fa92dae4ea3011c95b7
+MISC metadata.xml 658 SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 SHA512 30a2ea245738a34e159d1fdf65a4ffede8de14111804c46176613592c4ae63ce1fd9e3fbc36f639f5c7c41214d3f2e6c741e78b424889417bbe0da180e7d0ab1 WHIRLPOOL 51c8f15d834ba7f0be395ca174a9f388cf3dbee218da358a338ee81797fc73a9aebc7d4759a95466d50f8d333e0ff8d58980d1a4c94701e0647d99b16db9963d
diff --git a/games-simulation/openttd/files/openttd-1.2.1-cflags.patch b/games-simulation/openttd/files/openttd-1.2.1-cflags.patch
new file mode 100644
index 000000000000..f79915ecf600
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.2.1-cflags.patch
@@ -0,0 +1,45 @@
+--- config.lib.orig
++++ config.lib
+@@ -1357,14 +1357,12 @@
+ 			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 basename "$cc_host" | grep "gcc" &>/dev/null; then
+ 				# Define only when compiling with GCC, some
+ 				# GLIBC versions use GNU extensions in a way
+@@ -1375,14 +1373,6 @@
+ 				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 [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
+@@ -1391,11 +1381,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.2.1.ebuild b/games-simulation/openttd/openttd-1.2.1.ebuild
new file mode 100644
index 000000000000..aea233599bb3
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.2.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.1.ebuild,v 1.1 2012/08/03 04:18:44 mr_bones_ Exp $
+
+EAPI=3
+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 ~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 )"
+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 || 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
+	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
+	prepalldocs
+	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
+}