Remove overshadowed old version. Add version 1.2.0 with cosmetic changes and removed prepalldocs call, fixes bug#396185.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 44 insertions, 71 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 98676d0e57b1..799f4e824cae 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/openttd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.117 2011/10/03 19:57:18 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.118 2012/04/17 19:36:35 scarabeus Exp $
+
+*openttd-1.2.0 (17 Apr 2012)
+
+  17 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +openttd-1.2.0.ebuild,
+  -files/openttd-1.1.1-cflags.patch, -openttd-1.1.1.ebuild:
+  Remove overshadowed old version. Add version 1.2.0 with cosmetic changes and
+  removed prepalldocs call, fixes bug#396185.
 
   03 Oct 2011; Joseph Jezak <josejx@gentoo.org> openttd-1.1.3.ebuild:
   Marked ppc stable.
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 1ca5c2d05e86..b4dfde0bd3e5 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,19 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX openttd-1.1.1-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd
 AUX openttd-1.1.3-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
-DIST openttd-1.1.1-source.tar.gz 7597133 RMD160 38758b1830628bd80c599e53498ddfa32f4e135d SHA1 b9354bc9e8bc93ad1cf816cc91b3aadc14348f88 SHA256 34d1639d8948c5af51a3735ee37f545d357eb06e41f9e5c8b51b21973979fc5f
 DIST openttd-1.1.3-source.tar.gz 7854903 RMD160 a1441084fdc4f8ebe4e7198a7d07ef45baadd8cd SHA1 d6e6cb09e238b6bee4b9da48de78bad68565f773 SHA256 003ffe231bf98cf6c83c58f68091ea0cc1c2f851b17a7dbb8e5eda61ff9665bf
-EBUILD openttd-1.1.1.ebuild 5115 RMD160 1d312ce4a1ee0031b2bf20cec4c9dcb0c1886424 SHA1 bd79de1741ed8b5e24af71be15d03e59c0c503ee SHA256 c0cfa50ed16c6ae4680daf8e1f5abf32fe540b1c5828e88a1b570401be386fd8
+DIST openttd-1.2.0-source.tar.gz 8702942 RMD160 25f133c3b302b56215d9f46fa5b96fb9ee23f999 SHA1 6094f37c27fd8801c23c588b9945d14919b53132 SHA256 e0d5ac8a972e079331d1bb43e1fbb70156f416254b1d9f220c8288bb417ed414
 EBUILD openttd-1.1.3.ebuild 5112 RMD160 aa46d9c37d1526e877802756c0dbd2daa0ffbc20 SHA1 c72e50615951b614c5a577fa940a19048667514d SHA256 78612cf6172075dcee6e9bae82330d4e4e0e27886a288b9b684156e8158175a1
