From: Robin H. Johnson Date: Mon, 7 Aug 2006 01:07:16 +0000 (+0000) Subject: Bump to rc2, with some ebuild cleanups, because rc1 kept crashing on me. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c532347b35c3ab736a6b3caa29545f0fedf3aaa2;p=gentoo.git Bump to rc2, with some ebuild cleanups, because rc1 kept crashing on me. Package-Manager: portage-2.1.1_pre4-r3 --- diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog index ef1c3de40fad..fa14ca122c68 100644 --- a/games-simulation/openttd/ChangeLog +++ b/games-simulation/openttd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-simulation/openttd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.22 2006/07/12 19:27:40 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.23 2006/08/07 01:07:15 robbat2 Exp $ + +*openttd-0.4.8_rc2 (07 Aug 2006) + + 07 Aug 2006; Robin H. Johnson + +openttd-0.4.8_rc2.ebuild: + Bump to rc2, with some ebuild cleanups, because rc1 kept crashing on me. *openttd-0.4.8_rc1 (12 Jul 2006) diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index 501c3ab20422..29d2c69270aa 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -6,10 +6,12 @@ AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f8332 MD5 a169eb5c8572ee01be52c4accf2608a2 files/openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd files/openttd.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 files/openttd.initd 529 -DIST openttd-0.4.0.1-source.tar.gz 2950778 +DIST openttd-0.4.0.1-source.tar.gz 2950778 RMD160 4bd07812c27cf7a637feaf92ee66ccdff56c6b65 SHA1 992d3d497161b63cb8de94f34ed63611e23ae08e SHA256 56e844da580761ddbb580683fc455a8d9eb3179df631568c26b7188d1ff16363 DIST openttd-0.4.7-source-scenarios.zip 4969396 RMD160 d0a18925f6e06881d86217621dbe09a39d9f7543 SHA1 c5c61b81721b275ed2d017c6a6044dbea81cec31 SHA256 b6f3c2d65a28d7cbcbb0236ba88675ad2862dc953bd7cdc143fedb7271d68358 DIST openttd-0.4.7-source.tar.bz2 2202261 RMD160 14817f7c87f8086a60f058b6d046ed2c6183e8d0 SHA1 44bd917c1b583213c3998bf1bb33a1ed53a9e7be SHA256 a408328949909715042a2b803647d2261f37b82877052bda82992631da915565 DIST openttd-0.4.8-RC1-source.tar.bz2 3876677 RMD160 a956fa20c03f0aa98b37fcc4d5b2feca19b8b153 SHA1 9851c07f804efc839cb476145823f44dc862b4fc SHA256 43f7f4c682999164ba6e3469cb595c54ffebaa567e0e8b7fb2e6143f061b951f +DIST openttd-0.4.8-RC2-scenarios.tar.bz2 5000799 RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 SHA1 88b3caff739fbf7bd4eb143ae97925556e813ce4 SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca +DIST openttd-0.4.8-RC2-source.tar.bz2 2211442 RMD160 59a66b05ce563a1c5d12b0f5ebe4bee818c8fe94 SHA1 26351512d98e81fb06d5964683aea8c24c9606f8 SHA256 f9e791b57a19b8e9889a620d1d46a5400c1b45dfbf2659a3dbead8de4d3a8c73 EBUILD openttd-0.4.0.1-r1.ebuild 4349 RMD160 c7135e693ebe3910137e038be68b5701daacee82 SHA1 a976cdc8d80e146a94da35940762153065e23d65 SHA256 f614b93eebc09e2966f6f99bc722d363e8a24226b31d1107ac14c5f3d4a0ac66 MD5 44e37a7863de4415a5b4506e41cac6cc openttd-0.4.0.1-r1.ebuild 4349 RMD160 c7135e693ebe3910137e038be68b5701daacee82 openttd-0.4.0.1-r1.ebuild 4349 @@ -22,20 +24,27 @@ EBUILD openttd-0.4.8_rc1.ebuild 5075 RMD160 3031aabe4c57c2ddcb7b11b4717fdf874f71 MD5 7ac663ebc1b046a2d8fbef0c22e41ee6 openttd-0.4.8_rc1.ebuild 5075 RMD160 3031aabe4c57c2ddcb7b11b4717fdf874f71cb56 openttd-0.4.8_rc1.ebuild 5075 SHA256 bd49ed8fbc80fb54287dfec6e116885f9439d2dc53ae9ef306078dbaa249e823 openttd-0.4.8_rc1.ebuild 5075 -MISC ChangeLog 4093 RMD160 61edd042eced68d043b9cf724fe8a153b69b3237 SHA1 537eeb9f4ca1c4693cad3b72e4dbe2250aa2a125 SHA256 59cfa2860baf91ce18371d7ec98fdbc351ab02332ee1d760fff818263d567310 -MD5 9e114c7a09a2417273cc94b6a3d9a59c ChangeLog 4093 -RMD160 61edd042eced68d043b9cf724fe8a153b69b3237 ChangeLog 4093 -SHA256 59cfa2860baf91ce18371d7ec98fdbc351ab02332ee1d760fff818263d567310 ChangeLog 4093 +EBUILD openttd-0.4.8_rc2.ebuild 5125 RMD160 191cf2147f13ecf540cdc527c36e8befa1939abc SHA1 4d075604081574b9e4277db8256d0b16a3118aef SHA256 a9ef1d46c62d5caebb86dbcf327bc7de051adf9bb60a2f5e905d0283fb85441d +MD5 160dac7af2d4189c16690c968e12bc49 openttd-0.4.8_rc2.ebuild 5125 +RMD160 191cf2147f13ecf540cdc527c36e8befa1939abc openttd-0.4.8_rc2.ebuild 5125 +SHA256 a9ef1d46c62d5caebb86dbcf327bc7de051adf9bb60a2f5e905d0283fb85441d openttd-0.4.8_rc2.ebuild 5125 +MISC ChangeLog 4287 RMD160 bcefc8035d0ca2aa31b0eaf6e57908fe0c6e08e9 SHA1 92d169c9e13fed72d32829bd5d8939961ccb1f56 SHA256 d7c286b0eca9734ddc45514f8c367d4043c9b7160781130ae8fcc8600486384f +MD5 64a8c73f5850ebbf6e9abeee41acddc8 ChangeLog 4287 +RMD160 bcefc8035d0ca2aa31b0eaf6e57908fe0c6e08e9 ChangeLog 4287 +SHA256 d7c286b0eca9734ddc45514f8c367d4043c9b7160781130ae8fcc8600486384f ChangeLog 4287 MISC metadata.xml 379 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e SHA1 8b42b16535813e370be26ed1be6c97e947aca724 SHA256 8ba83d4305e1fa7698ab48d81f15053607da61690be4ec95e9c6a2aa499160c3 MD5 255758e5fa9c77c52b49ed29dc311262 metadata.xml 379 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e metadata.xml 379 SHA256 8ba83d4305e1fa7698ab48d81f15053607da61690be4ec95e9c6a2aa499160c3 metadata.xml 379 -MD5 58b6f8b5a58925f558524fcb4c2711fc files/digest-openttd-0.4.0.1-r1 75 -RMD160 8e24c352f50e87baa00dba9fc9d39f920f8864f3 files/digest-openttd-0.4.0.1-r1 75 -SHA256 c0add6a15064c39308b64eabdf2b03e893a4e21d3b71d184904b02d8baca0dbc files/digest-openttd-0.4.0.1-r1 75 +MD5 81f51c640f71dccaffb56e27571df9a3 files/digest-openttd-0.4.0.1-r1 271 +RMD160 c3e9ca6176b65dcd63989b15dc907d2d7595eadb files/digest-openttd-0.4.0.1-r1 271 +SHA256 ec1fadc684d60a41010a1fdd3c4a272f33e5f7743b630dbd41b35ef97f8b8aa0 files/digest-openttd-0.4.0.1-r1 271 MD5 83c994f9799a4e6ca03d4223efc870b2 files/digest-openttd-0.4.7 554 RMD160 1c3a503cf11fbd7a38983a4ae2d10a5455de9d52 files/digest-openttd-0.4.7 554 SHA256 d4c9365a3eba4078de3859e3b7cc28a5d4d47d36da978669d564499d540b2c97 files/digest-openttd-0.4.7 554 MD5 3d4157c26d1e89abb9fa845467dba2b8 files/digest-openttd-0.4.8_rc1 566 RMD160 b08102790f6f66e55d543c30cafa0dd2865ad4cd files/digest-openttd-0.4.8_rc1 566 SHA256 97013c752dafed766395f12f9ce150898f95522684e2217d814895a05a7f4bd4 files/digest-openttd-0.4.8_rc1 566 +MD5 eb38d26f1137724342dacc5a775036c1 files/digest-openttd-0.4.8_rc2 569 +RMD160 3b11a7b0374977e245f5670944e5ef9b946a074d files/digest-openttd-0.4.8_rc2 569 +SHA256 526a179d2886d15784408026209ec39a0e65fd5c4ad0dbead458db897c795064 files/digest-openttd-0.4.8_rc2 569 diff --git a/games-simulation/openttd/files/digest-openttd-0.4.0.1-r1 b/games-simulation/openttd/files/digest-openttd-0.4.0.1-r1 index 1272ae79fcdd..74af8f139244 100644 --- a/games-simulation/openttd/files/digest-openttd-0.4.0.1-r1 +++ b/games-simulation/openttd/files/digest-openttd-0.4.0.1-r1 @@ -1 +1,3 @@ MD5 ddd9790c86b7ccc68f60761704cbcf81 openttd-0.4.0.1-source.tar.gz 2950778 +RMD160 4bd07812c27cf7a637feaf92ee66ccdff56c6b65 openttd-0.4.0.1-source.tar.gz 2950778 +SHA256 56e844da580761ddbb580683fc455a8d9eb3179df631568c26b7188d1ff16363 openttd-0.4.0.1-source.tar.gz 2950778 diff --git a/games-simulation/openttd/files/digest-openttd-0.4.8_rc2 b/games-simulation/openttd/files/digest-openttd-0.4.8_rc2 new file mode 100644 index 000000000000..3992765ec6c6 --- /dev/null +++ b/games-simulation/openttd/files/digest-openttd-0.4.8_rc2 @@ -0,0 +1,6 @@ +MD5 34e8cb13ce1d4e6b5b24887c628c1ac8 openttd-0.4.8-RC2-scenarios.tar.bz2 5000799 +RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 openttd-0.4.8-RC2-scenarios.tar.bz2 5000799 +SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca openttd-0.4.8-RC2-scenarios.tar.bz2 5000799 +MD5 c1149d6258f43eb6645ebf2d6a26e0b7 openttd-0.4.8-RC2-source.tar.bz2 2211442 +RMD160 59a66b05ce563a1c5d12b0f5ebe4bee818c8fe94 openttd-0.4.8-RC2-source.tar.bz2 2211442 +SHA256 f9e791b57a19b8e9889a620d1d46a5400c1b45dfbf2659a3dbead8de4d3a8c73 openttd-0.4.8-RC2-source.tar.bz2 2211442 diff --git a/games-simulation/openttd/openttd-0.4.8_rc2.ebuild b/games-simulation/openttd/openttd-0.4.8_rc2.ebuild new file mode 100644 index 000000000000..4cf9a486c798 --- /dev/null +++ b/games-simulation/openttd/openttd-0.4.8_rc2.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.4.8_rc2.ebuild,v 1.1 2006/08/07 01:07:15 robbat2 Exp $ + +inherit eutils games + +MY_PV="${PV/_rc/-RC}" +MY_P="${PN}-${MY_PV}" +# At some point in the future this may be needed again +# as upstream doesn't re-upload scenarios if they don't change. +#SCENARIO_PV="0.4.7" +SCENARIOS_A="${MY_P}-scenarios.tar.bz2" + +DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" +HOMEPAGE="http://www.openttd.com/" +SB="mirror://sourceforge/openttd" +SRC_URI="${SB}/${MY_P}-source.tar.bz2 + scenarios? ( ${SB}/${SCENARIOS_A} )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug png zlib timidity alsa dedicated scenarios" + +DEPEND="!dedicated? ( media-libs/libsdl ) + png? ( media-libs/libpng ) + scenarios? ( app-arch/unzip ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND} + !dedicated? ( + timidity? ( media-sound/timidity++ ) + !timidity? ( alsa? ( media-sound/alsa-utils ) ) + )" + +S="${WORKDIR}/${P/_rc/-RC}" + +src_unpack() { + unpack ${MY_P}-source.tar.bz2 + if use scenarios; then + cd ${S}/scenario/ + unpack ${SCENARIOS_A} + fi + cd ${S} +} + +src_compile() { + local myopts="" + use debug && myopts="${myopts} DEBUG=1" + use dedicated && myopts="${myopts} DEDICATED=1" + use png && myopts="${myopts} WITH_PNG=1" + use zlib && myopts="${myopts} WITH_ZLIB=1" + if ! use dedicated; then + myopts="${myopts} WITH_SDL=1" + if ! use timidity; then + use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi" + fi + fi + + # parallel build not supported + emake -j1 \ + MANUAL_CONFIG=1 \ + UNIX=1 \ + WITH_NETWORK=1 \ + INSTALL=1 \ + RELEASE=${PV} \ + USE_HOMEDIR=1 \ + PERSONAL_DIR=.openttd \ + PREFIX=/usr \ + DATA_DIR=share/games/${PN} \ + ${myopts} \ + || die "emake failed" +} + +src_install() { + dogamesbin openttd || die "dogamesbin failed" + + insinto "${GAMES_DATADIR}/${PN}/data" + doins data/* || die "doins failed (data)" + + insinto "${GAMES_DATADIR}/${PN}/lang" + doins lang/*.lng || die "doins failed (lang)" + + if use scenarios; then + insinto "${GAMES_DATADIR}/${PN}/scenario" + doins scenario/* || die "doins failed (scenario)" + fi + + insinto "${GAMES_DATADIR}/${PN}/scripts" + doins scripts/*.example || die "doins failed (scripts)" + + for i in {16,32,48,64,128}; do + insinto /usr/share/icons/hicolor/${i}x${i}/apps + newins media/openttd.${i}.png openttd.png + done + + if ! use dedicated; then + if use timidity || use alsa; then + make_desktop_entry "openttd -m extmidi" "OpenTTD" openttd + else + make_desktop_entry openttd "OpenTTD" openttd + fi + else + newinitd "${FILESDIR}"/openttd.initd openttd + fi + + dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/console.txt docs/multiplayer.txt + newdoc scripts/readme.txt readme_scripts.txt + doman docs/openttd.6 + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + + echo + einfo "In order to play, you must copy the following 6 files from " + einfo "a version of TTD to ${GAMES_DATADIR}/${PN}/data/." + echo + einfo "From the WINDOWS version you need: " + einfo " sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" + einfo "OR from the DOS version you need: " + einfo " SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" + echo + einfo "File names are case sensitive so make sure they are " + einfo "correct for whichever version you have." + echo + + if ! use scenarios; then + einfo "Scenarios are now included in a seperate package. To " + einfo "install them as well please remerge with the " + einfo "\"scenarios\" USE flag." + echo + else + einfo "Scenarios are installed to ${GAMES_DATADIR}/${PN}/scenario," + einfo "you will have to symlink them to ~/.openttd/scenario in order" + einfo "to use them." + einfo "Example:" + einfo " mkdir -p ~/.openttd/scenario" + einfo " ln -s ${GAMES_DATADIR}/${PN}/scenario/* ~/.openttd/scenario/" + echo + fi + + if use dedicated; then + einfo "You have chosen the dedicated USE flag which builds a " + einfo "version of OpenTTD to be used as a game server which " + einfo "does not require SDL. You will not be able to play the " + einfo "game, but if you don't pass this flag you can still use " + einfo "it as a server in the same way, but SDL will be required." + echo + ewarn "Warning: The init script will kill all running openttd" + ewarn "processes when run, including any running client sessions!" + echo + else + if use timidity || use alsa; then + einfo "If you want music, you must copy the gm/ directory" + einfo "to ${GAMES_DATADIR}/${PN}/" + einfo "You can enable MIDI by running:" + einfo " openttd -m extmidi" + echo + if use timidity; then + einfo "You also need soundfonts for timidity, if you don't" + einfo "know what that is, do:" + echo + einfo "emerge media-sound/timidity-eawpatches" + else + einfo "You have emerged with 'aplaymidi' for playing MIDI." + einfo "You have to set the environment variable ALSA_OUTPUT_PORTS." + einfo "Available ports can be listed by using 'aplaymidi -l'." + fi + else + einfo "timidity and/or alsa not in USE so music will not be played during the game." + fi + echo + fi +}