version bump (bug #362031)

Package-Manager: portage-2.1.9.42/cvs/Linux i686
RepoMan-Options: --force

3 files changed, 175 insertions, 13 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 63e04930e3ef..fc6e3d18e08a 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-simulation/openttd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.106 2010/11/28 12:19:11 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.107 2011/04/30 18:23:22 mr_bones_ Exp $
+
+*openttd-1.1.0 (30 Apr 2011)
+
+  30 Apr 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +openttd-1.1.0.ebuild:
+  version bump (bug #362031)
 
   28 Nov 2010; Markos Chandras <hwoarang@gentoo.org> openttd-1.0.5.ebuild:
   Stable on amd64 wrt bug #345691
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 6d9e4c1240ef..4d50b19be16e 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,15 +1,7 @@
------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
 EBUILD openttd-1.0.5.ebuild 5070 RMD160 f86494fe84a3113582cd90773b6253b085845bf7 SHA1 e172301582ed8547bbc34e3be5f09f115eff152c SHA256 d193172580e6eac859734552c438743f3e3ac06b81bc525b940d11769613125f
-MISC ChangeLog 13712 RMD160 4e55f4cd460d6409e25721c128eac982cde6c848 SHA1 eb7a3d5527e1424c630a13b8ecadd34ca9c19b80 SHA256 b73afbf286ad076a1d6fb20caa8a23980756b53859e7223d026c48c0b7e39ed9
+EBUILD openttd-1.1.0.ebuild 5074 RMD160 30d96adf823e8b4523774a88bd2221914455e28e SHA1 bee0e2a53d86f17b6282fb660eb16a74e65be043 SHA256 2eaefc971bbb18abe4f60d9195080fc56bcdfd17e3d3f9615c5f19736f764bf2
+MISC ChangeLog 13853 RMD160 7c2b05d5faeae6a3e83d24a6fbc074b0c5c4627a SHA1 8568a20a05fdeab6a3e53f7a620609b5bef7bd19 SHA256 e4290a42bb6549e58fa24b02a03538d8d9cd6792b698b5a6f3a9fca8769105f0
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzySMEACgkQ9/cejkQaxBCY9QCfWQ5WoMGHOES05PF70bqhSNo+
-QGUAn3iyXvnK+J3CloE0wQFRTcYyZN+H
-=OKIE
------END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/openttd-1.1.0.ebuild b/games-simulation/openttd/openttd-1.1.0.ebuild
new file mode 100644
index 000000000000..3467fd6548f3
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.1.0.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.0.ebuild,v 1.1 2011/04/30 18:23:22 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
+}