Updated ebuild with patches from maedhros in bug #176474.

Package-Manager: portage-2.1.2.7

3 files changed, 27 insertions, 24 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index e1f63bb1a651..0eff85f4f966 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,9 @@
 # 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.39 2007/04/21 11:50:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.40 2007/05/12 15:37:37 pylon Exp $
+
+  12 May 2007; Lars Weiler <pylon@gentoo.org> openttd-0.5.1.ebuild:
+  Updated ebuild with patches from maedhros in bug #176474.
 
 *openttd-0.5.1 (21 Apr 2007)
 
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 390d21055aef..4a7a73ffda3a 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -18,14 +18,14 @@ EBUILD openttd-0.5.0.ebuild 5590 RMD160 4003aa6375e6bb6cdc3a6c6ef45009dba6055f83
 MD5 648bec2b2d5d2dc7ce09c172047718af openttd-0.5.0.ebuild 5590
 RMD160 4003aa6375e6bb6cdc3a6c6ef45009dba6055f83 openttd-0.5.0.ebuild 5590
 SHA256 773fd3351cdeea13b5d4c0b8762578651fd57a73235acbfea389bfc9ded5821d openttd-0.5.0.ebuild 5590
-EBUILD openttd-0.5.1.ebuild 5709 RMD160 6d5c3059dbf6104f6df14466b57bbf16f377a62b SHA1 91c02cf167be7c3ec961e2225426166d395ab3cb SHA256 c9ffba092564aeba2ccdd71d06d67d3c5c40b20a4c82aa29f9954390a5591a0b
-MD5 6e063b522d9586f1754f72a063680ed5 openttd-0.5.1.ebuild 5709
-RMD160 6d5c3059dbf6104f6df14466b57bbf16f377a62b openttd-0.5.1.ebuild 5709
-SHA256 c9ffba092564aeba2ccdd71d06d67d3c5c40b20a4c82aa29f9954390a5591a0b openttd-0.5.1.ebuild 5709
-MISC ChangeLog 6571 RMD160 284dd59478be44f0e99286639b0c3ba547535cd9 SHA1 029548e1d6a7868e4aa1324c0e8e2f8a4fc33126 SHA256 a52f88aa3e5872f25c41a9b4dfc178d34f4b83e8d70b685bb3798d87d333d762
-MD5 8aa7969ca25f63ef38f4f807a5a0dd15 ChangeLog 6571
-RMD160 284dd59478be44f0e99286639b0c3ba547535cd9 ChangeLog 6571
-SHA256 a52f88aa3e5872f25c41a9b4dfc178d34f4b83e8d70b685bb3798d87d333d762 ChangeLog 6571
+EBUILD openttd-0.5.1.ebuild 5661 RMD160 785ca6aa1505a674ea6eb8decab4ad8b91791715 SHA1 653f49a26f4ddc86682b8974883dc94d3d4ef11c SHA256 50ef2b32bcddfaccbaf7a49bc34c95c88accb4c9e21fc930509e27502e05a89a
+MD5 6b574492e32184551831a65a475cdcbf openttd-0.5.1.ebuild 5661
+RMD160 785ca6aa1505a674ea6eb8decab4ad8b91791715 openttd-0.5.1.ebuild 5661
+SHA256 50ef2b32bcddfaccbaf7a49bc34c95c88accb4c9e21fc930509e27502e05a89a openttd-0.5.1.ebuild 5661
+MISC ChangeLog 6700 RMD160 e11961f134ded22e88eec62647c5ac4f0c18400c SHA1 3ca5c4bef2334f1d1dd9c9832e0f2fd1a1dfdc0f SHA256 daddddee8fea2ba8d67bc01adde16ea1c2cc5766b4f9d0fdc48a409007cb025d
+MD5 6096c03dffb8c23a426c477da6ec94af ChangeLog 6700
+RMD160 e11961f134ded22e88eec62647c5ac4f0c18400c ChangeLog 6700
+SHA256 daddddee8fea2ba8d67bc01adde16ea1c2cc5766b4f9d0fdc48a409007cb025d ChangeLog 6700
 MISC metadata.xml 379 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e SHA1 8b42b16535813e370be26ed1be6c97e947aca724 SHA256 8ba83d4305e1fa7698ab48d81f15053607da61690be4ec95e9c6a2aa499160c3
 MD5 255758e5fa9c77c52b49ed29dc311262 metadata.xml 379
 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e metadata.xml 379
