version bump (bug #374035)

Package-Manager: portage-2.1.10.3/cvs/Linux i686

3 files changed, 173 insertions, 12 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index a8b4f0883b63..a124308f6753 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.108 2011/05/01 00:32:08 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.109 2011/07/07 17:42:33 mr_bones_ Exp $
+
+*openttd-1.1.1 (07 Jul 2011)
+
+  07 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org> +openttd-1.1.1.ebuild:
+  version bump (bug #374035)
 
   01 May 2011; Mark Loeser <halcy0n@gentoo.org> openttd-1.0.5.ebuild:
   Revert to ~ppc64 to resolve broken deps
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 12a102d14b5f..68045d629dcb 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
 DIST openttd-1.0.5-source.tar.bz2 5684796 RMD160 8d723e8efeb6de9860b62cf835fa3db09a7848cd SHA1 2e0cfa2d6e4c4bc1235a60de39961728bb727eb8 SHA256 c353626b16b4b781db3c3c61f0ad651f5701e50f87439c4005b4456b63db09f8
 DIST openttd-1.1.0-source.tar.gz 7575181 RMD160 f10ed16fb3e99418f3335d2abd1871d8777d9b14 SHA1 2d504cf0d1b1a85cf77558aa11c5d42746453865 SHA256 f5584fb48a64fe173f351d13993f2d9439afe5cf3ad457692604d4f801d895f8
+DIST openttd-1.1.1-source.tar.gz 7597133 RMD160 38758b1830628bd80c599e53498ddfa32f4e135d SHA1 b9354bc9e8bc93ad1cf816cc91b3aadc14348f88 SHA256 34d1639d8948c5af51a3735ee37f545d357eb06e41f9e5c8b51b21973979fc5f
 EBUILD openttd-1.0.5.ebuild 5070 RMD160 43c75186deebe7bad6ca4023e206dde8588725f2 SHA1 b81e9d27fb06580fde193973e4c6fb5ff4460aef SHA256 489de570c21dc75dd4f1215f4b3efabb460ab27dc6bb9e6b598e20d50c07ec81
 EBUILD openttd-1.1.0.ebuild 5074 RMD160 30d96adf823e8b4523774a88bd2221914455e28e SHA1 bee0e2a53d86f17b6282fb660eb16a74e65be043 SHA256 2eaefc971bbb18abe4f60d9195080fc56bcdfd17e3d3f9615c5f19736f764bf2
-MISC ChangeLog 13964 RMD160 424aaea42fc8678a8f7936ec1476ae73bed01236 SHA1 1975fc4a32e7d2f0f95af10c86a7c1de7c559c80 SHA256 480c913227259758c1c8ab978c0aa58c16fb9fe1e27f64fa69dbb7cc0b3157ae
+EBUILD openttd-1.1.1.ebuild 5074 RMD160 bc53c8c10851edf27dcdc5caf8d77ae207b0b8d1 SHA1 03003f8db8684b93553ce76e1aa15351d5bb3298 SHA256 ad7eb18ff394d4d1569fa700466742ae2fd0df1e8b25c52c9394f0c577fbda1e
+MISC ChangeLog 14104 RMD160 9882fe1988c57577469374b06016eddd86a28bce SHA1 4f9702ff53be6f2afb2866d2ace7245c61ebdb05 SHA256 10ce71ca4af91bd2b2ccbe42c0f1d81bececad6433d938817fc30096a384d559
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk28qg4ACgkQCRZPokWLroSdggCgnLOggDpV8IURzgEJb9R/bzbz
-rosAn3rFZGxJ2PSP3UHnEW9FX0r6ofbW
-=W0Tq
------END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/openttd-1.1.1.ebuild b/games-simulation/openttd/openttd-1.1.1.ebuild
new file mode 100644
index 000000000000..fc6bcb56356e
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.1.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 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.1 2011/07/07 17:42:33 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils 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 ~arm ~ppc ~ppc64 ~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 )
+	"
+
+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"
+
+	# 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"
+
+	use debug && myopts="${myopts} --enable-debug=3"
+
+	if use dedicated ; then
+		myopts="${myopts} --enable-dedicated"
+	else
+		use aplaymidi && myopts="${myopts} --with-midi='/usr/bin/aplaymidi'"
+		myopts="${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"
+	else
+		myopts="${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 "configure failed"
+}
+
+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 "emake install failed"
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		rm -rf "${D}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+	prepalldocs
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	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
+}