Fixes for #321963 and #351534

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

5 files changed, 208 insertions, 5 deletions

diff --git a/dev-util/biew/ChangeLog b/dev-util/biew/ChangeLog
index 6d3602c60a9d..0c3b1139be6e 100644
--- a/dev-util/biew/ChangeLog
+++ b/dev-util/biew/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/biew
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.27 2011/02/23 16:27:48 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.28 2011/02/24 14:18:23 signals Exp $
+
+  24 Feb 2011; Kevin McCarthy <signals@gentoo.org> biew-6.1.0-r1.ebuild,
+  +files/biew-610-fix_localedep-1.patch,
+  +files/biew-610-portable_configure-1.patch:
+  Patches to fix test constructs in configure scripts (bug #351534) and
+  to fix building on non-en locales (bug #321963). Submitted by Nico R.
 
 *biew-6.1.0-r1 (23 Feb 2011)
 
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
index c452f7f41332..d428991e838a 100644
--- a/dev-util/biew/Manifest
+++ b/dev-util/biew/Manifest
@@ -1,13 +1,15 @@
 AUX biew-562-lvalue-casts.patch 5531 RMD160 fd994fa1c4104023b1644a5a8cb53adbafe4b7cf SHA1 b579bbfc6fb8e3a6d8e572e6dc5b16caf7597415 SHA256 1a9090cd036ee0c32d4e36a8db6fd10238e6011d0daf579041a3079912dad5c3
 AUX biew-570-configure.patch 1154 RMD160 edca8e96e0e826bea883958c9397173ed230f2b9 SHA1 48e59cbf46e56d7b67aa7a34829c78a4dc97ed30 SHA256 932edf14885c13620a51c2af103363e9dc8d456f110e7ae7d3af959e367e66af
 AUX biew-570-makefile.patch 1792 RMD160 8dd4d75448dcb4ba062a3454bebaa15e901fffbd SHA1 4cc83629fc03555a16d78e5116752871bc7b5dde SHA256 d40cfacb2aafc68153c43f1090ee3163ef5395e630d26a47d895b256be989642
+AUX biew-610-fix_localedep-1.patch 1003 RMD160 c8e02644c7b6f9d00aa0b013930b280f489af7bd SHA1 7d136a2179c254058b3fe04fb57e5127ac11af33 SHA256 094fd29bcfa683ae4fa449bf53d17fe53d9239806f1831e70bbecd75ec7996b3
+AUX biew-610-portable_configure-1.patch 4932 RMD160 5f8e0f5dd684e3dfbd1b9e34aef848fe5f602f7a SHA1 27cbc84d424f01cf99ca85ce1b9f4eba64460b88 SHA256 b306d264e94ae47ce843668aea5f59470cdbad81250a7de32858e02dc3cfc0e2
 DIST biew-570.tar.bz2 734263 RMD160 c9b27528f3d23016cb5050bc01eeeb6585c02956 SHA1 5f3207cc713a8e0d665df1c1335764dc94463049 SHA256 5cc56bfe1951f7a66989cf0dd342e71c8600942b6ac05fece2f95aff6353248c
 DIST biew-610-src.tar.bz2 860517 RMD160 c728c8e165c2e16edcc4c25ddef063379b32049d SHA1 332b45580cdee134ee42c48bec652fcba96cd99a SHA256 2e85f03c908dd6ec832461fbfbc79169a33f4caccf48c8fe60cbd29f5fb06d17
 DIST biew562.tar.bz2 594367 RMD160 413f2c72a70056adbebd5e79d541201d6e3b27cb SHA1 44435c0815a59d38c9a6c74d09c0f495e71e23fe SHA256 82263fdd9f9854a9326889b8d4e138c0dba3f08460922d4683f659873313e46a
 EBUILD biew-5.6.2-r1.ebuild 1678 RMD160 4ecc7326e5121e8c3e4777521764a793caff2215 SHA1 aed4077ff37825f68de95d12a5499afdeadc7ba3 SHA256 8d84058f77c8afcdf3a54a37a2f7ac612561a112909838a730abccf3bd7bbf42
 EBUILD biew-5.6.2.ebuild 1555 RMD160 ad7c69643c772863741c8d18042b03043856a3f2 SHA1 6a5099cc03f7e54ee76ea2456d0e984ffaa32d79 SHA256 91590f47083f4d6d23761c79e22f719c4c1a9fd18104ab57906e19819525023f
 EBUILD biew-5.7.0.ebuild 1565 RMD160 368a4704b0076489b88a2f0398cedcacb16494a2 SHA1 b94fd831a5fc9a2364167a40cc249059692b59c4 SHA256 54a94dc90e10b55e9a66ac20606d2b42bfd34307085db482ca934a9807e73fad
-EBUILD biew-6.1.0-r1.ebuild 1514 RMD160 5b5b9933e9b4f15ab2067bb7e5a46bbd48c6ded0 SHA1 6194409a674ae6f99bad4b8052b8a30b0f130120 SHA256 e33feb2d419522746c79cd1075cb038f55b77bf2e436b7f342971a51dc7ca98f
+EBUILD biew-6.1.0-r1.ebuild 1634 RMD160 ef82fe67c7b5045e819680926e30abe665e32d22 SHA1 9bf4c4787a48bfa7a55e41981d9702786985febf SHA256 5a6d4c020cff6afc9f504afa5bc012900cd918573052ff9c8e5b21b752b5595a
 EBUILD biew-6.1.0.ebuild 1452 RMD160 0a29020e23cca942666a93b72d0aecbb4006b569 SHA1 6684a6aecaf05b08908c8c81423088e801009490 SHA256 367e68826cd3adc3f509ce8f4db1ab93473d8a4b51984dcf03bcbd4a0ffd10b2
-MISC ChangeLog 3985 RMD160 6d149c58da49b71a03cc80636cb5f7ed58fb4726 SHA1 ee636d3b4f8828c8d5dea45c9bf3100adbb5b41d SHA256 c162a3514ba2ee8e9bfefc927120daad15849dd2b84ecd9708de1326e0668161
+MISC ChangeLog 4290 RMD160 a37967ac6360394b4ebfa7a756e076852492bd3c SHA1 fc0799b634e4652edb21c2292ce41df9796957ec SHA256 fc1d154693e0961daeb6f184fcaed3d62f195752a410f20d43b93822ea166a73
 MISC metadata.xml 253 RMD160 41c150eda5f8c82eb8ce0613bb38789df3e8ae41 SHA1 90ac3faa9a4536e5f27979ee8a7179fa7b43e0cb SHA256 7c5da09e37d08d352d1b8ba0d51f34e6f93aa42bdd92d56b8dd92dbcee111e9f
diff --git a/dev-util/biew/biew-6.1.0-r1.ebuild b/dev-util/biew/biew-6.1.0-r1.ebuild
index 71c6e8082e38..28069727153d 100644
--- a/dev-util/biew/biew-6.1.0-r1.ebuild
+++ b/dev-util/biew/biew-6.1.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r1.ebuild,v 1.1 2011/02/23 16:27:48 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r1.ebuild,v 1.2 2011/02/24 14:18:23 signals Exp $
 
 EAPI=4
-inherit flag-o-matic toolchain-funcs versionator
+inherit eutils flag-o-matic toolchain-funcs versionator
 
 MY_P=${PN}-$(replace_all_version_separators "")
 
@@ -21,6 +21,8 @@ RDEPEND="gpm? ( sys-libs/gpm )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-610-fix_localedep-1.patch"
+	epatch "${FILESDIR}/${PN}-610-portable_configure-1.patch"
 	sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile || die "Failed to edit makefile."
 }
 
diff --git a/dev-util/biew/files/biew-610-fix_localedep-1.patch b/dev-util/biew/files/biew-610-fix_localedep-1.patch
new file mode 100644
index 000000000000..babe994e070a
--- /dev/null
+++ b/dev-util/biew/files/biew-610-fix_localedep-1.patch
@@ -0,0 +1,26 @@
+The configure script of biew-6.1.0 fails with
+    Checking for C compiler name ... gcc-Version
+if using the de_DE.UTF-8 locale and sys-devel/gcc-4.5.2. It may fail with other
+locales and/or compilers, too. The problem occurs due to the fact that the
+string “gcc version” written by gcc for ‘gcc -v’ is translated according to the
+language (German in the case mentioned above).
+
+This patch makes sure that the POSIX locale is used when the biew configure
+script checks for the name of the compiler. This allows the configure script to
+parse the output properly.
+
+ –nico
+
+
+diff -Naur biew-610.orig/configure biew-610/configure
+--- biew-610.orig/configure	2009-11-13 15:52:36.000000000 +0100
++++ biew-610/configure	2011-01-13 11:11:59.000000000 +0100
+@@ -497,7 +497,7 @@
+ 
+ _cdefos="-DDATADIR='\"$_datadir\"'"
+ 
+-cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
++cc_name=`LC_ALL=POSIX $_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
+ cc_version=`$_cc -dumpversion`
+ 
+ echocheck "C compiler name"
diff --git a/dev-util/biew/files/biew-610-portable_configure-1.patch b/dev-util/biew/files/biew-610-portable_configure-1.patch
new file mode 100644
index 000000000000..c64f6280ba08
--- /dev/null
+++ b/dev-util/biew/files/biew-610-portable_configure-1.patch
@@ -0,0 +1,167 @@
+Changes the biew-610 configure script to use portable test constructs. See the
+Autoconf manual <URL:https://www.gnu.org/software/autoconf/manual/html_node/
+Limitations-of-Builtins.html#index-g_t_0040command_007btest_007d-1725> for
+explanations.
+
+ –nico
+
+
+diff -Naur biew-610.orig/configure biew-610/configure
+--- biew-610.orig/configure	2009-11-13 14:52:36.000000000 +0000
++++ biew-610/configure	2011-02-24 09:44:10.000000000 +0000
+@@ -171,7 +171,7 @@
+ # 1st: print out help
+ 
+ for parm in "$@" ; do
+-  if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then
++  if test "X$parm" = "X--help" || test "X$parm" = "X-help" || test "X$parm" = "X-h" ; then
+     cat << EOF
+ 
+ Usage: $0 [OPTIONS]...
+@@ -235,7 +235,7 @@
+ _cp=cp
+ _libext=a
+ _libprefix=lib
+-test "$CC" && _cc="$CC"
++test "X$CC" != X && _cc="$CC"
+ _prefix="/usr/local"
+ _datadir=
+ _libdir=
+@@ -340,11 +340,11 @@
+     ;;
+   esac
+ done
+-test -z "$_datadir" && _datadir=$_prefix"/share/biew"
+-test -z "$_libdir" && _libdir=$_prefix"/lib/biew"
++test "X$_datadir" = X && _datadir=$_prefix"/share/biew"
++test "X$_libdir" = X && _libdir=$_prefix"/lib/biew"
+ 
+ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
+-  test "$I" && break
++  test "X$I" != X && break
+ done
+ 
+ TMPLOG="config.log"
+@@ -357,8 +357,8 @@
+ _tee="tee -a $TMPLOG"
+ 
+ echocheck "architecture"
+-if test "$_target_arch" = auto ; then
+-  if test -z "$host_arch" ; then
++if test "X$_target_arch" = Xauto ; then
++  if test "X$host_arch" = X ; then
+   host_arch=`( uname -p ) 2>&1`
+   log "uname -p :" "$host_arch"
+   case "$host_arch" in
+@@ -416,8 +416,8 @@
+ x86_64  && _bitness=64
+ 
+ echocheck "target OS"
+-if test "$_target_system" = auto ; then
+-  if test -z "$system_name" ; then
++if test "X$_target_system" = Xauto ; then
++  if test "X$system_name" = X ; then
+     # OS name
+     system_name=`uname -s`
+     log "uname -s :" "$system_name"
+@@ -461,8 +461,8 @@
+   fi
+ fi
+ 
+-if test "$_target_system" = auto ; then
+-  if test -z "$system_name" ; then
++if test "X$_target_system" = Xauto ; then
++  if test "X$system_name" = X ; then
+     # OS name
+     system_name=`/bin/sh --version 2>&1 | sed -n 's/^.*\([(]\)./\1/p'`
+     log "/bin/sh --version:" "$system_name"
+@@ -549,7 +549,7 @@
+     ;;
+ esac
+ 
+-if test -z "$_x11incdir" ; then
++if test "X$_x11incdir" = X ; then
+ echocheck "X11 headers"
+   for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
+     if test -d "$I/X11" ; then
+@@ -559,11 +559,11 @@
+     fi
+   done
+ fi
+-if test -z "$_x11incdir" ; then
++if test "X$_x11incdir" = X ; then
+     echores "x11inc not found"
+ fi
+ 
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+ echocheck "X11 libs"
+   for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
+     if test -d "$I" ; then
+@@ -573,24 +573,24 @@
+     fi
+   done
+ fi
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+     echores "x11lib not found"
+ fi
+ 
+-test -z "$_debug" && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
+-if test "$_profile" -o "$_debug" -o "$_gcov"; then
++test "X$_debug" = X && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
++if test "X$_profile" != X || test "X$_debug" != X || test "X$_gcov" != X ; then
+   _cdefos="-W -Wall -O2 -fno-builtin $_debug $_profile $_gcov $_cdefos"
+   _osldef="$_debug $_profile $_osldef"
+-elif test -z "$CFLAGS" ; then
++elif test "X$CFLAGS" = X ; then
+     _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos"
+     x86 && _cdefos="-mmmx -msse $_cdefos"
+ else
+     _cdefos="-DNDEBUG=1 $CFLAGS $_cdefos"
+ fi
+-test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef"
+-test -n "$LIBS" && _osldef="$LIBS $_osldef"
++test "X$LDFLAGS" != X && _osldef="$LDFLAGS $_osldef"
++test "X$LIBS" != X && _osldef="$LIBS $_osldef"
+ 
+-if test "$_target_system" = dos ; then
++if test "X$_target_system" = Xdos ; then
+ # disable cc_check call for DJGPP due bugs in bash
+ _cdefos="-D__HAVE_PRAGMA_PACK__=1 $_cdefos"
+ else
+@@ -668,10 +668,10 @@
+ 	_curseslib=
+ 	disable _curses
+ 	cc_check -lcurses && _curseslib="-lcurses"
+-	if test -z "$_curseslib" ; then
++	if test "X$_curseslib" = X ; then
+ 	    cc_check -lncurses && _curseslib="-lncurses"
+ 	fi
+-	if test -n "$_curseslib" ; then
++	if test "X$_curseslib" != X ; then
+ 	    enable _curses
+ 	    _cdefos="-D_CURSES_ -D__OS_NAME__='\"Unix/Curses\"' $_cdefos"
+ 	    _oslibs="$_curseslib $_oslibs"
+@@ -711,10 +711,10 @@
+ enabled sys_resource_h && _cdefos="-DHAVE_SYS_RESOURCE=1 $_cdefos"
+ echores "$sys_resource_h"
+ 
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+  _cdefos="$_cdefos"
+ else
+-  if test -z "$_x11incdir" ; then
++  if test "X$_x11incdir" = X ; then
+    _cdefos="$_cdefos"
+   else
+     _cdefos="-DHAVE_X11 $_cdefos"
+@@ -738,7 +738,7 @@
+ fi
+ 
+ # Checking for INSTALL
+-if test -z $_install
++if test "X$_install" = X
+ then
+     _install="install"
+     $_install --version 1>/dev/null 2>/dev/null || _install=""