4 files changed, 6 insertions, 242 deletions
diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 97302ab4e6d2..3b359e534678 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.155 2015/02/25 15:52:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.156 2015/03/12 18:33:59 mr_bones_ Exp $
+
+  12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/openttd-1.3.3-cflags.patch, -openttd-1.3.3.ebuild:
+  old
 
   25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> openttd-1.4.4.ebuild:
   Stable for x86, wrt bug #540236
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 653ee3f23ee4..9f3bba858c16 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,30 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX openttd-1.3.3-cflags.patch 1005 SHA256 439c7e79b412ed572bfe95f1546b96481af0a9c629006b03651e929805423b30 SHA512 1beadb5d9728a8e9f2db0c4a38da055a4509720ae5fa14b3ae36927eb497be8ef4667715ee290c7059cc76edee9022382eea093bd01a9db3a4011de3d5ae4021 WHIRLPOOL 36678dbb4cafc840bce32d7bf5a4f44babfee89f3dec439f33895aa0539f51691be7d268d74fb3b2090b34631192fdc9fe615c6ffd551ecb886ccb449b87c3f8
 AUX openttd-1.4.4-cflags.patch 1028 SHA256 8a26bfb808fd14f45328255df11e7f3867111fd06570302a43a2807cfc06154e SHA512 e29ef624562c717b37496ca2e8353c1c065f776548878e3863420df5431743a6dc80f952699c3738f3fa1dbe77c9a6bf457a7c21241c723db5b1f7865afa180f WHIRLPOOL f6117b87252bf166c433982cfb7424cb297a633e0f9b74b24b198d028e94158a427dcaac3e0df4944923a08f6c7067a2a36eecd3748c0b7c2e3aa98e4d3e57b3
 AUX openttd-1.4.4-freetype.patch 1714 SHA256 e89f5c7342ebf016131de23a5136e8bfb421058b584eb783d1a8bfb40c552f2d SHA512 afe103674977ec75f824e7ef62910081c500024ae0d6c3734ce91c5cef97cc8421af005f4360dc39e8648a307a4204b2b428860fa72de3be2b6170026beb686e WHIRLPOOL 998f9d00f5d2bce1af3397d341b0a082874687e62542f1d39816a65452d7eb3696e905929357ccd1bd75e9f86aeba24a424f060e90e355f5eef489c200b9e79e
 AUX openttd.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 SHA512 a1be89727fa76ba2104d934367e69c840735024e9abc8e6a32a67d3553e26ee565a9f1680b56e923a959c01f3209bf267ef8421d077ce2ff131b661d4a88c318 WHIRLPOOL c369d4c82da6a68473d25a636b5d1817e5f6035d85759c484fece1d0bd87d74123fabb64bad74898b87985d5a480d5caccd13eb7fafb15e622380dcde89ca1c1
-DIST openttd-1.3.3-source.tar.gz 9643325 SHA256 a21f9f5321ac70ffd2c0dbbb52021f00d4a55f66951e148e08fdcde4475c2d5c SHA512 d82d1f2b7653082a374c6a87cfef162dbf22032ff7e37fa2ab63c0cb1b570ee1a1bd01eec651459a38f79cc044cfb002c51180ebc7f859c6588746f9c80644a7 WHIRLPOOL 60b5be8eed979f01a490f739b36ae1198c0105c19cfc4ed76e79e8e6dd3d726b0d598a931b877f673244bf5c5a43510035c900821fffa18ed557d628b07b5c92
 DIST openttd-1.4.4-source.tar.gz 9726516 SHA256 e5b6b72e37b796ae8b532cd8c96bd27cb6c6b58ecc0e9a5a17a0a80442b5c36d SHA512 52ff5f52b511c3e222a0231c902b0763611f64d5c003c99e1c50af951688458c5c56bdc002ddd1e3c936ed920f64054e68074994fd273d2f3614a3779bad66e1 WHIRLPOOL dd7ac08a337df4554683f0f9275bb50cca169206b38f7ebfa20b6ec8a62125c8c38d444c78bd6a6230095a65e6e02b477fe8734d8b0e6ee9025008ed8058bbd8
-EBUILD openttd-1.3.3.ebuild 5151 SHA256 b08c718f94e6cc848c4179e308c36788d68bf84ebfd5dc774889466a147fd9c0 SHA512 6dd63e6c19a4f478b94613792f8258ff49e161b49d7b3bb75d06eeeb4d0799dbb24885cb1e3dcf3a3963baa466f39efc0d69b6fc3da4aa91c5bbcc111d8ca084 WHIRLPOOL 5d839e884f0ae76f90a2cc05753ed38959a2358ca67b9c3ef21186a9aedd94da2b5afe25eac8a81c1d02a4bd81912bb12f843a600d7721bd6d77b2df4175d4ef
 EBUILD openttd-1.4.4.ebuild 5271 SHA256 cc0be11263d938cd9259e815688a1737be6ce6e5885e43a7372e6b9e40898a49 SHA512 94bbb60e73642210dbc5b3e0c0659d11524436ca86940b9c30aa1070a74fc36f41b701cb28972c9c52b459609d5a582b9370d0babe2bb33b82d238a8d6809e3c WHIRLPOOL e713fab609335299964acfead5e2fda02db215fa645509fa265034dc7688631ae2a9c05e923a6cb6498a369ea71c4081cb8c458e0e3642bcec00593434591a9f
