version bump - ebuild submitted by Locke 'Wizzleby' Shinseiko via bug #312993

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

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 8960e5e335e94ada859db95b5bceae8963258817..231d5457955a6d56f56a3422f39efc92d5740de2 100644 (file)
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.84 2010/02/10 00:04:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.85 2010/04/18 07:35:40 mr_bones_ Exp $
+
+*openttd-1.0.0 (18 Apr 2010)
+
+  18 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +openttd-1.0.0.ebuild:
+  version bump - ebuild submitted by Locke 'Wizzleby' Shinseiko via bug
+  #312993
 
   10 Feb 2010; Joseph Jezak <josejx@gentoo.org> openttd-0.7.5.ebuild:
   Marked ppc stable for bug #300182.

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index b283311c20f400745d41756c7bd5f5bd63e20cb3..e3ac1247ef0993436faab601fdef36443e360963 100644 (file)
--- 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-0.7.3-source.tar.bz2 4876403 RMD160 9455d2e25bc0123f858309906c558544c7f076dc SHA1 3e34ceec85b00c0918423790aad0d72ef4cd14c1 SHA256 eccfa15038c5f7991d2692cb190f34ba1fd9deaff8f181dd99145e41790fdbc3
 DIST openttd-0.7.5-source.tar.bz2 4891206 RMD160 43367ba8b95d0e1f38bbfb6beb3b2dfe81af639d SHA1 dea6eaea56eb96a972c735ca25ccc49c21a252e6 SHA256 635dfcf83b43b2b808d65167a1b37601aee2b8bd873a8f57aa5fa9779e1156c3
+DIST openttd-1.0.0-source.tar.bz2 5334428 RMD160 073f64185d15496f6ca510200c80fecbca4eb388 SHA1 2513c0118794f3e1573589abd8f7e2480c24414b SHA256 5049e1c5a14e134ed20d8ea9fe781502b5fd9588c1ca80e99f2d061b9927153b
 EBUILD openttd-0.7.3.ebuild 3323 RMD160 840a97ad10656b74c9ef7bd30563f607e068f1c2 SHA1 f6d2f75f006fe09925a0c7995ec18e717a7d5a58 SHA256 5f16b7ff6a97d0af6824e2ca463c5d16972175e76117d7320d6fe22151d1a1ab
 EBUILD openttd-0.7.5.ebuild 3336 RMD160 f8f4f32ce4af8153fb5aa0afd9551e5f7338ca01 SHA1 5ff0147d150c701121886510623f30ff960d4cba SHA256 7ee3e3f880baa169e7c11b0b1ab13c3a9b6f1bc314555c91e63a0fe563a3bded
-MISC ChangeLog 10992 RMD160 fe4f882fe5a2c6c03246bfd784360ba669e6452d SHA1 e310d0a3503b662c15508dcc62a5bc3cfcb8cebd SHA256 e09aa590362ae445250caebc1984778cf459b9680553aa1fd090a9fe11be5854
-MISC metadata.xml 159 RMD160 9ce79fb2f245a86f0fd9896ef34c65b6dc2a97bf SHA1 e8d4e28f664e8bd524cb04b5077852adc2f57d90 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktx+AUACgkQcsIHjyDViGR83ACgo3J2m4QOUxVUg30IQEHhAcbo
-VsEAn3A+JM3hX9ZKOPWP70hQ2r80vrN1
-=uuQC
------END PGP SIGNATURE-----
+EBUILD openttd-1.0.0.ebuild 4475 RMD160 a42980d8bfd1bf44d67c16bbf22adef652cf385e SHA1 b08af2fde6b0464cdc0d736a0fbe253d02800366 SHA256 ba88fed65293389082208b67d72c25a7176c57bb969baae0b96c145bb090f16b
+MISC ChangeLog 11188 RMD160 cdb7a7b2d9778b267d9423133d46cd222e6fa94b SHA1 bf419a9019cda0534557d0968cc609b78cb6c708 SHA256 9b76dd2898a67d2f234fb06735207db938d14992b0107a0a0b1aa99f619d7635
+MISC metadata.xml 559 RMD160 4041a3c74f53a6904a20090fe4f1bf3d2ef2d87e SHA1 491bbeb0ce5b1df672b540cca2aa326f99f00272 SHA256 416eab88efae17dc46a5a6031f15355b1880b8856111cc6e76ca2d62fd89cf00

diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml
index cad5a2aa1773c63bf29034feaa445131d104a872..c88fa2c3cc9bad50278c3c4e55bf56f1cd9e6d74 100644 (file)
--- a/games-simulation/openttd/metadata.xml
+++ b/games-simulation/openttd/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>games</herd>
+       <use>
+               <flag name='openmedia'>Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
+               <flag name='lzo'>Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
+               <flag name='dedicated'>Build only the openttd server, and not the client.</flag>
+       </use>
 </pkgmetadata>

diff --git a/games-simulation/openttd/openttd-1.0.0.ebuild b/games-simulation/openttd/openttd-1.0.0.ebuild
new file mode 100644 (file)
index 0000000..7152dd7
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.0.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.0.ebuild,v 1.1 2010/04/18 07:35:40 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+MY_PV=${PV/_rc/-RC}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.org/"
+SRC_URI="http://binaries.openttd.org/releases/${MY_PV}/${MY_P}-source.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa debug dedicated iconv icu lzo +openmedia +png +truetype zlib"
+RESTRICT="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 )"
+RDEPEND="${DEPEND}
+       !dedicated? (
+               alsa? ( media-sound/alsa-utils )
+       )"
+PDEPEND="
+       openmedia? (
+               games-misc/opengfx
+               games-misc/opensfx
+               games-misc/openmsx
+       )"
+
+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"
+
+       use debug && myopts="${myopts} --enable-debug=3"
+
+       if use dedicated ; then
+               myopts="${myopts} --enable-dedicated"
+       else
+               use alsa && 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_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 openmedia ; then
+               elog
+               elog "OpenTTD was compiled without openmedia USE flags."
+               elog
+               elog "In order to play, you must either install games-misc/opengfx"
+               elog "as well as games-misc/opensfx or copy the following 6 files"
+               elog "from a version of Transport Tycoon Deluxe (windows or DOS)"
+               elog "to ~/.openttd/data/ or ${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 so make sure they are "
+               elog "correct for whichever version you have."
+               elog
+       fi
+
+       if ! use lzo ; then
+               elog "OpenTTD was compiled without lzo2 support."
+               elog "While lzo2 is not required, disabling it does mean that"
+               elog "loading old savegames/scenarios from ancient versions (~0.2)"
+               elog "will be disabled"
+               elog
+       fi
+
+       if use dedicated ; then
+               ewarn "Warning: The init script will kill all running openttd"
+               ewarn "processes when run, including any running client sessions!"
+       else
+               if use alsa ; then
+                       elog "You have emerged with 'aplaymidi' for playing MIDI."
+                       elog "You have to set the environment variable ALSA_OUTPUT_PORTS."
+                       elog "Available ports can be listed by using 'aplaymidi -l'."
+                       if ! use openmedia ; then
+                               elog "You have disabled the openmedia use flag, in-game music"
+                               elog "will be unavailable unless you install games-misc/openmsx"
+                               elog "or install a music set in ~/.openttd/gm or use the in-game"
+                               elog "download functionality to get a music set"
+                       fi
+               else
+                       elog "alsa not in USE so music will not be played during the game."
+
+               fi
+       fi
+}