Fix building in non-C locales #131440 by Andres Toomsalu.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 98 insertions, 16 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index c4c8e09f0313..234ff8a54652 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/links
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.72 2006/10/15 16:53:18 vanquirius Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.73 2006/11/11 09:31:59 vapier Exp $
+
+  11 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/configure-LANG.patch, links-2.1_pre23.ebuild:
+  Fix building in non-C locales #131440 by Andres Toomsalu.
 
 *links-2.1_pre23 (15 Oct 2006)
 
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index e0aa948b9550..9881f37ff3e3 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
+MD5 e1d606df0fb23c52c4ec513d52fa50ab files/configure-LANG.patch 2052
+RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee files/configure-LANG.patch 2052
+SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b files/configure-LANG.patch 2052
 DIST links-2.1pre20-utf8.diff.bz2 4103 RMD160 ebae6ee8288e18829bf88aeb1f5b938076a20679 SHA1 515c9b0364a1dbc2ad2865ff2057180ec75dbea7 SHA256 d34166f6545928eeaae35daf24d00d0cd1436d86c7f2726aee77551ac3452ac4
 DIST links-2.1pre20.tar.bz2 3855058 RMD160 f4013cf82ff814b1a9baf62d4bf3c543c6ed806c SHA1 47c9cd664a5accf8d7d5a8d009fe1eb9bbbedf11 SHA256 d5e6978105ff14cfc5dfcb8894c0f97920a79f0ee94198fe486205b43c96a8a9
 DIST links-2.1pre22-utf8.diff.bz2 4189 RMD160 fa0c4719aa5ac0244bd165d010b9c303bfead5d3 SHA1 4a09f256a61eba235ae50e6d0b25fd8e8d2d7894 SHA256 42982ee8f605f793226f07da9ed5cb9d5be613d1f8e4bb6270533bbd7cd42b9b
@@ -11,14 +18,14 @@ EBUILD links-2.1_pre22.ebuild 3405 RMD160 43a9a42b29e8d9443704ba01ffac0b4eb3fca3
 MD5 6f038b764204b0741ca6b656d2c4ffa7 links-2.1_pre22.ebuild 3405
 RMD160 43a9a42b29e8d9443704ba01ffac0b4eb3fca347 links-2.1_pre22.ebuild 3405
 SHA256 21cce664032e5bc9519a35ae38d5ca418eaf07bb86d7531654224e6eb5671488 links-2.1_pre22.ebuild 3405
-EBUILD links-2.1_pre23.ebuild 3405 RMD160 155c0db22d1d413d3f93eb7082957281f88486b6 SHA1 37c4a57c4bb4dfffed8431290da5d9d47f737b28 SHA256 739b50e648103c098f48424ddf32adcf327b0a61cc893ae64960fefe41c03cb3
-MD5 8e77317d57b9ab43b631e8931e81873a links-2.1_pre23.ebuild 3405
-RMD160 155c0db22d1d413d3f93eb7082957281f88486b6 links-2.1_pre23.ebuild 3405
-SHA256 739b50e648103c098f48424ddf32adcf327b0a61cc893ae64960fefe41c03cb3 links-2.1_pre23.ebuild 3405
-MISC ChangeLog 20489 RMD160 994e5a5f707b781156961eb5be4866cbf2295d51 SHA1 cbdee2b5381882287767ab991fabbaea82479103 SHA256 b603331f493185b53f0e50e1b3f7b7b26b6ce61fe7494e8e880dfb528d362fbe
-MD5 f600380517e85940b10ef93c6835bb43 ChangeLog 20489
-RMD160 994e5a5f707b781156961eb5be4866cbf2295d51 ChangeLog 20489
-SHA256 b603331f493185b53f0e50e1b3f7b7b26b6ce61fe7494e8e880dfb528d362fbe ChangeLog 20489
+EBUILD links-2.1_pre23.ebuild 3445 RMD160 776d0261ac376832670e9b3b98032a7a93375006 SHA1 0a130ad4e1eaceb526d3dc7d0d4e55cd49b29e0a SHA256 28dc58e0f65975f4c07e7bb2ce49cf7a80e8d7cccf60fe896c824a8f9334b09e
+MD5 4f5022042974978e2885631e768a52bb links-2.1_pre23.ebuild 3445
+RMD160 776d0261ac376832670e9b3b98032a7a93375006 links-2.1_pre23.ebuild 3445
+SHA256 28dc58e0f65975f4c07e7bb2ce49cf7a80e8d7cccf60fe896c824a8f9334b09e links-2.1_pre23.ebuild 3445
+MISC ChangeLog 20651 RMD160 7ef3cc4f76b07a5399d78fac252bb1835cadb305 SHA1 6a7c206735411389778edb8ad2eddc56cea5c0a9 SHA256 db04404178b3977cdb90ec238a7f76d049ee1ec1285eafa88c4e8f3a216f7d8b
+MD5 59771d71698af41c46847fac3d7314e7 ChangeLog 20651
+RMD160 7ef3cc4f76b07a5399d78fac252bb1835cadb305 ChangeLog 20651
+SHA256 db04404178b3977cdb90ec238a7f76d049ee1ec1285eafa88c4e8f3a216f7d8b ChangeLog 20651
 MISC metadata.xml 498 RMD160 5cc5739e4f206a0eb7a2cf7f474b1dd9c6d23191 SHA1 0f94d243b86fb246928091718bf0be69b49c035d SHA256 2f7d9178e22068e1b35bf6b452d8b818de533c97779c3a89ed71c70a36fecfcb
 MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
 RMD160 5cc5739e4f206a0eb7a2cf7f474b1dd9c6d23191 metadata.xml 498
