comply with upstream patch

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 46 insertions, 53 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 032fb7c04374..c50412e4f3fb 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.126 2013/01/31 15:25:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.127 2013/02/02 22:57:26 hasufell Exp $
+
+  02 Feb 2013; Julian Ospald <hasufell@gentoo.org>
+  files/scummvm-1.5.0-EE.patch:
+  comply with upstream patch
 
   31 Jan 2013; Julian Ospald <hasufell@gentoo.org>
   files/scummvm-1.5.0-EE.patch:
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index e1467ebb7057..2356938518ee 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX scummvm-1.5.0-EE.patch 1998 SHA256 07ba73fab1d8c2d22e709c2e9fd36068fa091d78e5c2921f74e367afbe23badb SHA512 0c0885ab421f0b01dc8534c5ba3c813717c1cf74e54e4c310398e0c6508071022a9eb3e54366cf06d7af1cf9b08c89a7b96bee3739564c0b02bb7ad48607f6d4 WHIRLPOOL d45cc65b46b69d8237e9993e1ea9f778d3ada8643ce69a852814fd1c0b1924bf32b81754a2dbe824c30475856b193a803628036c74a95d338a101d07063d425f
+AUX scummvm-1.5.0-EE.patch 832 SHA256 b746130cd871e9fe9388fff8d68912abb3f98dbe1b660654975dc1d257a6eb7c SHA512 326bc5bce6c6d9ecb917063057a48ed2c4f031687fb0f69affeed0adc817e30d65de14aac3bddca6f81133dcbf9fe377e840ced65619dc0412a2b57869dcfb3d WHIRLPOOL 05b1adccbc0df70a3934eaf0962f478b8a643effc9a01d525c6e2b6ffb398577048b56e3dd453e4d18b3a04b1b20d94a18ec111fd8052de4860c01e009ca49f8
 DIST scummvm-1.5.0.tar.bz2 17455085 SHA256 81831cd878a8daad2976f65c92139a2102233082c7d2770579d7e425b19cea2e SHA512 a4ae0965fec7e065a46ee1a8a49897eb2fecaf7851590b5696d866a5f224d0491937f63e9e2e8ba797c7d9b8d7ff45fbaf12b4f17c3ddec0f9973a6a915ee1c5 WHIRLPOOL dd8842edc41de693043db5c5005670b37583cdd97a9124575b4f725e5c6a3cf16f4670624e32578936085829c8627caa07a49902d643103386ca633fe23d2c14
 EBUILD scummvm-1.5.0.ebuild 2264 SHA256 5c7de6c57172275dcf6d4e5fa2ea5821f13063417ef26aaf8425dba24f26c85b SHA512 97f890687a4b3f274d8f3958204964419841fd63a2d82dc74bc2ad4cb5510ba5ec350c6e8501a075614e9ad219afe840e3868cc928ea0071628aed74dbd563ed WHIRLPOOL 96853d62fe42b0baa54c996972125d78d979d7ae79ef1a576de9eec777f7c5fbd5a6a3c93bcbbff8bd7429ed0de0334b4fadda46825c94c15e7bc9cdd1147c36
-MISC ChangeLog 17884 SHA256 19d9ce4bcbbcad9aeaba0baa48063801d3dbc8c393817a4757187063072dedf5 SHA512 58eb42ba0bc155b0cd30999f4c7b06938e19aa6c3d28b03f3902c9b62f66c94ad6fcba9897fdd2261ecc7cdeff1aa0a503ff7b89a5fa3f0079209e3183390f30 WHIRLPOOL 7ee41682e50161674be5c1211da4a3bc95c73a3c78d760b646208af5101ad3e4f971563efa24fa40251399275fc8d3ddc9380eabaf39bc4dbcdf8caba2da314f
+MISC ChangeLog 17997 SHA256 c46b5c2fc3888f2773ef1a1d755296cc50ba5f5102537eb9dea16833bc0d9e82 SHA512 498279e7e2eebcb628ee371d074c85e8920f171a01cd3b1a9d5881aa35353a236f3869f822c68ddc0751f8a1b7606c2744e4996b238588442b88b8e77ff5935f WHIRLPOOL 51dd7579d3c59fbe09b387f82f2d114fe5d61c3f9c48a5cfcf86e88bcb28a32ab631ebf88baa922a2efb5e7ec51c12ee437d93e4fe6432763b6692cc7ea128d6
 MISC metadata.xml 248 SHA256 d07430a4c6da117a018a33c479a43b812752dc8658311ae2559ef1d9f3654385 SHA512 885fed160e07766ec25cf114d44e527369eba89f8afe3648433afde2e16d03c28212517db5990349ed4fce913a451d767302d2b93a599c201772b12ec68d2e4d WHIRLPOOL 602286655cf79ba290053b7b096f1c60609e524403f296fa9db433bf3259366ec4685f1ba9b894226a820b78901c3570d462d69ca84d0f7c85e56a353ce295c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRCozkAAoJEFpvPKfnPDWz/K0H/1n4mNZIRMXXySxgJTU/Kbp0
