From 02fa81eaf477c2ff471c5ef2f899ddc7071ef03b Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Thu, 15 Sep 2011 23:35:29 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- games-simulation/openttd/ChangeLog | 10 +- games-simulation/openttd/Manifest | 12 +- ...flags.patch => openttd-1.1.3-cflags.patch} | 0 games-simulation/openttd/openttd-1.0.5.ebuild | 164 ------------------ games-simulation/openttd/openttd-1.1.0.ebuild | 164 ------------------ ...nttd-1.1.2.ebuild => openttd-1.1.3.ebuild} | 2 +- 6 files changed, 14 insertions(+), 338 deletions(-) rename games-simulation/openttd/files/{openttd-1.1.2-cflags.patch => openttd-1.1.3-cflags.patch} (100%) delete mode 100644 games-simulation/openttd/openttd-1.0.5.ebuild delete mode 100644 games-simulation/openttd/openttd-1.1.0.ebuild rename games-simulation/openttd/{openttd-1.1.2.ebuild => openttd-1.1.3.ebuild} (98%) diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog index ede7275cc74e..6ff1b9b5fce3 100644 --- a/games-simulation/openttd/ChangeLog +++ b/games-simulation/openttd/ChangeLog @@ -1,6 +1,14 @@ # 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.113 2011/09/01 03:11:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.114 2011/09/15 23:35:28 mr_bones_ Exp $ + +*openttd-1.1.3 (15 Sep 2011) + + 15 Sep 2011; Michael Sterrett -openttd-1.0.5.ebuild, + -openttd-1.1.0.ebuild, -openttd-1.1.2.ebuild, + -files/openttd-1.1.2-cflags.patch, +openttd-1.1.3.ebuild, + +files/openttd-1.1.3-cflags.patch: + version bump *openttd-1.1.2 (01 Sep 2011) diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index a7da5a9881ef..cea7842dc983 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,13 +1,9 @@ AUX openttd-1.1.1-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd -AUX openttd-1.1.2-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd +AUX openttd-1.1.3-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd 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 -DIST openttd-1.1.2-source.tar.gz 7683417 RMD160 b91ebd4a0f310821a987205b903f7b743981aa7c SHA1 d39357c3a444fdaf4b83aea305a016a671d2c5a4 SHA256 9dd28340c5dcfd7e4f862652a3781362101094af8006f75939f32fb5ebc9ceae -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 +DIST openttd-1.1.3-source.tar.gz 7854903 RMD160 a1441084fdc4f8ebe4e7198a7d07ef45baadd8cd SHA1 d6e6cb09e238b6bee4b9da48de78bad68565f773 SHA256 003ffe231bf98cf6c83c58f68091ea0cc1c2f851b17a7dbb8e5eda61ff9665bf EBUILD openttd-1.1.1.ebuild 5115 RMD160 1d312ce4a1ee0031b2bf20cec4c9dcb0c1886424 SHA1 bd79de1741ed8b5e24af71be15d03e59c0c503ee SHA256 c0cfa50ed16c6ae4680daf8e1f5abf32fe540b1c5828e88a1b570401be386fd8 -EBUILD openttd-1.1.2.ebuild 5118 RMD160 76abac7f6d54ba4ed58a2808137a0d2a098fb72d SHA1 f4de757a86fabeefe9d7a03c18d1905a1bbfefb8 SHA256 553858b8c3a3edb59bc53c1da63309c1e03a3d75e6702c23d0a7a0eff6f6d406 -MISC ChangeLog 14660 RMD160 6b4662f51e915f3e5b196c6b22aed537ff464e40 SHA1 7314a11a97cfa9b85d64d71fec9316a1796747d0 SHA256 eebcfdebabde9796d71bc9b0894eebc3ed90c9e543d52ca290ecfbd958d25cb5 +EBUILD openttd-1.1.3.ebuild 5118 RMD160 1ee84b6884454a6393358b5f9368e5420a368d9b SHA1 bc477ec8a2aee3af06a542b7e31fce1d8d619ce8 SHA256 6660ae6765c0b83299e040f94094656ce21075205d9133558a3b414734d3f11b +MISC ChangeLog 14929 RMD160 a63b0b042ea2141c476f0a86d278e301d1cef0c1 SHA1 acceedf0dee5176c35cb7c02bae8dc47af0489ec SHA256 d8911ccdadc957899b58b0a1955f8016e328ca671d23fea22646899805497fee MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 diff --git a/games-simulation/openttd/files/openttd-1.1.2-cflags.patch b/games-simulation/openttd/files/openttd-1.1.3-cflags.patch similarity index 100% rename from games-simulation/openttd/files/openttd-1.1.2-cflags.patch rename to games-simulation/openttd/files/openttd-1.1.3-cflags.patch diff --git a/games-simulation/openttd/openttd-1.0.5.ebuild b/games-simulation/openttd/openttd-1.0.5.ebuild deleted file mode 100644 index 3c3f1d2d2295..000000000000 --- a/games-simulation/openttd/openttd-1.0.5.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# 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.0.5.ebuild,v 1.7 2011/05/01 00:32:08 halcy0n 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.bz2" - -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 -} diff --git a/games-simulation/openttd/openttd-1.1.0.ebuild b/games-simulation/openttd/openttd-1.1.0.ebuild deleted file mode 100644 index 3467fd6548f3..000000000000 --- a/games-simulation/openttd/openttd-1.1.0.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# 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 -} diff --git a/games-simulation/openttd/openttd-1.1.2.ebuild b/games-simulation/openttd/openttd-1.1.3.ebuild similarity index 98% rename from games-simulation/openttd/openttd-1.1.2.ebuild rename to games-simulation/openttd/openttd-1.1.3.ebuild index 23673ae08005..bf9f78c7fcd4 100644 --- a/games-simulation/openttd/openttd-1.1.2.ebuild +++ b/games-simulation/openttd/openttd-1.1.3.ebuild @@ -1,6 +1,6 @@ # 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.2.ebuild,v 1.1 2011/09/01 03:11:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.1.3.ebuild,v 1.1 2011/09/15 23:35:28 mr_bones_ Exp $ EAPI=2 inherit eutils games -- 2.26.2