From: Lars Weiler <pylon@gentoo.org>
Date: Thu, 1 Mar 2007 18:47:10 +0000 (+0000)
Subject: Check for X in libsdl only when not built for a dedicated server; bug #168859.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0dd8bf343a94602568c3068b4aa514a8cacc03d8;p=gentoo.git

Check for X in libsdl only when not built for a dedicated server; bug #168859.
Package-Manager: portage-2.1.2-r12
---

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 7caf471d20d7..035248b950db 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.36 2007/02/27 23:37:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.37 2007/03/01 18:47:10 pylon Exp $
+
+  01 Mar 2007; Lars Weiler <pylon@gentoo.org> -openttd-0.5.0_rc4.ebuild,
+  -openttd-0.5.0_rc5.ebuild, openttd-0.5.0.ebuild:
+  Check for X in libsdl only when not built for a dedicated server; bug #168859.
 
 *openttd-0.5.0 (27 Feb 2007)
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index a941f15d744d..d2ffd3f92629 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openttd-0.4.0.1-buffer-checks.patch 6632 RMD160 444629d2d4b33e7eac3ed962f43d8f0dee23d149 SHA1 2230a91e8699a9bbe0b7bc73844323c238c68554 SHA256 809f28bc4233641312e07c4305a3d6f15e3a609d420fca66d4aadcf68fbd65c8
 MD5 43ec527a9d656d58d852c2a828458840 files/openttd-0.4.0.1-buffer-checks.patch 6632
 RMD160 444629d2d4b33e7eac3ed962f43d8f0dee23d149 files/openttd-0.4.0.1-buffer-checks.patch 6632
@@ -8,30 +11,20 @@ RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd files/openttd.initd 529
 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 files/openttd.initd 529
 DIST openttd-0.4.8-scenarios.tar.bz2 5000799 RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 SHA1 88b3caff739fbf7bd4eb143ae97925556e813ce4 SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca
 DIST openttd-0.4.8-source.tar.bz2 2212990 RMD160 9ec9d8ee3531dc5a4f421eae6844a50299c22455 SHA1 8161079003dadbd7153d65cc88f373f16a0c0aab SHA256 39556ac3524e762c7bfbd6b1438590c9d5010bed99b4aff725e68897a0d62f8f
-DIST openttd-0.5.0-RC4-source.tar.bz2 2938287 RMD160 03daefcc8e8ff4b9f0292ea7f6352c24417d1c47 SHA1 e9359c8541922164154bcb77e49494a973a65b35 SHA256 527fb8c57eb5ca03a0c683c44945bc062d9c27e64ce49b5da3eb983d254b03ca
-DIST openttd-0.5.0-RC5-source.tar.bz2 3017095 RMD160 92e3c657d2fa4264fc3625fba13d605138d632c9 SHA1 0659064b1d1969dfa8b92105f03c4f96b8ca518e SHA256 0868691782adcaa3a3c5cc701fb0bb47f0ccf00d6e0d5c37b8f8c1ae8657f0a8
 DIST openttd-0.5.0-scenarios.tar.bz2 917117 RMD160 f6ea4a4004bb0c90de9283a92b14da4bd99bc33c SHA1 965fc34bbe9998741ea07531772c9673b33aab99 SHA256 c89e652aca1a9ad9f0f4936dd99cd8a9c96f4c53450990ff87d87483f8e74a31
 DIST openttd-0.5.0-source.tar.bz2 3029813 RMD160 7da82a6ab3bf58fd59dfef46920d15271e722682 SHA1 a97da66ec6943e45353bf53bae7947ad1454a8c1 SHA256 dec6761a291fa48e52911485d465689c3622c4eec9e66732bb9713e69220885c
 EBUILD openttd-0.4.8.ebuild 5315 RMD160 615025d777a177ba1fc888d22c819359fd9afdce SHA1 13bf0d1cd47d5bf01cf4fb703eccc48cdd82752d SHA256 f94a1a6dc9982f0a6af38cc4b5297ede3f406659f5bc78ec902dbe0d3c8b46bc
 MD5 5a4bf2dac6a5acf721ecb7cf30e4caa4 openttd-0.4.8.ebuild 5315
 RMD160 615025d777a177ba1fc888d22c819359fd9afdce openttd-0.4.8.ebuild 5315
 SHA256 f94a1a6dc9982f0a6af38cc4b5297ede3f406659f5bc78ec902dbe0d3c8b46bc openttd-0.4.8.ebuild 5315
