build with locale=EE (bug #437488)

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 46 insertions, 5 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index e9df8e14ff7f..c578bb893b50 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.117 2012/09/08 16:03:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.118 2012/10/09 23:55:28 mr_bones_ Exp $
+
+  09 Oct 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scummvm-1.5.0-EE.patch, scummvm-1.5.0.ebuild:
+  build with locale=EE (bug #437488)
 
   08 Sep 2012; Michael Sterrett <mr_bones_@gentoo.org> scummvm-1.5.0.ebuild:
   fix implicit faad2 dep with patch from Hans (bug #434312)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ff993011983c..1b8b3c992330 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,8 +1,9 @@
+AUX scummvm-1.5.0-EE.patch 1478 SHA256 f6922a839f14cb1ba048bafc760f71724e8748fd3d575efc5599add366c56672 SHA512 a52200a0540f607f2033ddba78271c35e37791fefb76e53d0bb2482fe4e371f6b332c5475d0e09a9d09a09b9d59f0664e254f6a31ab5d2c51a37d8b5c9360b70 WHIRLPOOL 198963c9a8be67b4a9e658897757a206591cd8c6553bc03f8c0037f50aa2f7127926d5f38c73aa2d4e97c65d232128e0762e786bec26b7a9fa6a10735be76963
 DIST scummvm-1.4.0.tar.bz2 15580242 SHA256 494b12e90749aaa76304aa066c90eede8a5b4a8417900be9702a3e6ab484743d
 DIST scummvm-1.4.1.tar.bz2 15703475 SHA256 fa0a7f0d59524611be0c5b9be9ac7f8e7a72bab1826732e056f88332aa3139da
 DIST scummvm-1.5.0.tar.bz2 17455085 SHA256 81831cd878a8daad2976f65c92139a2102233082c7d2770579d7e425b19cea2e SHA512 a4ae0965fec7e065a46ee1a8a49897eb2fecaf7851590b5696d866a5f224d0491937f63e9e2e8ba797c7d9b8d7ff45fbaf12b4f17c3ddec0f9973a6a915ee1c5 WHIRLPOOL dd8842edc41de693043db5c5005670b37583cdd97a9124575b4f725e5c6a3cf16f4670624e32578936085829c8627caa07a49902d643103386ca633fe23d2c14
 EBUILD scummvm-1.4.0.ebuild 2125 SHA256 bbc1a2dc8851c1528c18273250a2f5a72904680c87a56299cb6ae3f495b767ff SHA512 c2f09cb8053fc711953bd675fb553235d8de9eca6cbaaa274fb48eda5671bcfc667fa87d02fc88a74ff856c951636a7d74c0a0d1a8887ee0067d93e6958b26ce WHIRLPOOL 86e40fa8f9ee8cd38293797b64d544983465c64f4ed25ad278a5d32f3c51d7fb511995e2d92ca82193774eeaff378e1f75002d6b88e6c6a3cf4d5b95577759e7
 EBUILD scummvm-1.4.1.ebuild 2121 SHA256 777a50cc31ca8578cf1e005cca2ae1882a4ef8422b4195e1cc8a7be5cf156f37 SHA512 dba90749b5dfd15d194a4e2c4eb1692ce828b46079f22b09e8378f1a5c9441a32c095e57985bf9f0b18f79e99f8ef464734b09b0edc7a6c6a1380107c10b1e68 WHIRLPOOL a8310ea256b30ef13a36da50cfd97e7cf1424e6b74f04e0311bfe9f3d4bc91288e0ad2303de1af50ec906d55608577ee1ea233d18e896cf0f97fe1731c293f57
-EBUILD scummvm-1.5.0.ebuild 2092 SHA256 7addadad981ea0c27a05c77fba595cca63a8c521223efe871d988204f43b3094 SHA512 2da68ca13e552a156198f2dd710303d10a4ff50d2adac03368f1961049b253f3cad8723b2798205b5a8341cd5fefdc650f4cf65ec6a2273ade1fed0245037355 WHIRLPOOL 1b884685500496ac028e22f0697cf1194635fe4a0caccd3ea3ed2bd75f1278c91806592387895b0ec250b09900687aea01b2923336f9fda20ac40d5a59683039
-MISC ChangeLog 16893 SHA256 7a5d1adf46ad1401c6538649d282d6384774807615651a76444cb2e345ed0cf4 SHA512 b6d6268db4c6f3ecdd5d1ec4ad86cec5d8b5c0ba361ceee66abf267663b49c685e45b270e26f8b1207b36bb026e89d1a84d2ee21f9c49753d44e256ace3e3624 WHIRLPOOL ab92ff37d43f62682fa50a69bb466a793cdf87e382efb520254c333f8e135458edc943b3466fe70dc5fb3022e38315f314af8283c8dd4f3b0ce847ac8a8e32ae
+EBUILD scummvm-1.5.0.ebuild 2188 SHA256 2f4694f1e6292ba31160189c6f1d69766481740ca2c54fe514ca6f94a6188591 SHA512 aeb48f2800922e013536f804112c78b44516a0a84b5baa0aefa302825192afea190478a7e1bd48663e82d935dff52efe708318f06be74bcf61a341ab7c9a8111 WHIRLPOOL 78338511a5f9cd52536cc63d9f09ec5839ae19e56d7c70da0c0d3f309dbd04337921b61c2cb3d9293dc2bd26afb6e8f324ab439e953fb7daa12b51c3567bc738
+MISC ChangeLog 17041 SHA256 82bdf24cff6d30097c685ee8e0b457bb78706380b3b50f5757dd4b03e3862bee SHA512 9346fa057af6cd7543d99a4e6dfaf5b949d04fffcd5b35ba66d06e6a4402a54cfdf4a70302f9c85b44fc7ef42cad46ac7b224b79bca4d70a5921c7d8c3aea08c WHIRLPOOL de6c01b783236042898ad275f0c72ca1523585b5483f3d05b4225e1a8300443cc933b5ed86a853fe91393122ef26b863fbb7b0004d1c7406447ded6b1aa8fc59
 MISC metadata.xml 248 SHA256 d07430a4c6da117a018a33c479a43b812752dc8658311ae2559ef1d9f3654385 SHA512 885fed160e07766ec25cf114d44e527369eba89f8afe3648433afde2e16d03c28212517db5990349ed4fce913a451d767302d2b93a599c201772b12ec68d2e4d WHIRLPOOL 602286655cf79ba290053b7b096f1c60609e524403f296fa9db433bf3259366ec4685f1ba9b894226a820b78901c3570d462d69ca84d0f7c85e56a353ce295c6
diff --git a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
new file mode 100644
index 000000000000..47332df16dee
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
@@ -0,0 +1,33 @@
+diff -ru scummvm-1.5.0.orig/config.guess scummvm-1.5.0/config.guess
+--- scummvm-1.5.0.orig/config.guess	2012-05-31 06:39:11.000000000 -0400
++++ scummvm-1.5.0/config.guess	2012-10-07 21:27:00.510982188 -0400
+@@ -855,7 +855,7 @@
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[:upper:]' '[:lower:]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+@@ -955,7 +955,7 @@
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	case `grep '^cpu[^[:lower:]]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ 	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+diff -ru scummvm-1.5.0.orig/configure scummvm-1.5.0/configure
+--- scummvm-1.5.0.orig/configure	2012-10-07 21:21:27.856337073 -0400
++++ scummvm-1.5.0/configure	2012-10-07 21:26:08.689750153 -0400
+@@ -3897,7 +3897,7 @@
+ 	fi
+ 
+ 	# Save the settings
+-	defname="ENABLE_`echo $engine | tr '[a-z]' '[A-Z]'`"
++	defname="ENABLE_`echo $engine | tr '[:lower:]' '[:upper:]'`"
+ 	if test "$isbuilt" = "no" ; then
+ 		add_line_to_config_mk "# $defname"
+ 	else
diff --git a/games-engines/scummvm/scummvm-1.5.0.ebuild b/games-engines/scummvm/scummvm-1.5.0.ebuild
index 8f55453122a5..c3799aa811a8 100644
--- a/games-engines/scummvm/scummvm-1.5.0.ebuild
+++ b/games-engines/scummvm/scummvm-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.5.0.ebuild,v 1.4 2012/09/08 16:03:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.5.0.ebuild,v 1.5 2012/10/09 23:55:28 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth truetype mp3 vorbis"
+IUSE="aac alsa debug flac fluidsynth mp3 opengl truetype vorbis"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND=">=media-libs/libsdl-1.2.2[audio,joystick,video]
@@ -22,6 +22,7 @@ RDEPEND=">=media-libs/libsdl-1.2.2[audio,joystick,video]
 	alsa? ( media-libs/alsa-lib )
 	mp3? ( media-libs/libmad )
 	flac? ( media-libs/flac )
+	opengl? ( virtual/opengl )
 	truetype? ( media-libs/freetype:2 )
 	fluidsynth? ( media-sound/fluidsynth )"
 DEPEND="${RDEPEND}
@@ -39,6 +40,7 @@ src_prepare() {
 		-e '/INSTALL.*\/pixmaps/d' \
 		-e 's/-s //' \
 		ports.mk || die
+	epatch "${FILESDIR}"/${P}-EE.patch
 }
 
 src_configure() {
@@ -64,6 +66,7 @@ src_configure() {
 		$(use_enable alsa) \
 		$(use_enable mp3 mad) \
 		$(use_enable flac) \
+		$(use_enable opengl) \
 		$(use_enable vorbis) \
 		$(use_enable truetype freetype2) \
 		$(use_enable x86 nasm) \