-SgNDjK9XMVbvNbG8Y0LEpWzWVvDWPf4IIxI+8Q4UeY9iu/rW6ddSlSzSOti4fWdP
-Jw6doZZEwBWoYtLzuTV4GtxdI+367ayJhWXNnwPRR2SRBAycGhVrM3IQFyvk2eEl
-3bxCAa+rjXxjpAZDUZUMoWDC3ZIcGMe33Y4OO+RDv52yyLBKFegAS6eegjTcU6T9
-MWc5cTyIdVX3SEVm25SOTYLdGb46bCFzPKzpq2Hmy0zk5V7oPMtMfNAVuhb2nMP4
-cmQV8if/a3Wwvf5ukrpYz92yR1PnwVoAdlOm8PVIhBCaBt2jrDk6TuKPUGXyQSM=
-=tVdP
+iQEcBAEBCAAGBQJRDZnZAAoJEFpvPKfnPDWzdEUIALCFPGijKkzrWfH5Prnz3+9X
+A47CCs5Vb1eyrkJKPW5atbTD6CfmzJZ8LnIWJgjYGojUrBmgDuYyRS6M1bFYLXjA
+KoD0r74WWiPi064gMWEuhjJRPovi8VR+HBa/D+hF/SMSSsjn+vc5C3fguPNAFCEf
+HnUp6SwNizQbL2C5ki/iyc2ot5a7SgnfrIbDZ/E9rh9qrJW3eA2IeTGZY0PFon4y
+9h1BMxJmL4DOuCMVZ7HF7YvKQVnqzFyLF/SKST2fiMny7n07YazJC2SlF7kRs0dv
+2ALqXSBvGKgmBvyAF5ZIpsFjCYabsdiCo3kOiayP1UmPws6sphM/ldML3zeHaQ8=
+=E60A
 -----END PGP SIGNATURE-----
diff --git a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
index 7c4605196ca4..376fb0994abb 100644
--- a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
+++ b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
@@ -1,44 +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
-@@ -3464,8 +3464,8 @@
- 	if test -z "$_freetypeconfig"; then
- 		_freetype2=no
- 	else
--		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
--		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
-+		FREETYPE2_LIBS=`pkg-config --libs freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --libs`
-+		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --cflags`
+From b65365e0d314bff91f5fb3c4fbdd3da7944ea7a2 Mon Sep 17 00:00:00 2001
+From: hasufell <julian.ospald@googlemail.com>
+Date: Fri, 1 Feb 2013 19:31:15 +0100
+Subject: [PATCH] CONFIGURE: Fix build under et_EE locale
+
+Freetype-config reports a broken include dir
+when et_EE locale is used. We set LC_ALL
+and LANGUAGE to "C" explicitly like autoconf
+does to force consistent behavior.
+---
+ configure |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure b/configure
+index 91364eb..3b8b845 100755
+--- a/configure
++++ b/configure
+@@ -21,6 +21,12 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
  
- 		if test "$_freetype2" = "auto"; then
- 			_freetype2=no
-@@ -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
++# NLS nuisances.
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
+ # Save the current environment variables for next runs
+ SAVED_CONFIGFLAGS=$@
+ SAVED_LDFLAGS=$LDFLAGS
+-- 
+1.7.10
+