-EBUILD openttd-0.5.0.ebuild 5559 RMD160 43831cbf9fd5f093cbc4cf3c6845aa41f5e8d01a SHA1 aebd8e0a3b8388af72f91de5cecb9c51bec52abf SHA256 d4d91f8c00d573cee9ff4c459487b68243cc7ca03dfe6dabf59f700ae64d1457
-MD5 1ea7403fa7bf784bc6d013ba050a0c57 openttd-0.5.0.ebuild 5559
-RMD160 43831cbf9fd5f093cbc4cf3c6845aa41f5e8d01a openttd-0.5.0.ebuild 5559
-SHA256 d4d91f8c00d573cee9ff4c459487b68243cc7ca03dfe6dabf59f700ae64d1457 openttd-0.5.0.ebuild 5559
-EBUILD openttd-0.5.0_rc4.ebuild 5482 RMD160 7a6b82303088ee1cce47eab043963f826a09dd3a SHA1 2585e8558b08ddaa3dc1367950a7f14293f5b01e SHA256 12eca6344a2db88917cba63d924918907008b4fa860e30c5fbdcc9a38eaa40ac
-MD5 8f0c5defc3da9ee631fb3af408496adc openttd-0.5.0_rc4.ebuild 5482
-RMD160 7a6b82303088ee1cce47eab043963f826a09dd3a openttd-0.5.0_rc4.ebuild 5482
-SHA256 12eca6344a2db88917cba63d924918907008b4fa860e30c5fbdcc9a38eaa40ac openttd-0.5.0_rc4.ebuild 5482
-EBUILD openttd-0.5.0_rc5.ebuild 5499 RMD160 999a46a38188718763f415db52e561d427a7ff07 SHA1 abe03ea69cf98c7418f8af3480b56aab5005c6d8 SHA256 d06728f25182dc48bf09eb92339cf1828b099d1581e2896959987b8418ca4892
-MD5 829b8fc2b450d531d171f4015ac6e863 openttd-0.5.0_rc5.ebuild 5499
-RMD160 999a46a38188718763f415db52e561d427a7ff07 openttd-0.5.0_rc5.ebuild 5499
-SHA256 d06728f25182dc48bf09eb92339cf1828b099d1581e2896959987b8418ca4892 openttd-0.5.0_rc5.ebuild 5499
-MISC ChangeLog 6080 RMD160 a1a6fe9b5d118ba58ea91ace60963ea5a0354c6b SHA1 13a755144270b43a90e4bbb6ede0e12429318018 SHA256 20080aa09f7f90f493f9d5b2cdec16c62582dfc4a7a20ee74fe3b00534936e4b
-MD5 d0e19f8060bd71ba04ba490337848389 ChangeLog 6080
-RMD160 a1a6fe9b5d118ba58ea91ace60963ea5a0354c6b ChangeLog 6080
-SHA256 20080aa09f7f90f493f9d5b2cdec16c62582dfc4a7a20ee74fe3b00534936e4b ChangeLog 6080
+EBUILD openttd-0.5.0.ebuild 5580 RMD160 b488ec57375c5dfbc09a238a5d730e36857a5481 SHA1 524733215a8fcac786b7eb9874ee4d0423041916 SHA256 7817bcc53d1885494325011a412d901b87c43c26bfdfcee6d65fb4d1c7290846
+MD5 6cbc8d1a6ebf5a9b47753ebde1aec8d3 openttd-0.5.0.ebuild 5580
+RMD160 b488ec57375c5dfbc09a238a5d730e36857a5481 openttd-0.5.0.ebuild 5580
+SHA256 7817bcc53d1885494325011a412d901b87c43c26bfdfcee6d65fb4d1c7290846 openttd-0.5.0.ebuild 5580
+MISC ChangeLog 6286 RMD160 ac833f64377aebccc738cd53f46b090f573e09d9 SHA1 0310892a1b7cfebbd25857a9645ab25ea6cf2597 SHA256 104d49edfca8b4c82ad690c6e87c173f2e143b15e0bc6451081326e000662975
+MD5 37b1b86e5e39db518d5de13c96123450 ChangeLog 6286
+RMD160 ac833f64377aebccc738cd53f46b090f573e09d9 ChangeLog 6286
+SHA256 104d49edfca8b4c82ad690c6e87c173f2e143b15e0bc6451081326e000662975 ChangeLog 6286
 MISC metadata.xml 379 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e SHA1 8b42b16535813e370be26ed1be6c97e947aca724 SHA256 8ba83d4305e1fa7698ab48d81f15053607da61690be4ec95e9c6a2aa499160c3
 MD5 255758e5fa9c77c52b49ed29dc311262 metadata.xml 379
 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e metadata.xml 379
