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

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 28 insertions, 64 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/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
 }