version bump

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 226 insertions, 1 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index d3cac8532398..737e0a796e58 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.130 2012/10/20 18:39:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.131 2012/11/01 19:37:47 mr_bones_ Exp $
+
+*openttd-1.2.3 (01 Nov 2012)
+
+  01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/openttd-1.2.3-cflags.patch, +openttd-1.2.3.ebuild:
+  version bump
 
   20 Oct 2012; Agostino Sarubbo <ago@gentoo.org> openttd-1.2.2.ebuild:
   Stable for amd64, wrt bug #438540
diff --git a/games-simulation/openttd/files/openttd-1.2.3-cflags.patch b/games-simulation/openttd/files/openttd-1.2.3-cflags.patch
new file mode 100644
index 000000000000..f79915ecf600
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.2.3-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.3.ebuild b/games-simulation/openttd/openttd-1.2.3.ebuild
new file mode 100644
index 000000000000..074ccdfa5d77
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.2.3.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.3.ebuild,v 1.1 2012/11/01 19:37:47 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"
+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 )"
+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() {
+	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
+}