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

Package-Manager: portage-2.1.2_rc1-r2

4 files changed, 91 insertions, 11 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/Manifest b/sys-devel/make/Manifest
index 5a949c8f12f9..faed6883abda 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.80-memory.patch 2248 RMD160 3c8d5c017c61061eb4d6f666799d377f1ba272ca SHA1 9e3f3d9c9fa7911dff14adbe46080e1326cf05f2 SHA256 0fa6d8b039fd56313626a3865cde7ef09622525a751ec55bf3741a6fc172091f
 MD5 3adc1d9cc832e98b435305f9f466279b files/3.80-memory.patch 2248
 RMD160 3c8d5c017c61061eb4d6f666799d377f1ba272ca files/3.80-memory.patch 2248
@@ -10,20 +13,24 @@ AUX make-3.80-parallel-build-failure.patch 2210 RMD160 5c7fe016fc854b017315bf22c
 MD5 85ce0c4d36cd02b0c1abae84c022dba3 files/make-3.80-parallel-build-failure.patch 2210
 RMD160 5c7fe016fc854b017315bf22c6ddc1c600d4b99a files/make-3.80-parallel-build-failure.patch 2210
 SHA256 71f80dee56a04f30f2fe8bb9012d32ed830d2e0e9f68c183819c5ccf025c9b62 files/make-3.80-parallel-build-failure.patch 2210
+AUX make-3.81-tests-lang.patch 1788 RMD160 c62f231b9bb5fef003e91f9a48b76832bd75b72d SHA1 2d77b19cafa2a24a840af3b7418399b7ee696ee2 SHA256 0d2f6b061ed2b09babbb851d1bcebcd20bc2331c799d469bfefa2a985774e486
+MD5 b6446be539a0e20cb4ada05813c0a2c4 files/make-3.81-tests-lang.patch 1788
+RMD160 c62f231b9bb5fef003e91f9a48b76832bd75b72d files/make-3.81-tests-lang.patch 1788
+SHA256 0d2f6b061ed2b09babbb851d1bcebcd20bc2331c799d469bfefa2a985774e486 files/make-3.81-tests-lang.patch 1788
 DIST make-3.80.tar.bz2 920645 RMD160 dcb61f3913d4d43caeef5b597ba2d4e1a03701aa SHA1 d2085842f08e57d58d3e1cd75a5f0342a60e5f45 SHA256 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b
 DIST make-3.81.tar.bz2 1151445 RMD160 79d418e1258ec0d6ba08b1431a4ade3fec54c2b2 SHA1 41ed86d941b9c8025aee45db56c0283169dcab3d SHA256 f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8
 EBUILD make-3.80-r4.ebuild 1306 RMD160 734c64c51dc0e3897bbbc257c0bb5aa3e3c98148 SHA1 e26dc0861f8859b665c99dc525cbc8b09a4e24b9 SHA256 b69e7918e6623c50bede953f55d5dae3f4238c2e441f6b3c68179263ad9e012f
 MD5 1090ec6e2d5c1ff633d4a11204d80ddd make-3.80-r4.ebuild 1306
 RMD160 734c64c51dc0e3897bbbc257c0bb5aa3e3c98148 make-3.80-r4.ebuild 1306
 SHA256 b69e7918e6623c50bede953f55d5dae3f4238c2e441f6b3c68179263ad9e012f make-3.80-r4.ebuild 1306
-EBUILD make-3.81.ebuild 1050 RMD160 e1622d5bcb3fcb0948d9b1c7b66f254e9914fd79 SHA1 61ff1386a152eb0bb9b8e990c5ea338f4bbd2bf5 SHA256 35a249bcae05d62eefc7589d7aedf33c67dda7f2dd6315cdab83e095626e2dd3
-MD5 4f42e2b84315d9a6053692acb967e625 make-3.81.ebuild 1050
-RMD160 e1622d5bcb3fcb0948d9b1c7b66f254e9914fd79 make-3.81.ebuild 1050
-SHA256 35a249bcae05d62eefc7589d7aedf33c67dda7f2dd6315cdab83e095626e2dd3 make-3.81.ebuild 1050
-MISC ChangeLog 6789 RMD160 262c19cba051cb07997060769ea93472987f58a3 SHA1 765e523180549f3affa46903b7a901ce70f3233a SHA256 55c36327c5dc10c40f5dc17cc1b9261ff8ab9e415f2235ba44ce6d59fa2953e3
-MD5 52cffb03ab3e28d4dc910a03ccd68cd9 ChangeLog 6789
-RMD160 262c19cba051cb07997060769ea93472987f58a3 ChangeLog 6789
-SHA256 55c36327c5dc10c40f5dc17cc1b9261ff8ab9e415f2235ba44ce6d59fa2953e3 ChangeLog 6789
+EBUILD make-3.81.ebuild 1133 RMD160 a5cf18ae230a725e77203aae0ad7726660e09169 SHA1 890e69eab66d37ed02a1f5cf449ce47ca45c9654 SHA256 8095f9332a1502253373413aa1a0e65d691df092677d0829bbb0689792dcdc76
+MD5 4eca9aaf2f5d3e768d51ecbb82c40175 make-3.81.ebuild 1133
+RMD160 a5cf18ae230a725e77203aae0ad7726660e09169 make-3.81.ebuild 1133
+SHA256 8095f9332a1502253373413aa1a0e65d691df092677d0829bbb0689792dcdc76 make-3.81.ebuild 1133
+MISC ChangeLog 6980 RMD160 0ff8a141d44ef635f54660a911ddc5be9fe390db SHA1 60c15e732499fdce5bee52ba32e3a981ac1861a4 SHA256 06e84764929bb32ceb445292a64b75a8a26f35ce7a03d1eca85ee1c6a5482168
+MD5 ffcde5b1f51a8c08efd3fe504b91587e ChangeLog 6980
+RMD160 0ff8a141d44ef635f54660a911ddc5be9fe390db ChangeLog 6980
+SHA256 06e84764929bb32ceb445292a64b75a8a26f35ce7a03d1eca85ee1c6a5482168 ChangeLog 6980
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -34,3 +41,10 @@ SHA256 247c42f8eca1858b74c98f5467cfb9989fad89f1f54c9abfb0d98fe68cc35905 files/di
 MD5 483620bd1ab070a522fe552aecfbbc26 files/digest-make-3.81 235
 RMD160 63bd366d26100c696cc0ea7c294601c47323c343 files/digest-make-3.81 235
 SHA256 94785d839db34c6e90f115ea3efc13c9347d0e27aa0625f7246075cc3f7a216a files/digest-make-3.81 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTdVbamhnQswr0vIRAs5XAJ9bjug5B/3zl0QLGkxjMMQw9GQQNQCeLc71
+GcEyE5SGZDN/BFWQyElXP80=
+=iHuL
+-----END PGP SIGNATURE-----
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 \