fix more NLS issues

2 files changed, 50 insertions, 27 deletions

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 17e034b01d74..ffc27dc083ac 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX binutils-configure-LANG.patch 1716 RMD160 9dca1dd809125eded48d2ea9286afa85f3eafe87 SHA1 8117fb51c6275c75be6644b9953df56650bd6bf1 SHA256 4292545f697ceb57342a51b10a2d20b65880e8d7637d0f29f394ca54b9ff7214
-MD5 75394239baa4250b17624ef67887ecc4 files/binutils-configure-LANG.patch 1716
-RMD160 9dca1dd809125eded48d2ea9286afa85f3eafe87 files/binutils-configure-LANG.patch 1716
-SHA256 4292545f697ceb57342a51b10a2d20b65880e8d7637d0f29f394ca54b9ff7214 files/binutils-configure-LANG.patch 1716
+AUX binutils-configure-LANG.patch 2082 RMD160 ac49fd3d0053d1a330e810a1f02c80f6f8fe5e8e SHA1 452e586e1a6ca5885420f947df46004a91d4aecd SHA256 316f75980bfcccc306bd466d72d0e20a0ac327b8b7642fa2e3cf8d95d65f24d6
+MD5 a18bff5d18e042d6873644aa515efca9 files/binutils-configure-LANG.patch 2082
+RMD160 ac49fd3d0053d1a330e810a1f02c80f6f8fe5e8e files/binutils-configure-LANG.patch 2082
+SHA256 316f75980bfcccc306bd466d72d0e20a0ac327b8b7642fa2e3cf8d95d65f24d6 files/binutils-configure-LANG.patch 2082
 DIST binutils-2.14-patches-1.0.tar.bz2 80411 RMD160 140be317606707c6e15fd2d2f8f658bcaddd6dfa SHA256 4b49ba540af4f3a306a2969843d40fec46718d3403c5c3f691d51c28119386ce
 DIST binutils-2.14.90.0.8-patches-1.6.tar.bz2 40158 RMD160 ff5d372687fdc886227b9e86e6e0b1d294992c1b SHA256 d0d955a1e1ca135f4e8e3c4fdb853b4ee584a2ff15c572e3eca35ac584bdf70f
 DIST binutils-2.14.90.0.8-uclibc-patches-1.1.tar.bz2 5792 RMD160 4623c22c248f642e1b7d6e524db9a3a0ddb04dd1 SHA256 7ee1aa22c3045e87e5619af05d44c96ca9001eae03eb8ec474bde5043e2995b4
@@ -65,6 +62,9 @@ DIST binutils-2.16.92.tar.bz2 13694634 RMD160 6c845d13996bb8417470686af4145cd31f
 DIST binutils-2.16.93-patches-1.0.tar.bz2 7881 RMD160 cb55c6980d64507c98b1368b8053c1894699af04 SHA256 1e1b458d5a86321f6c7a877bbc8be6fd90dbe594da46168cb74d79f791d4d9fd
 DIST binutils-2.16.93-uclibc-patches-1.0.tar.bz2 1571 RMD160 8fb2a71931a138439325f9d9adde855df493ad50 SHA256 97c6397d0e310f211be3d05113239ab338e0f3f36ba005c59ccb3c7c7985b70d
 DIST binutils-2.16.93.tar.bz2 13716872 RMD160 5e68dfeddcdc8399d72096002fb14bc7404cbf65 SHA256 6fba24ae14a48768544761cfaea6b9284b23d6442a035a6eda3a1505337b2fdb
+DIST binutils-2.16.94-patches-1.0.tar.bz2 7906 RMD160 17073219c9aa440c690d21e1e99b1335a218830b SHA1 1c36985f72f78439dac141e0c6471161c8521fd4 SHA256 05a49ba93c84cb6ba599b1e81b6b0ca660fcf7ca45dcf570eb1dedb085c2b3f6
+DIST binutils-2.16.94-uclibc-patches-1.0.tar.bz2 1575 RMD160 ba835316824b83ab5e43a158f702001f9de57e04 SHA1 369e22569464797e5c1eb50b8c8cef3e903f5e57 SHA256 b281aabc6d3f7f81f6145d00dab74792502749799cf1337ca1ee4e7425756b87
+DIST binutils-2.16.94.tar.bz2 13814217 RMD160 9aca7438a0c42f2b6616b79ac776bbfe4a1cda8b SHA1 b1be8f84837c66d277c852bfc1f1fe097e19eb88 SHA256 50736a6a66608e5f47646fca92beabba8597d29e62d101500a4f0178ce2ec20c
 DIST binutils-2.16.tar.bz2 12514443 RMD160 6b465e752a7cd117a69bcba1f56260beb47f41f7 SHA256 5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
 DIST binutils-2.17.50.0.2-patches-1.0.tar.bz2 8399 RMD160 cf13c47ffeb584e97c520e0e0b8f9b2c6acbf9b4 SHA256 be145827f8152539816e0b936c1d49e1eb18938879cc89a8d02ffb25589e2e48
 DIST binutils-2.17.50.0.2-uclibc-patches-1.0.tar.bz2 1571 RMD160 7e44b28ded37af9038b63b374cb1cd159c874246 SHA256 99d8d953d0039999c26bec6fe84df18d9b226d6b3e9c0e8297afd467e877f912
@@ -157,14 +157,18 @@ EBUILD binutils-2.16.93.ebuild 589 RMD160 1078ae0e7716e56d02bfb58d809ddcf5980ab6
 MD5 e2503a6f0aa2a87daa08afd5193e8932 binutils-2.16.93.ebuild 589
 RMD160 1078ae0e7716e56d02bfb58d809ddcf5980ab67f binutils-2.16.93.ebuild 589
 SHA256 8801d90239ef261b248300d64f54eee8f3b5204d987337eea57d5eedd42f1f26 binutils-2.16.93.ebuild 589
