Fix building in funky locales #121408 by J.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 61 insertions, 12 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 60b5e8aa404d..ffaf1824b187 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/flex
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.34 2005/09/16 11:19:41 agriffis Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.35 2006/02/04 00:46:21 vapier Exp $
+
+  04 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/flex-configure-LANG.patch, flex-2.5.4a-r6.ebuild:
+  Fix building in funky locales #121408 by J.
 
   16 Sep 2005; Aron Griffis <agriffis@gentoo.org> flex-2.5.4a-r6.ebuild:
   Mark 2.5.4a-r6 stable on alpha
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index adbbedfd13fc..914d3fca73d4 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5c2c4c7cbed85a483d0ede3096c7dcf7 ChangeLog 2651
-RMD160 ea5c00ea377337e53ad6549a904e6d94ec568e0c ChangeLog 2651
-SHA256 70c748a790c1e6ea8f2f5973eb52e0a4f990cb4b660cfe0e4b23352ec36b6f64 ChangeLog 2651
+MD5 04c3f0655baa340c7804ca3c2569af07 ChangeLog 2805
+RMD160 1c67c95e57079b5d2ce763874df1e8776a4227a1 ChangeLog 2805
+SHA256 21ebfea36af940366d4c6d4e4c268e07ed79936b111d96f89161d28e9d810788 ChangeLog 2805
 MD5 8c9da1ab91353ab97d100e499ae722f7 files/digest-flex-2.5.31 131
 RMD160 5a8f2d987764982a9a75548f08ffcdc084e7f0f9 files/digest-flex-2.5.31 131
 SHA256 79b8290044e824b02fe32822d696b2f8e580d66147964cd6ac94de6af68857d6 files/digest-flex-2.5.31 131
@@ -28,22 +28,25 @@ SHA256 f1feed73b370fabc447085bb17bf0e756544bbd287d3957f1e59602585a5f580 files/fl
 MD5 28010d818ed73f21c9d37fd955c9f25b files/flex-2.5.4a-skel.patch 350
 RMD160 64d0168745842c4c14c806d5bb9398dfa37203e1 files/flex-2.5.4a-skel.patch 350
 SHA256 950bf0133a892332d73678b2ca35978abe6184ba9a29e38e60f6e7be773409a8 files/flex-2.5.4a-skel.patch 350
+MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686
+RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686
+SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686
 MD5 8469b176ce2b8fb51558f801837fac0d flex-2.5.31.ebuild 1124
 RMD160 631effe176ed11d40193ba16d06091203a6cf72d flex-2.5.31.ebuild 1124
 SHA256 0a7de7aad30448e4db9961093ab825348769f1fa7b3381a0d4f155ed4263b96b flex-2.5.31.ebuild 1124
 MD5 3f4500ac9117f90f14a3a82e3a5dc488 flex-2.5.4a-r5.ebuild 1304
 RMD160 5362fd95822598aa3ed519f8d21e185ea22bb04c flex-2.5.4a-r5.ebuild 1304
 SHA256 de0ecc67f9ace3737258c8df6c658d270e885ad4d5627e363acf86aa60c7b72b flex-2.5.4a-r5.ebuild 1304
-MD5 12b2dea51339ce8d4a09d3d5824d87e3 flex-2.5.4a-r6.ebuild 1464
-RMD160 e6318ff1deacaf06b0a41e6790bf9673175c47a6 flex-2.5.4a-r6.ebuild 1464
-SHA256 f1807f1fb77e77baf53218de4f8072333e57809b58af41d6830d457e54f59e0a flex-2.5.4a-r6.ebuild 1464
+MD5 ba28f90191685fc6b023b23e960ae93c flex-2.5.4a-r6.ebuild 1513
+RMD160 977f6cffe6635e49d5d9d495260232a0fd04a541 flex-2.5.4a-r6.ebuild 1513
+SHA256 1702f13996d64b36ba755d6b0e3e2ed4244ac08665197f7992701f30de19289d flex-2.5.4a-r6.ebuild 1513
 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)
 
-iD8DBQFD4/e/2+ySkm8kpY0RAs9fAKC4rR0FOIs7lgOn77u8Lg1uWNZ5bACfaPou
-du3FoSGN5lMxIkmBIYu+KYw=
-=dZWM
+iD8DBQFD4/mR2+ySkm8kpY0RAgq1AJ9BEfy9omEXuqwC/mtiPgdNYFL+fACeJ0qw
+xuXXIrU2OMFC4ltLBSwMFKE=
+=bXBi
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/flex-configure-LANG.patch b/sys-devel/flex/files/flex-configure-LANG.patch
new file mode 100644
index 000000000000..3ef76ef911c0
--- /dev/null
+++ b/sys-devel/flex/files/flex-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-devel/flex/flex-2.5.4a-r6.ebuild b/sys-devel/flex/flex-2.5.4a-r6.ebuild
index 069bef21b798..756e36b71a48 100644
--- a/sys-devel/flex/flex-2.5.4a-r6.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-r6.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/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.10 2006/02/04 00:38:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.11 2006/02/04 00:46:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -31,6 +31,7 @@ src_unpack() {
 
 	# included autotools are crusty, lets polish em up
 	epatch "${WORKDIR}"/${P}-autoconf.patch
+	epatch "${FILESDIR}"/${PN}-configure-LANG.patch
 }
 
 src_compile() {