@@ -32,3 +39,10 @@ SHA256 560d2d001608a285eb655260f153ab090dac9726c566a94197fff52e269215f3 files/di
 MD5 92d62620f1d6be2d22a9b0ea0026c7d2 files/digest-links-2.1_pre23 509
 RMD160 055c4f7bd7cb07c19900d6a98457cd6a5c1efb85 files/digest-links-2.1_pre23 509
 SHA256 2709283d1a892656904aa6783a760e8cea818b883d921f2e2c9ff6a5171a416d files/digest-links-2.1_pre23 509
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFVZiYamhnQswr0vIRAgqjAJ0fmVJcyQQunaMlGBfUcDDikDn+zwCcCF+J
+icwGbckCZMaqhg95lDdIyAA=
+=Rlnb
+-----END PGP SIGNATURE-----
diff --git a/www-client/links/files/configure-LANG.patch b/www-client/links/files/configure-LANG.patch
new file mode 100644
index 000000000000..d1b1b0353662
--- /dev/null
+++ b/www-client/links/files/configure-LANG.patch
@@ -0,0 +1,64 @@
+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,19 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    unset $as_var
++  fi
++done
++
+ # 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.
+@@ -1850,6 +1850,19 @@
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in ./config.log if it exists.
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
++    eval \$as_var=C; export \$as_var
++  else
++    unset \$as_var
++  fi
++done
++
+ ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+ for ac_option
+ do
diff --git a/www-client/links/links-2.1_pre23.ebuild b/www-client/links/links-2.1_pre23.ebuild
index 68240c756581..3c21048ce557 100644
--- a/www-client/links/links-2.1_pre23.ebuild
+++ b/www-client/links/links-2.1_pre23.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/www-client/links/links-2.1_pre23.ebuild,v 1.1 2006/10/15 16:53:19 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre23.ebuild,v 1.2 2006/11/11 09:31:59 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -52,9 +52,10 @@ DEPEND="${RDEPEND}
 src_unpack (){
 	unpack ${A}; cd "${S}"
 
+	epatch "${FILESDIR}"/configure-LANG.patch #131440
+
 	if use unicode ; then
 		epatch "${WORKDIR}/${PN}-2.1pre22-utf8.diff"
-		export LANG=C
 		cd "${S}/intl" && ./gen-intl && cd .. || die "gen-intl filed"
 	fi
 }
@@ -102,8 +103,8 @@ src_compile (){
 	emake || die "make failed"
 }
 
-src_install (){
-	einstall
+src_install() {
+	einstall || die
 
 	# Only install links icon if X driver was compiled in ...
 	use X && doicon graphics/links.xpm
@@ -117,8 +118,7 @@ src_install (){
 
 
 pkg_postinst() {
-	if use svga
-	then
+	if use svga ; then
 		einfo "You had the svga USE flag enabled, but for security reasons"
 		einfo "the links2 binary is NOT setuid by default. In order to"
 		einfo "enable links2 to work in SVGA, please change the permissions"