Grab fix from upstream for building in non-english locales #149147 by Ronny Peine.

(Portage version: 2.1.2_rc1-r2)

3 files changed, 69 insertions, 3 deletions

diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog
index 075ed8592e1c..ccf12f11ac22 100644
--- a/sys-devel/make/ChangeLog
+++ b/sys-devel/make/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/make
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.58 2006/10/17 09:35:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.59 2006/11/05 12:12:43 vapier Exp $
+
+  05 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/make-3.81-tests-lang.patch, make-3.81.ebuild:
+  Grab fix from upstream for building in non-english locales #149147 by Ronny
+  Peine.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> make-3.81.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/sys-devel/make/files/make-3.81-tests-lang.patch b/sys-devel/make/files/make-3.81-tests-lang.patch
new file mode 100644
index 000000000000..f4e514712a0e
--- /dev/null
+++ b/sys-devel/make/files/make-3.81-tests-lang.patch
@@ -0,0 +1,55 @@
+Fix from upstream for running tests when LC_ALL is set to non-C
+
+http://bugs.gentoo.org/149147
+
+Index: make/tests/run_make_tests.pl
+===================================================================
+RCS file: /cvsroot/make/make/tests/run_make_tests.pl,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -p -r1.22 -r1.23
+--- make/tests/run_make_tests.pl	8 Mar 2006 20:15:09 -0000	1.22
++++ make/tests/run_make_tests.pl	1 Oct 2006 05:38:38 -0000	1.23
+@@ -228,11 +228,6 @@ sub set_more_defaults
+    local($string);
+    local($index);
+ 
+-   # Make sure we're in the C locale for those systems that support it,
+-   # so sorting, etc. is predictable.
+-   #
+-   $ENV{LANG} = 'C';
+-
+    # find the type of the port.  We do this up front to have a single
+    # point of change if it needs to be tweaked.
+    #
+Index: make/tests/test_driver.pl
+===================================================================
+RCS file: /cvsroot/make/make/tests/test_driver.pl,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -p -r1.19 -r1.20
+--- make/tests/test_driver.pl	10 Mar 2006 02:20:45 -0000	1.19
++++ make/tests/test_driver.pl	1 Oct 2006 05:38:38 -0000	1.20
+@@ -78,9 +78,9 @@ sub resetENV
+ sub toplevel
+ {
+   # Pull in benign variables from the user's environment
+-  #
++
+   foreach (# UNIX-specific things
+-           'TZ', 'LANG', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH',
++           'TZ', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH',
+            # Purify things
+            'PURIFYOPTIONS',
+            # Windows NT-specific stuff
+@@ -92,6 +92,10 @@ sub toplevel
+     $makeENV{$_} = $ENV{$_} if $ENV{$_};
+   }
+ 
++  # Make sure our compares are not foiled by locale differences
++
++  $makeENV{LC_ALL} = 'C';
++
+   # Replace the environment with the new one
+   #
+   %origENV = %ENV;
diff --git a/sys-devel/make/make-3.81.ebuild b/sys-devel/make/make-3.81.ebuild
index 09a8e1641d19..8466ab32eb4c 100644
--- a/sys-devel/make/make-3.81.ebuild
+++ b/sys-devel/make/make-3.81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.11 2006/10/17 09:35:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.12 2006/11/05 12:12:43 vapier Exp $
 
 inherit flag-o-matic
 
@@ -10,12 +10,18 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="nls static"
 
 DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="nls? ( virtual/libintl )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-tests-lang.patch
+}
+
 src_compile() {
 	use static && append-ldflags -static
 	econf \