@@ -42,9 +35,10 @@ SHA256 9c2a511409d19728dee9a737ca130fe715d43bd9f35ec4a34e8ca46b6c1cd3f3 files/di
 MD5 464ec2332efae8aaeb57be72eac16c9c files/digest-openttd-0.5.0 542
 RMD160 0a65e8c56965a3b632603d00d03e28b7d4fc02bc files/digest-openttd-0.5.0 542
 SHA256 e49429770c514de35d18847899c2a2539e8ac507e4a2da2a450f0984d0228ec4 files/digest-openttd-0.5.0 542
-MD5 3c2073fb6200cf0f876b10e62426c54a files/digest-openttd-0.5.0_rc4 557
-RMD160 f0e6f7aaefcf516618759ce8c90fc782af87d13e files/digest-openttd-0.5.0_rc4 557
-SHA256 f0307de813cc009f9c8869842b1886f956798faa608407c23a9f1a53dfd8f4fa files/digest-openttd-0.5.0_rc4 557
-MD5 f5f778167e8e7dcd365055281e2b13a7 files/digest-openttd-0.5.0_rc5 557
-RMD160 cf29d24425446f796a5c05a7d9493eace7cf3bdb files/digest-openttd-0.5.0_rc5 557
-SHA256 b06e35d65abb4a5096581e58a866a40bb2a92b717cd633564416866e2b9549b9 files/digest-openttd-0.5.0_rc5 557
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFF5x+26IPkARlRZfQRAiweAJ99loJIxwthQ88UnMToFZGSnIKkawCcDcYV
+sTfMUDewERelK3U6cY4N9II=
+=KtFg
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/files/digest-openttd-0.5.0_rc4 b/games-simulation/openttd/files/digest-openttd-0.5.0_rc4
deleted file mode 100644
index 922844b998a2..000000000000
--- a/games-simulation/openttd/files/digest-openttd-0.5.0_rc4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 34e8cb13ce1d4e6b5b24887c628c1ac8 openttd-0.4.8-scenarios.tar.bz2 5000799
-RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 openttd-0.4.8-scenarios.tar.bz2 5000799
-SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca openttd-0.4.8-scenarios.tar.bz2 5000799
-MD5 3e4453ae98a256af758f4a2a9e2056ea openttd-0.5.0-RC4-source.tar.bz2 2938287
-RMD160 03daefcc8e8ff4b9f0292ea7f6352c24417d1c47 openttd-0.5.0-RC4-source.tar.bz2 2938287
-SHA256 527fb8c57eb5ca03a0c683c44945bc062d9c27e64ce49b5da3eb983d254b03ca openttd-0.5.0-RC4-source.tar.bz2 2938287
diff --git a/games-simulation/openttd/files/digest-openttd-0.5.0_rc5 b/games-simulation/openttd/files/digest-openttd-0.5.0_rc5
deleted file mode 100644
index d8c3faa8ebf0..000000000000
--- a/games-simulation/openttd/files/digest-openttd-0.5.0_rc5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 34e8cb13ce1d4e6b5b24887c628c1ac8 openttd-0.4.8-scenarios.tar.bz2 5000799
-RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 openttd-0.4.8-scenarios.tar.bz2 5000799
-SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca openttd-0.4.8-scenarios.tar.bz2 5000799
-MD5 9ee574bfb148ee2b72810bf693dbc208 openttd-0.5.0-RC5-source.tar.bz2 3017095
-RMD160 92e3c657d2fa4264fc3625fba13d605138d632c9 openttd-0.5.0-RC5-source.tar.bz2 3017095
-SHA256 0868691782adcaa3a3c5cc701fb0bb47f0ccf00d6e0d5c37b8f8c1ae8657f0a8 openttd-0.5.0-RC5-source.tar.bz2 3017095
diff --git a/games-simulation/openttd/openttd-0.5.0.ebuild b/games-simulation/openttd/openttd-0.5.0.ebuild
index 6517f889c5cf..456c0edf46fd 100644
--- a/games-simulation/openttd/openttd-0.5.0.ebuild
+++ b/games-simulation/openttd/openttd-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.0.ebuild,v 1.1 2007/02/27 23:37:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.0.ebuild,v 1.2 2007/03/01 18:47:10 pylon Exp $
 
 inherit eutils games
 