-MISC ChangeLog 15352 RMD160 1fe2d7ba23c298011b6e8806367aecffbc2993a7 SHA1 7a3a0968b77408bb822ec99f1934e826f8ee7af4 SHA256 b0837201df5899e72179fe06fdc78c0c4d1646eb0c75ef8f93c026b987f63854
+EBUILD openttd-1.2.0.ebuild 5051 RMD160 c28041dfb73b3f1f0e3bb7e4ef71efabfba6ac0e SHA1 1764d9b81f933951d2fd8ef3df0df5d8534c351d SHA256 c02984024e56a1dea9c9b92177517b9380d68cb3d0f7d8a4f674b21833dfb628
+MISC ChangeLog 15649 RMD160 4888e1d3e314eb714e8c023d9608ac35503c45f7 SHA1 ab4340145e77ed14cc9abcc3d855599b6fc514e6 SHA256 663cb16b09eed6b4644671bf7f39c61326dcf3bd2430de98c9d97a750f424c3f
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6KE6MACgkQcsIHjyDViGRzLgCg3b9YfHuz8swjok52xaRe/2eL
-DqcAoMaEndPO0t8wNdPrEiXJ9rrTVNSE
-=aBsJ
+iQIcBAEBAgAGBQJPjcaKAAoJEOSiRoyO7jvo7xIP/RUhCYXFdAj3TIjIneEJJ7Uu
+gWNbEmqC9bo/ACkn+qVsf5CXEiZE0ATEuX+c++WX+eEkJsOKHaaSb+SFyvigBw1R
+6QfnV6ZQVAuXacG6/EkRN5luJ04fhq5xpPWRI1PAR/S8sFef1rGo38qzwJ+aYvv2
+mgQvw1QSLgEFZy49FQUdm51j1ObAQdypReh/bsCQ63zra/ybQ3Q+DxA/UjfBCcFc
+6uIHIA4mjXNpFMAp3p78ISVlJT1iz50ri89fCOOPcRIr1ZGRFkBvanAfh8ti9GNp
+OUYGQoKahl01HZtKgTp5urKTUs4eRnh9NVtea25sq9tse1rX+mm6D69/NLD5r3y8
+OcqPl8AwuC0oalt50iumDCPObRLaSVtC6Sb5Fn3q5FAEbhHa6RbZs7UzmZvCsjP1
+7krZAMbzEWxEj7BLaOy/k/H0BxpQbH4c43g5USkGbdsQCgfO8ov/NPqAnXt3gdj7
+HXKmt/11pqEwR9bd6/GyMuU2lEYoR6tLJ6Gm/ofkXauTuVB0NX4KrR/zKbE+s294
+LsLzOC2+dBANvYxzQZGRlvbzjjt2Ss1901fTCd08KwEGm9ZG6LvGWaH+NXIh0FNq
+f+0sCtQcYIIMaKM5qE+b7Z+IxEtsJVuQ3PNkdEVptl/79AIFLIsXepTyPF4w23ne
+fZOs6Ze/izJyZzF/T3MM
+=Llex
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/files/openttd-1.1.1-cflags.patch b/games-simulation/openttd/files/openttd-1.1.1-cflags.patch
deleted file mode 100644
index 60a9056a6634..000000000000
--- a/games-simulation/openttd/files/openttd-1.1.1-cflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- config.lib.orig	2011-08-08 11:40:21.641085825 -0400
-+++ config.lib	2011-08-08 11:44:19.655285851 -0400
-@@ -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.1.1.ebuild b/games-simulation/openttd/openttd-1.2.0.ebuild
index 0af2e939e855..96de02f2d294 100644
--- a/games-simulation/openttd/openttd-1.1.1.ebuild
+++ b/games-simulation/openttd/openttd-1.2.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.1.ebuild,v 1.4 2011/08/14 22:30:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.0.ebuild,v 1.1 2012/04/17 19:36:35 scarabeus Exp $
+
+EAPI=3
 
-EAPI=2
 inherit eutils games
 
 DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
@@ -11,7 +12,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
 
 DEPEND="
@@ -38,35 +39,36 @@ PDEPEND="
 		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
 	)
 	openmedia? ( games-misc/opengfx )
-	"
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.3-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="${myopts} --without-allegro"
+	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="${myopts} --without-libtimidity"
+	myopts+=" --without-libtimidity"
 
-	use debug && myopts="${myopts} --enable-debug=3"
+	use debug && myopts+=" --enable-debug=3"
 
 	if use dedicated ; then
-		myopts="${myopts} --enable-dedicated"
+		myopts+=" --enable-dedicated"
 	else
-		use aplaymidi && myopts="${myopts} --with-midi='/usr/bin/aplaymidi'"
-		myopts="${myopts}
+		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="${myopts} --with-zlib"
+		myopts+=" --with-zlib"
 	else
-		myopts="${myopts} --without-zlib"
+		myopts+=" --without-zlib"
 	fi
 
 	# configure is a hand-written bash-script, so econf will not work.
@@ -103,10 +105,10 @@ 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}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
 	fi
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	prepalldocs
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+
 	prepgamesdirs
 }