Fix building in funky locales #121513 by J.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 79 insertions, 12 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/Manifest b/sys-libs/gpm/Manifest
index bc86e7f9a58a..ad32c2069da5 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,18 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d7b8b284ac7155667fb47eb116d8d841 ChangeLog 6455
+MD5 e1a71913d55af9f116f715905e1bbbb1 ChangeLog 6633
+RMD160 2ee01498e1220b5788fc463236dc8663c36beb1e ChangeLog 6633
+SHA256 a47067f0267408105560fa7ed0dddcf1189c709c733a3cbd4913a3955a6b52ab ChangeLog 6633
 MD5 73d6199d600c0f63c31a6de234159bba files/digest-gpm-1.20.1-r4 136
+RMD160 3e5ec9aafe0013696d5c531ec57d9eb014ff59eb files/digest-gpm-1.20.1-r4 136
+SHA256 4fe8a4805daed63d8fbdbb1117e8710a98c28c3cc24a92c07a7b3de6412ae563 files/digest-gpm-1.20.1-r4 136
 MD5 cbbd61829b8751340f80666ca67afaff files/digest-gpm-1.20.1-r5 136
+RMD160 03ff24c254696d431e5a948d2d884094f08a5a1e files/digest-gpm-1.20.1-r5 136
+SHA256 5d3f336eae643d9af47d4d09bb9fcf398acc5bccf102309e9aee51b99675f0aa files/digest-gpm-1.20.1-r5 136
+MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/gpm-configure-LANG.patch 1686
+RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/gpm-configure-LANG.patch 1686
+SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/gpm-configure-LANG.patch 1686
 MD5 5968cb47e493e348cf289b0dd1990f4a files/gpm.conf.d 580
+RMD160 5ce706d89a3e2c01b75a01dd614267f918290be9 files/gpm.conf.d 580
+SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8 files/gpm.conf.d 580
 MD5 b1364fd3bf27cda742dbcfc87497cc18 files/gpm.rc6 951
-MD5 9f2da86014b09df3affbb844964a6887 gpm-1.20.1-r4.ebuild 1798
-MD5 6bf047ae7f02e0e5acbbc657ff51c53d gpm-1.20.1-r5.ebuild 1890
+RMD160 770208133f13fd02207095f7b71a63ac790467d7 files/gpm.rc6 951
+SHA256 918d1275b48da6cb563d5c3569fad731bf88a59afbd9358e306b081e6ead00a6 files/gpm.rc6 951
+MD5 fd78548b3a6d83712cecf555ef8538dc gpm-1.20.1-r4.ebuild 1844
+RMD160 583e6002921d0d6787d5d33d79620435f30aa9fa gpm-1.20.1-r4.ebuild 1844
+SHA256 a2b4e0ce8b7f1920e24ef62dba015b77444bf01292b3a8949828b6106cfb2cf6 gpm-1.20.1-r4.ebuild 1844
+MD5 7b16f8096bccf0eb6478a9e7e359fa77 gpm-1.20.1-r5.ebuild 1937
+RMD160 9d5b3086297c2c2b7e624dfe06bf58d7e25e3158 gpm-1.20.1-r5.ebuild 1937
+SHA256 17763dc8817ec3146ef134a81e2353c3ec97eb14c158d0e1ead06f9a13e5d084 gpm-1.20.1-r5.ebuild 1937
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDo4dN2+ySkm8kpY0RAq+yAKC1Z+IJiKkzImmiP5yVDHftttuHJwCgwmbU
-2QRATILOELVvmqbwh+CVRPA=
-=HTLM
+iD8DBQFD5OWO2+ySkm8kpY0RAiPWAJoCF0EUao8yAH3rsLCGBKioWDRMTwCfZb0o
+DYsO4GU4DAj4xzxFFZJP2XM=
+=mDP8
 -----END PGP SIGNATURE-----
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() {