Fix nls breakage #120133 by J.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 113 insertions, 13 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 9663b2e60a6c..54cffa664161 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.61 2006/01/18 20:15:30 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.62 2006/02/03 01:33:00 vapier Exp $
+
+  03 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/tcl-configure-LANG.patch, tcl-8.4.9.ebuild, tcl-8.4.11.ebuild,
+  tcl-8.4.11-r1.ebuild:
+  Fix nls breakage #120133 by J.
 
   18 Jan 2006; Simon Stelling <blubb@gentoo.org> tcl-8.4.11-r1.ebuild:
   add missing multilib inherit
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index b3d4dcca22d3..855b348bc7ac 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,26 +1,61 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f3682a77dee3083e7581012f160b6109 ChangeLog 7627
+MD5 f23cd2a0d98557eddfdb6a2601ca59af ChangeLog 7808
+RMD160 b2c938cc244304637c8296d86cf7f78caae0d477 ChangeLog 7808
+SHA256 de25b97c192f27ce280ada08e76005949afccf2e08f12642eec78ed7f497155a ChangeLog 7808
 MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
+RMD160 d7783bf855c30ab4f8c859a2f0861a0795378793 files/digest-tcl-8.3.4 61
+SHA256 9f8cf5e079fa774f1993eaa0ab6f1b4ed31ede521b692b99027c565f6cf60590 files/digest-tcl-8.3.4 61
 MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11 66
+RMD160 89fc4fb50ef8dd6df9ccea029f542931908dd155 files/digest-tcl-8.4.11 66
+SHA256 21fa5e904491d3c992de7084b6a075b60442d634c040fc9fba9224ec4ba4f2e7 files/digest-tcl-8.4.11 66
 MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11-r1 66
+RMD160 89fc4fb50ef8dd6df9ccea029f542931908dd155 files/digest-tcl-8.4.11-r1 66
+SHA256 21fa5e904491d3c992de7084b6a075b60442d634c040fc9fba9224ec4ba4f2e7 files/digest-tcl-8.4.11-r1 66
 MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
+RMD160 1cc3081ea9010e2ab7c84aa77cdd387f8caa6518 files/digest-tcl-8.4.6 65
+SHA256 0f993bf0d429042fac9afd4c7fcc22f078719d3cf173190e8e928b4515afabfd files/digest-tcl-8.4.6 65
 MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
+RMD160 1cc3081ea9010e2ab7c84aa77cdd387f8caa6518 files/digest-tcl-8.4.6-r1 65
+SHA256 0f993bf0d429042fac9afd4c7fcc22f078719d3cf173190e8e928b4515afabfd files/digest-tcl-8.4.6-r1 65
 MD5 9c5852717da8c531e22dda3dd4ade696 files/digest-tcl-8.4.9 65
+RMD160 25ec977a6ad20137a8ad5ac5b24f77a07c2bdee5 files/digest-tcl-8.4.9 65
+SHA256 a2f0a01e224bdb5c6313edc2a349c3133d9f43e4f5fa8a02ca7e1450360c959e files/digest-tcl-8.4.9 65
 MD5 23a4b408a4ea393df1da149ed8cb4d4c files/tcl-8.4.11-multilib.patch 1808
+RMD160 fb26bcbc63a3fb79dc2793af35f64b4dc189fe24 files/tcl-8.4.11-multilib.patch 1808
+SHA256 4925265d9fc72077d94ac23420671a4a0403cb0bad1be1dcc5d945e7bef5629a files/tcl-8.4.11-multilib.patch 1808
 MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
+RMD160 c30e4d1258672d401f6ec501102294e32519e6f0 files/tcl-8.4.6-multilib.patch 1070
+SHA256 6d7bc5c416ccff91cd1e05a4d154c5864b3bf23b04dc45a308964eb477ad7778 files/tcl-8.4.6-multilib.patch 1070
+MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/tcl-configure-LANG.patch 1686
+RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/tcl-configure-LANG.patch 1686
+SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/tcl-configure-LANG.patch 1686
 MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
+RMD160 6318855997b3e957f4ad5c59677534993e352c34 metadata.xml 264
+SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee metadata.xml 264
 MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
-MD5 f41a969078d7210a013a3accd2fe4fbd tcl-8.4.11-r1.ebuild 3339
-MD5 69d01ea195cf8047c70a0d4d9e5521dd tcl-8.4.11.ebuild 3246
+RMD160 bca3c45ffb215855bd996ce009b58435a26e9b4c tcl-8.3.4.ebuild 2537
+SHA256 c471e2d1fcf06f7ba2f20a5d8a4bfbdd5811cf3cb0b74ab31b1d3f21b0029a41 tcl-8.3.4.ebuild 2537
+MD5 0b8378f196b89bb5d3fce63d5dd6b21e tcl-8.4.11-r1.ebuild 3503
+RMD160 1125cacfafa81770a9e94f9eb8adcc462cc8e5f3 tcl-8.4.11-r1.ebuild 3503
+SHA256 be667217d3a027f3655a32a1b151900546073918c679ba981c1295bc82e922ee tcl-8.4.11-r1.ebuild 3503
+MD5 57dee0c0856ba4776eaa46c4f14168d3 tcl-8.4.11.ebuild 3408
+RMD160 3e5a0a7861a07d955489755b2b1462f09a473470 tcl-8.4.11.ebuild 3408
+SHA256 82f9c9d172306f6f88a1a9c20643b3bcb61c93a51130623482fc533a545e906b tcl-8.4.11.ebuild 3408
 MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
