Fix building in funky locales #121513 by J.

(Portage version: 2.1_pre4-r1)

4 files changed, 54 insertions, 6 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 63fd46fa028e..05c3fc5f98c6 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/gpm
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.45 2005/08/21 04:52:07 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.46 2006/02/04 17:33:53 vapier Exp $
+
+  04 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/gpm-configure-LANG.patch, gpm-1.20.1-r4.ebuild,
+  gpm-1.20.1-r5.ebuild:
+  Fix building in funky locales #121513 by J.
 
   21 Aug 2005; Mike Frysinger <vapier@gentoo.org> gpm-1.20.1-r5.ebuild:
   Disable emacs support #99533.
diff --git a/sys-libs/gpm/files/gpm-configure-LANG.patch b/sys-libs/gpm/files/gpm-configure-LANG.patch
new file mode 100644
index 000000000000..3ef76ef911c0
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-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/sys-libs/gpm/gpm-1.20.1-r4.ebuild b/sys-libs/gpm/gpm-1.20.1-r4.ebuild
index a94da667b4b2..2dee46eb3957 100644
--- a/sys-libs/gpm/gpm-1.20.1-r4.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r4.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/sys-libs/gpm/gpm-1.20.1-r4.ebuild,v 1.12 2005/08/07 23:03:23 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r4.ebuild,v 1.13 2006/02/04 17:33:53 vapier Exp $
 
 inherit eutils toolchain-funcs elisp-common
 
@@ -24,6 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${WORKDIR}"/patch
+	epatch "${FILESDIR}"/gpm-configure-LANG.patch
 }
 
 src_compile() {
diff --git a/sys-libs/gpm/gpm-1.20.1-r5.ebuild b/sys-libs/gpm/gpm-1.20.1-r5.ebuild
index 8c8c6b5195d2..3ee4be62f93c 100644
--- a/sys-libs/gpm/gpm-1.20.1-r5.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r5.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/sys-libs/gpm/gpm-1.20.1-r5.ebuild,v 1.2 2005/08/21 04:52:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r5.ebuild,v 1.3 2006/02/04 17:33:53 vapier Exp $
 
 # emacs support disabled due to Bug 99533
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	epatch "${FILESDIR}"/gpm-configure-LANG.patch
 }
 
 src_compile() {