+EBUILD binutils-2.16.94.ebuild 589 RMD160 66a06d7b008af2c8670c4889c8de1dc446b3482c SHA1 771145ace166597734fc11c8951f4aca110667c2 SHA256 3f1e973acd4cffdfc439f7620ffc63557c50de8b3eeda40b3acad45651e57e03
+MD5 2124c50a55762ecd5d3b3f8e557e78fa binutils-2.16.94.ebuild 589
+RMD160 66a06d7b008af2c8670c4889c8de1dc446b3482c binutils-2.16.94.ebuild 589
+SHA256 3f1e973acd4cffdfc439f7620ffc63557c50de8b3eeda40b3acad45651e57e03 binutils-2.16.94.ebuild 589
 EBUILD binutils-2.17.50.0.2.ebuild 364 RMD160 d748ef9d22490f27bde17b2a976e1ac6342442c4 SHA1 dc57496b949f4e852d7c955e47b0cbb3e5cce5be SHA256 ca37a7bfa191b055b334b7c82f84ec51ca55cc2e582202498edb1c26a648e594
 MD5 b2fd176d12c21c30ef26d451bb91bd3a binutils-2.17.50.0.2.ebuild 364
 RMD160 d748ef9d22490f27bde17b2a976e1ac6342442c4 binutils-2.17.50.0.2.ebuild 364
 SHA256 ca37a7bfa191b055b334b7c82f84ec51ca55cc2e582202498edb1c26a648e594 binutils-2.17.50.0.2.ebuild 364
-MISC ChangeLog 48941 RMD160 11ffac8423d57ecd07d1c1a86922ce7e9b42005b SHA1 450f059de59aa9e94811cfd2a72c898292882f1b SHA256 7fc5bf669a3ee9825e2b99f86009d335264d438c715e02fe678811bc511477e4
-MD5 a2300142531e6c369e780007fd6b3f3c ChangeLog 48941
-RMD160 11ffac8423d57ecd07d1c1a86922ce7e9b42005b ChangeLog 48941
-SHA256 7fc5bf669a3ee9825e2b99f86009d335264d438c715e02fe678811bc511477e4 ChangeLog 48941
+MISC ChangeLog 49091 RMD160 6c139b16aa4be529ab3e6514ba41927cf41ca511 SHA1 d305968b8ccecaa35fcdf8601bc926b062cb5f91 SHA256 d3d5523a8e86d8c004b95b4aa6b571b8403f0bbbe712d0f6d35564e0db071a22
+MD5 09fbb3ab5aa9660ee1a718a2c322809b ChangeLog 49091
+RMD160 6c139b16aa4be529ab3e6514ba41927cf41ca511 ChangeLog 49091
+SHA256 d3d5523a8e86d8c004b95b4aa6b571b8403f0bbbe712d0f6d35564e0db071a22 ChangeLog 49091
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -235,13 +239,9 @@ SHA256 4f3907807bc94895a0083c1a71653e9bf63edd05ba091b3a913dc71c009c87f2 files/di
 MD5 5072e3f225dc4b632a0bd15995b88764 files/digest-binutils-2.16.93 846
 RMD160 57059806f12a4955795909d41e9e30ad0f78e445 files/digest-binutils-2.16.93 846
 SHA256 98887c84d03fe085b4270e44033c2e12d24e601bd884913dfa15983106de40f5 files/digest-binutils-2.16.93 846
+MD5 731d0dcd4799117e8c14fe1390e0ee34 files/digest-binutils-2.16.94 846
+RMD160 b33fd226e61c2f999ff017e8a94137aa8ac64ca8 files/digest-binutils-2.16.94 846
+SHA256 802f01a378a8b53c97849129b620c6088b541979ae8150e8fe7c99ffe22b7e4f files/digest-binutils-2.16.94 846
 MD5 c8c128725907a128b4299b3b758c65d6 files/digest-binutils-2.17.50.0.2 882
 RMD160 5b6f8abe107afc189a7f81febe15906cc0b85260 files/digest-binutils-2.17.50.0.2 882
 SHA256 3fd3bf0294d992abe0640f2c36608d3c26da2e1059824a29848688ceaf4518f3 files/digest-binutils-2.17.50.0.2 882
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEiroF2+ySkm8kpY0RAiwXAKCPE746f+zFjId2XzEdUA9SI+f78QCgpvsW
-854Y+3EWzSgBRDvdNq5l+ZY=
-=Hpgv
------END PGP SIGNATURE-----
diff --git a/sys-devel/binutils/files/binutils-configure-LANG.patch b/sys-devel/binutils/files/binutils-configure-LANG.patch
index 8ef31d096206..5521d196cf4a 100644
--- a/sys-devel/binutils/files/binutils-configure-LANG.patch
+++ b/sys-devel/binutils/files/binutils-configure-LANG.patch
@@ -6,19 +6,22 @@ http://bugs.gentoo.org/122216
 
 --- configure
 +++ configure
-@@ -54,6 +54,16 @@
+@@ -54,6 +54,19 @@
  infodir='${prefix}/info'
  mandir='${prefix}/man'
  
 +# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    unset $as_var
++  fi
++done
 +
  # Initialize some other variables.
  subdirs=
@@ -40,3 +43,23 @@ http://bugs.gentoo.org/122216
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
  rm -rf conftest* confdefs.h
  # AIX cpp loses on an empty file, so make sure it contains at least a newline.
+@@ -1850,6 +1850,19 @@
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in ./config.log if it exists.
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
++    eval \$as_var=C; export \$as_var
++  else
++    unset \$as_var
++  fi
++done
++
+ ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+ for ac_option
+ do