@@ -31,15 +31,15 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${P}-source
 
 pkg_setup() {
-	if ! built_with_use media-libs/libsdl X ; then
-	        die "Please emerge media-libs/libsdl with USE=X"
+	if ! use dedicated && ! built_with_use media-libs/libsdl X ; then
+		die "Please emerge media-libs/libsdl with USE=X"
 	fi
 	games_pkg_setup
 }
 
 src_unpack() {
 	unpack ${P}-source.tar.bz2
-	if use scenarios; then
+	if use scenarios ; then
 		cd ${S}/scenario/
 		unpack ${SCENARIOS}
 	fi
@@ -59,7 +59,7 @@ src_compile() {
 	use png && myopts="${myopts} WITH_PNG=1"
 	use zlib && myopts="${myopts} WITH_ZLIB=1"
 	use unicode && myopts="${myopts} WITH_ICONV=1"
-	if ! use dedicated; then
+	if ! use dedicated ; then
 		myopts="${myopts} WITH_SDL=1"
 		if ! use timidity; then
 			use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi"
@@ -92,7 +92,7 @@ src_install() {
 	insinto "${GAMES_DATADIR}/${PN}/lang"
 	doins lang/*.lng || die "doins failed (lang)"
 
-	if use scenarios; then
+	if use scenarios ; then
 		insinto "${GAMES_DATADIR}/${PN}/scenario"
 		doins scenario/* || die "doins failed (scenario)"
 	fi
@@ -105,8 +105,8 @@ src_install() {
 		newins media/openttd.${i}.png openttd.png
 	done
 
-	if ! use dedicated; then
-		if use timidity || use alsa; then
+	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
@@ -138,7 +138,7 @@ pkg_postinst() {
 	einfo "correct for whichever version you have."
 	echo
 
-	if ! use scenarios; then
+	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."
@@ -153,7 +153,7 @@ pkg_postinst() {
 		echo
 	fi
 
-	if use dedicated; then
+	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 "
@@ -164,13 +164,13 @@ pkg_postinst() {
 		ewarn "processes when run, including any running client sessions!"
 		echo
 	else
-		if use timidity || use alsa; then
+		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
+			if use timidity ; then
 				einfo "You also need soundfonts for timidity, if you don't"
 				einfo "know what that is, do:"
 				echo
diff --git a/games-simulation/openttd/openttd-0.5.0_rc4.ebuild b/games-simulation/openttd/openttd-0.5.0_rc4.ebuild
deleted file mode 100644
index 8f764c8ad65b..000000000000
--- a/games-simulation/openttd/openttd-0.5.0_rc4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.0_rc4.ebuild,v 1.1 2007/01/19 19:11:46 pylon Exp $
-
-inherit eutils games
-
-MY_P=${P/_rc/-RC}
-
-SCENARIOS_A="${PN}-0.4.8-scenarios.tar.bz2"
-SCENARIOS_DIR="${PN}-0.4.8-RC1-scenarios"
-
-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="alsa debug dedicated png scenarios timidity unicode zlib"
-
-DEPEND="!dedicated? ( media-libs/libsdl )
-	png? ( media-libs/libpng )
-	scenarios? ( app-arch/unzip )
-	zlib? ( sys-libs/zlib )
-	unicode? ( virtual/libiconv )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		timidity? ( media-sound/timidity++ )
-		!timidity? ( alsa? ( media-sound/alsa-utils ) )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}-source.tar.bz2
-	if use scenarios; then
-		cd ${S}/scenario/
-		unpack ${SCENARIOS_A}
-	fi
-	cd ${S}
-	# Don't pre-strip binaries (bug #137822)
-	sed -i -e '/+= -s$/s/-s//' Makefile || die "sed failed"
-	# Don't install into prefixed DATA_DIR
-	sed -i -e \
-		's#DATA_DIR_PREFIXED:=$(PREFIX)/$(DATA_DIR)#DATA_DIR_PREFIXED:=$(DATA_DIR)#' \
-		Makefile || die "sed failed"
-}
-
-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"
-	use unicode && myopts="${myopts} WITH_ICONV=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 \
-		DEST_DIR=${D} \
-		PERSONAL_DIR=.openttd \
-		PREFIX=${GAMES_PREFIX} \
-		DATA_DIR=${GAMES_DATADIR}/${PN} \
-		CUSTOM_LANG_DIR=${GAMES_DATADIR}/${PN}/lang \
-		${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/${SCENARIOS_DIR}/* || 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
-	dohtml -a html,gif,png,svg docs/*
-	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
-}
diff --git a/games-simulation/openttd/openttd-0.5.0_rc5.ebuild b/games-simulation/openttd/openttd-0.5.0_rc5.ebuild
deleted file mode 100644
index ec5156986b55..000000000000
--- a/games-simulation/openttd/openttd-0.5.0_rc5.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.0_rc5.ebuild,v 1.1 2007/02/09 22:25:51 pylon Exp $
-
-inherit eutils games
-
-MY_P=${P/_rc/-RC}
-
-SCENARIOS_A="${PN}-0.4.8-scenarios.tar.bz2"
-SCENARIOS_DIR="${PN}-0.4.8-RC1-scenarios"
-
-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="alsa debug dedicated png scenarios timidity unicode zlib"
-
-DEPEND="!dedicated? ( media-libs/libsdl )
-	png? ( media-libs/libpng )
-	scenarios? ( app-arch/unzip )
-	zlib? ( sys-libs/zlib )
-	unicode? ( virtual/libiconv )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		timidity? ( media-sound/timidity++ )
-		!timidity? ( alsa? ( media-sound/alsa-utils ) )
-	)"
-
-S=${WORKDIR}/${MY_P/_rc5/-RC5}-source
-
-src_unpack() {
-	unpack ${MY_P}-source.tar.bz2
-	if use scenarios; then
-		cd ${S}/scenario/
-		unpack ${SCENARIOS_A}
-	fi
-	cd ${S}
-	# Don't pre-strip binaries (bug #137822)
-	sed -i -e '/+= -s$/s/-s//' Makefile || die "sed failed"
-	# Don't install into prefixed DATA_DIR
-	sed -i -e \
-		's#DATA_DIR_PREFIXED:=$(PREFIX)/$(DATA_DIR)#DATA_DIR_PREFIXED:=$(DATA_DIR)#' \
-		Makefile || die "sed failed"
-}
-
-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"
-	use unicode && myopts="${myopts} WITH_ICONV=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 \
-		DEST_DIR=${D} \
-		PERSONAL_DIR=.openttd \
-		PREFIX=${GAMES_PREFIX} \
-		DATA_DIR=${GAMES_DATADIR}/${PN} \
-		CUSTOM_LANG_DIR=${GAMES_DATADIR}/${PN}/lang \
-		${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/${SCENARIOS_DIR}/* || 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
-	dohtml -a html,gif,png,svg docs/*
-	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
-}