@@ -40,9 +40,9 @@ MD5 9cf5ea4d78624866d5487a5cd9c2131e files/digest-openttd-0.5.1 819
 RMD160 c9ffa680658d7dcb7520a4bba3cb4a8f847d67f1 files/digest-openttd-0.5.1 819
 SHA256 5a3aabe2424aab72789685d6eb754f2bc002d57b36f66fc8acabb8abe01bed71 files/digest-openttd-0.5.1 819
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGKfqb6IPkARlRZfQRAjEyAJ9SH9hnsTBu8ZdUAEdogYNbJRqdaACeNH4K
-06as1xiqtRaDN+Ma0LWxIiw=
-=mXMj
+iD8DBQFGRd9A6IPkARlRZfQRAnL5AJsGhQKS7e9W9Lf3vYe036PrbBOT7QCgh+0j
+GIUbDQQx5whQK1mnrjpdBpQ=
+=/ijT
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/openttd-0.5.1.ebuild b/games-simulation/openttd/openttd-0.5.1.ebuild
index 9bc1bec5fdfc..b8bb4b9d8d8d 100644
--- a/games-simulation/openttd/openttd-0.5.1.ebuild
+++ b/games-simulation/openttd/openttd-0.5.1.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.1.ebuild,v 1.1 2007/04/21 11:50:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.1.ebuild,v 1.2 2007/05/12 15:37:37 pylon Exp $
 
 inherit eutils games
 
@@ -17,12 +17,14 @@ SRC_URI="${SB}/${P}-source.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
-IUSE="alsa debug dedicated png scenarios timidity unicode zlib"
+IUSE="alsa debug dedicated iconv png scenarios timidity zlib"
 
-DEPEND="!dedicated? ( media-libs/libsdl >=media-libs/fontconfig-2.3.2 )
+DEPEND="!dedicated? ( media-libs/libsdl
+		media-libs/fontconfig
+	)
+	iconv? ( virtual/libiconv )
 	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )
-	unicode? ( virtual/libiconv )"
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	!dedicated? (
 		timidity? ( media-sound/timidity++ )
@@ -56,23 +58,21 @@ src_compile() {
 	local myopts=""
 	use debug && myopts="${myopts} DEBUG=1"
 	use dedicated && myopts="${myopts} DEDICATED=1"
+	use iconv && myopts="${myopts} WITH_ICONV=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"
+		myopts="${myopts} WITH_SDL=1 WITH_FREETYPE=1 WITH_FONTCONFIG=1"
 		if ! use timidity; then
 			use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi"
 		fi
 	fi
 
-	# parallel build not supported
-	emake -j1 \
+	emake \
 		MANUAL_CONFIG=1 \
 		UNIX=1 \
 		WITH_NETWORK=1 \
 		INSTALL=1 \
-		RELEASE=${PV} \
 		USE_HOMEDIR=1 \
 		DEST_DIR=${D} \
 		PERSONAL_DIR=.openttd \
@@ -116,7 +116,7 @@ src_install() {
 		newinitd "${FILESDIR}"/openttd.initd openttd
 	fi
 
-	dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/console.txt docs/multiplayer.txt
+	dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/multiplayer.txt
 	dohtml -a html,gif,png,svg docs/*
 	newdoc scripts/readme.txt readme_scripts.txt
 	doman docs/openttd.6