From 5e58cd7ca61d2c117b64d2c39e1303e9d35a5b0b Mon Sep 17 00:00:00 2001
From: Fabian Fingerle <fabian@datensalat.eu>
Date: Thu, 2 Apr 2009 00:46:10 +0200
Subject: [PATCH] games-simulation/openttd-0.7.0: fixes

---
 games-simulation/openttd/Manifest             |  2 +-
 games-simulation/openttd/openttd-0.7.0.ebuild | 70 ++++++++++++---------------
 2 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 2c701ea..3feb946 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,5 +1,5 @@
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
 DIST openttd-0.7.0-source.tar.bz2 4827319 RMD160 389618bea76513e1891d9eb5bfead834c66b173d SHA1 a55402a49ccd87b574b12183abb4239b92ea98f5 SHA256 5606338bd504c8248c7c39f00c5b66234158e92177d64715748adcc98c8f4720
-EBUILD openttd-0.7.0.ebuild 2680 RMD160 7d6fcfd72b8bf0a7568540825f80d779dd08b7d7 SHA1 7498ad5ccd67863e3e2d0523340aa12f39da1d56 SHA256 34733c33b643c8009e46751d593d3fa21d14a610e0632ae78256de435db13455
+EBUILD openttd-0.7.0.ebuild 2717 RMD160 5f6a5b9a76331d92d780198ddf213e4a9e72c080 SHA1 46f78752ee642584493d1450af28bfd741eb3168 SHA256 005e3d5d23cc7cc4510a281cf3d6d9fca04219ac7a501437fad9f5dfe5f38e79
 MISC ChangeLog 9008 RMD160 5d2848faa033cacbb63337e924d7ae433746aff4 SHA1 f6ff4881c2bfcb82204fef1bd3b542b4365e59bf SHA256 6897f7a29f5a9f9fca0c6a4fb24cef718c937a27bc1d37ba69c46bf2e44345de
 MISC metadata.xml 159 RMD160 9ce79fb2f245a86f0fd9896ef34c65b6dc2a97bf SHA1 e8d4e28f664e8bd524cb04b5077852adc2f57d90 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69
diff --git a/games-simulation/openttd/openttd-0.7.0.ebuild b/games-simulation/openttd/openttd-0.7.0.ebuild
index 4b9d616..753e744 100644
--- a/games-simulation/openttd/openttd-0.7.0.ebuild
+++ b/games-simulation/openttd/openttd-0.7.0.ebuild
@@ -13,70 +13,59 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa sdl debug dedicated iconv +png +truetype +zlib icu"
+IUSE="alsa debug dedicated iconv icu +png +truetype +zlib"
 RESTRICT="test"
 
-DEPEND="!dedicated? (
-			sdl? ( media-libs/libsdl[X] )
-			!sdl? ( media-libs/allegro[X] )
-			truetype? (
-				media-libs/fontconfig
-				media-libs/freetype:2
-			)
+DEPEND="
+	!dedicated? (
+		media-libs/libsdl[X]
+		media-libs/sdl-image[png]
+		truetype? (
+			media-libs/fontconfig
+			media-libs/freetype:2
 		)
-		icu? ( dev-libs/icu )
-		iconv? ( virtual/libiconv )
-		png? ( media-libs/libpng )
-		zlib? ( sys-libs/zlib )"
+	)
+	icu? ( dev-libs/icu )
+	iconv? ( virtual/libiconv )
+	png? ( media-libs/libpng )
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
-		!dedicated? (
-			alsa? ( media-sound/alsa-utils )
-		)"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${P}-source.tar.bz2
-}
+	!dedicated? (
+		alsa? ( media-sound/alsa-utils[midi] )
+	)"
 
 src_configure() {
 	local myopts=""
 	use debug && myopts="${myopts} --enable-debug=3"
-	if use dedicated; then
-		myopts="${myopts} --enable-dedicated "
-	else
-		if use alsa; then
-			myopts="${myopts} --with-midi=/usr/bin/aplaymidi"
-		fi
-
-		if ! use sdl; then
-			myopts="${myopts} --with-allegrol"
-		fi
 
+	use dedicated && myopts="${myopts} --enable-dedicated"
+	if use alsa; then
+		myopts="${myopts} --with-midi=/usr/bin/aplaymidi"
 	fi
+
+	# there is available allegro interface as opposite for sdl, but we always
+	# prefer sdl more and the configure for the other one looks broken.
+
 	# configure is a hand-written sh-script, so econf will not work
-	./configure --disable-strip \
+	./configure \
+		--disable-strip \
 		--prefix-dir=/usr \
 		--binary-dir=games/bin \
 		--data-dir=share/games/${PN} \
 		--install-dir="${D}" \
-		--doc-dir=share/doc/${P} \
+		--doc-dir=share/doc/${PF} \
 		--menu-group="Game;Simulation;" \
+		--with-sdl \
 		$(use_with iconv) \
 		$(use_with truetype freetype) \
-		$(use_with sdl) \
 		$(use_with png) \
 		$(use_with zlib) \
-		$(use_with sdl) \
 		$(use_with icu) \
+		$(use_with zlib) \
 		${myopts} \
 		|| die "configure failed"
 }
 
-src_compile() {
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
@@ -95,6 +84,9 @@ pkg_postinst() {
 	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
 
 	if use dedicated ; then
 		ewarn "Warning: The init script will kill all running openttd"
-- 
2.11.4.GIT