+RMD160 691e65f670e0a1a685ec1538a9d14caa2ee098e8 tcl-8.4.6-r1.ebuild 3329
+SHA256 852fff6c88807c9489fe23dfd671b9219870ba961125c190ccd12c332199a589 tcl-8.4.6-r1.ebuild 3329
 MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
-MD5 eec3607c728a5f0125ea427870897539 tcl-8.4.9.ebuild 3262
+RMD160 3d2ff3dce2e361ca31a486eb890f2cb89f424593 tcl-8.4.6.ebuild 2923
+SHA256 c2c63064a96886f0625fd4349c77b49dc34c2c503f25fe339bbbde4f94102139 tcl-8.4.6.ebuild 2923
+MD5 dbc3aa309306634fb377ccfbee7efff0 tcl-8.4.9.ebuild 3424
+RMD160 902ad315c52749bd67c132cc206dddf897160a4c tcl-8.4.9.ebuild 3424
+SHA256 e504ed86e67516fc6f92802417a1d362cdc80a32f70be67f5d06902714ec6caf tcl-8.4.9.ebuild 3424
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDzqLLH6mNYUtVdIARAlMMAKCel2zOvE7KQjYnYy4sBcrJfT9o/wCZAfmo
-xJk1dxJVtNZxF7C8rOlPjf4=
-=jk20
+iD8DBQFD4rL82+ySkm8kpY0RAng5AJ4igOFax4MPamEiFjeTM9bvuiag6wCgpwIO
+hMZxt0rx1WgzPosx+lMX7PU=
+=o0f+
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/files/tcl-configure-LANG.patch b/dev-lang/tcl/files/tcl-configure-LANG.patch
new file mode 100644
index 000000000000..3ef76ef911c0
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-configure-LANG.patch
@@ -0,0 +1,41 @@
+The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
+option parsing, it may break.
+
+http://bugs.gentoo.org/103483
+
+--- configure
++++ configure
+@@ -54,6 +54,16 @@
+ 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
++
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+@@ -452,16 +463,6 @@
+   esac
+ done
+ 
+-# 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
+-
+ # 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.
diff --git a/dev-lang/tcl/tcl-8.4.11-r1.ebuild b/dev-lang/tcl/tcl-8.4.11-r1.ebuild
index 554222347310..64eaf93df92d 100644
--- a/dev-lang/tcl/tcl-8.4.11-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.4.11-r1.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/dev-lang/tcl/tcl-8.4.11-r1.ebuild,v 1.2 2006/01/18 20:15:30 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.11-r1.ebuild,v 1.3 2006/02/03 01:33:00 vapier Exp $
 
 inherit eutils multilib
 
@@ -38,6 +38,13 @@ src_unpack() {
 
 	# bug 117744
 	sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die
+
+	local d
+	for d in */configure ; do
+		cd "${S}"/${d%%/*}
+		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
+		epatch "${FILESDIR}"/tcl-configure-LANG.patch
+	done
 }
 
 src_compile() {
diff --git a/dev-lang/tcl/tcl-8.4.11.ebuild b/dev-lang/tcl/tcl-8.4.11.ebuild
index 48c26dc3c45c..ea44baf00924 100644
--- a/dev-lang/tcl/tcl-8.4.11.ebuild
+++ b/dev-lang/tcl/tcl-8.4.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.11.ebuild,v 1.2 2005/07/02 15:25:52 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.11.ebuild,v 1.3 2006/02/03 01:33:00 vapier Exp $
 
 inherit eutils
 
@@ -35,6 +35,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-multilib.patch
+	local d
+	for d in */configure ; do
+		cd "${S}"/${d%%/*}
+		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
+		epatch "${FILESDIR}"/tcl-configure-LANG.patch
+	done
 }
 
 src_compile() {
diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild
index 3b33e703c0f0..3fd261aefa2c 100644
--- a/dev-lang/tcl/tcl-8.4.9.ebuild
+++ b/dev-lang/tcl/tcl-8.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.11 2005/08/03 22:08:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.12 2006/02/03 01:33:00 vapier Exp $
 
 inherit eutils multilib
 
@@ -34,6 +34,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-8.4.6-multilib.patch
+	local d
+	for d in */configure ; do
+		cd "${S}"/${d%%/*}
+		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
+		epatch "${FILESDIR}"/tcl-configure-LANG.patch
+	done
 }
 
 src_compile() {