add patch to fix the EE lang issue. Thomas has indicated that he will probably update the configure script in xterm-205 to address this. Bug #105369

Package-Manager: portage-2.0.52-r1

4 files changed, 54 insertions, 4 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 1f6cc1710efe..597f3397aa1e 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.99 2005/09/16 11:40:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.100 2005/09/16 11:47:46 seemant Exp $
+
+  16 Sep 2005; Seemant Kulleen <seemant@gentoo.org> +files/xterm-LANG.patch,
+  xterm-204.ebuild:
+  add patch to fix the EE lang issue. Thomas has indicated that he will
+  probably update the configure script in xterm-205 to address this. Bug
+  #105369
 
   16 Sep 2005; Seemant Kulleen <seemant@gentoo.org> xterm-204.ebuild:
   to stable
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 875fb608c102..d87bcb43292b 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,6 +1,7 @@
 MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
 MD5 735c1b014e14a4d459574885e621c443 xterm-200-r3.ebuild 2243
-MD5 c1d00c394e66f26ccf4f046bf3336ce9 ChangeLog 14829
-MD5 11979368ecef9578729dec1eac7f2508 xterm-204.ebuild 2498
+MD5 f359f5dca8c9641b1fae083448c02e32 ChangeLog 15083
+MD5 4167db2fa37b0442cdc5cecddbe084c2 xterm-204.ebuild 2536
 MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r3 58
 MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
+MD5 a5048a1a15d86d400d3e2dbaaa0ac1c8 files/xterm-LANG.patch 1698
diff --git a/x11-terms/xterm/files/xterm-LANG.patch b/x11-terms/xterm/files/xterm-LANG.patch
new file mode 100644
index 000000000000..d344d5b1eced
--- /dev/null
+++ b/x11-terms/xterm/files/xterm-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/105369
+
+--- xterm/configure
++++ xterm/configure
+@@ -46,6 +46,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=
+@@ -502,16 +512,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/x11-terms/xterm/xterm-204.ebuild b/x11-terms/xterm/xterm-204.ebuild
index 31099cd8d514..f3a639f0b240 100644
--- a/x11-terms/xterm/xterm-204.ebuild
+++ b/x11-terms/xterm/xterm-204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-204.ebuild,v 1.3 2005/09/16 11:40:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-204.ebuild,v 1.4 2005/09/16 11:47:46 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/xterm-LANG.patch
 }
 
 src_compile() {