-MISC ChangeLog 21049 SHA256 e0e4e66d1e06d46ffca2a3a365edaea3ddf315e8d8388788f7cee5cd826f1495 SHA512 ce4c3593ca0909618bd2f51815667861554da81866f7d32366227891d21f62dbccf53fb609011b041523e717647365a56af2d0786d93356ce1954d171ba35348 WHIRLPOOL 7b48ba739f803a57847c476eafb584b0ce8c0b09d92566bc460f6baf4bf9fbaf784ded9acf07169a71cb6da0888a6ba80c10a78af9e680ac9484289eb1366bab
+MISC ChangeLog 21177 SHA256 179169e572f500ed33dae0ee7b18af18203aa788ef710b124154b6ab29c57f3c SHA512 3aa42c307836d31b128e65b8a73a6b31a9fb44571fe5743e2ec3318d0220d6e0d0f4b8f9b17043a8b1ad81d3efad0a1a82ca8acbc33d8e932b06a7166be486be WHIRLPOOL c2dd2fa1335510143f92b45d970888f9cedf226700473962d300110d07ee6462260a9d07d48b7b94db33691b97643f5ba1d7371ff7d7ed7e3358db9d4a4d9bc4
 MISC metadata.xml 658 SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 SHA512 30a2ea245738a34e159d1fdf65a4ffede8de14111804c46176613592c4ae63ce1fd9e3fbc36f639f5c7c41214d3f2e6c741e78b424889417bbe0da180e7d0ab1 WHIRLPOOL 51c8f15d834ba7f0be395ca174a9f388cf3dbee218da358a338ee81797fc73a9aebc7d4759a95466d50f8d333e0ff8d58980d1a4c94701e0647d99b16db9963d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU7e+5AAoJELp701BxlEWfgfYP/iPbjeN26gm42vJY8uXMNUjL
-dDUmxWq6pCyT/WcNKkEy9X110NEz8GVWgotmDBfLi4nyegh2db9DjVY+YV2jhuyC
-8/iP4Ru38olGncPt4HRrUMfMEFNrm5UVtsgvTyGnO7iuXAHQ2jV5s1XijPTYQksP
-AgeVUAbBZKL0+HziRDoX+h5Kq/WMpM0DK/jdx+VnmjKVYSXBiQUZp3gZupG21agl
-4wqM9kzj+3AvGtVU7ejyRgN3Ovkwgu40JsMDG0VhD0vbg4rz2zYXlP/6SiYeXQeB
-lo3apz0H/gEaTF5AgIl2edqPp48B63dGUuC57ZTItakvbPsV+usUh+ES9upN+z6E
-oVHfKlDzWlWvXxqy/slfjU2wT8PVWdiSUKMY9CebxF8jM1h5zdPeh549NFLg9W6T
-9ygzbf0tziITucdHkQCIuLLflxwBriMVx2LUNzVlTqgUYX/IxhF9D0flDlfL+m80
-t3rHBmtnGq0qLBQfBTf/Ql33k11NBMN1/SSz7/HOhpyj2MqIMPVX+SV3cODj+OJr
-6inW1zFm2GOKeU/WbQRbqsLMvbFxkzCkaX2aL3siSzBICZ5hj9f4aPh1pYNfWmQw
-Jun+xUwUDs+QuW++BVMwUYNeK/XoQ5NJi2XPDTDvB02AC6DsUuEQrxVjZZJzf7IT
-XFNzwPQel5Fx9AWg8Wua
-=IVKY
------END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/files/openttd-1.3.3-cflags.patch b/games-simulation/openttd/files/openttd-1.3.3-cflags.patch
deleted file mode 100644
index babbedb06ce3..000000000000
--- a/games-simulation/openttd/files/openttd-1.3.3-cflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- config.lib.orig
-+++ config.lib
-@@ -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.3.ebuild b/games-simulation/openttd/openttd-1.3.3.ebuild
deleted file mode 100644
index 3dd72615bb83..000000000000
--- a/games-simulation/openttd/openttd-1.3.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.3.3.ebuild,v 1.5 2014/05/15 17:01:14 ulm 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[sound,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.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	sed -i \
-		-e '/Keywords/s/$/;/' \
-		media/openttd.desktop.in || die
-}
-
-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
-}