update patches to latest git

4 files changed, 86 insertions, 85 deletions

diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index cdfc5399a240..16c4e0f1d4f6 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,12 +1,21 @@
-AUX 99999999/0001-add-uClibc-guess-support.patch 5737 RMD160 90261d7cb7fbfe9c1b1372d5bebbfb8862a65c76 SHA1 3b083aaaa54c09437c4ac8356df77a52c2947cdf SHA256 96f3d139a0915de827c37cd9de4e419946158a28200317d348f82d002f14e886
-AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1633 RMD160 95aadef11341eb0b491dcdbf3afc055e28a9be15 SHA1 d2ef0d92bebe6b3ac4029a62e64825ab133ec9aa SHA256 e67df74f97447e36f58d59b386a751003003a16bbfb8c4fe98a2f7512810c04f
-AUX 99999999/disable-broken-tests.patch 693 RMD160 c5089c2817924cbe0d285744234d04886dfe0567 SHA1 0f91a24ae6b133e6b4be222c1ed1bd94761ccaec SHA256 979776e2cdc4f239c31cc686c8d343d18de33fbba4ac3d815ae528c2f4f96d00
-DIST gnuconfig-20080928.tar.bz2 41138 RMD160 9dd929ecad6a9e1d4e45e2388319c723d6f276ad SHA1 fd2f9c0a9aa0b82602396f1269db26c4e45fcea8 SHA256 aa8dffbe342af6b71f142d3c9e3f01854c040f502bce70ad21e1883c5e39251f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 99999999/0001-add-uClibc-guess-support.patch 5864 RMD160 5242bac03a939971c145c4a1ca09083a9ad149f6 SHA1 21ca7aef1b4b0b0ab0be9dd50f4a309e5632d2a6 SHA256 6c788396e1f9c0243e04ac2e818c4b8695d1bfc96fe47ee11d88a06ff9a1c80a
+AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1745 RMD160 eecb3578ad15e2cbf34fda309d8a713da10904d3 SHA1 dddb403195a34ae57963f74567f4131685b359f4 SHA256 200d53d05a24b3627e93af2b2fecef7c033899b7eda88297cd6c3a24b8fa32ef
 DIST gnuconfig-20090203.tar.bz2 41614 RMD160 2e96f25278f668a23f914a99223137b3b75e88ed SHA1 19ece4b998c74c4d6eb1de774d16db0c67b755d5 SHA256 25f0ba06b3a145dbd6cfa153545bc66cbf35de176378119962ea37b3bd1b54aa
 DIST gnuconfig-20090819.tar.bz2 49154 RMD160 44960e99e785118ceb95b40be2fd3c9754f450b9 SHA1 a0a2d688eb01c81337b93dc1d2be220887ee7d45 SHA256 732aa690c56799fbb3fc1e4db8f1d6cad1d3704f27847da2f751dacb4429fb7f
-EBUILD gnuconfig-20080928.ebuild 858 RMD160 414a2b7ad31c88a3ec45c3ff2c11fb9541a330d2 SHA1 68ca255cee0a4e473add504edd9f88f52ae74c0b SHA256 375c8e0eed072f4d1f481404b32a42a938c51302aff8dfba4d0f3fd0cb25e315
+DIST gnuconfig-20100122.tar.bz2 575976 RMD160 c54401aa20eadfcfa0d0ea791bd0da3acedf8826 SHA1 0cc26991818d7d6c00439e7ce722f61cbca4f078 SHA256 cf673acedef0d3097097bc2964e6e10ead437da917aa5eb8fd97906e7d3fe022
 EBUILD gnuconfig-20090203.ebuild 1473 RMD160 24d2ce06a27d25be00f0f0c48639d902b6d4631a SHA1 5865ca576020796958a7d67c90d6a0359311e438 SHA256 6f5577cdb082cda96460af96badfeae1fadd5ffd5c570a910e9fcf03801bea6b
-EBUILD gnuconfig-20090819.ebuild 1609 RMD160 29073411cea6f029b610f51e2703f3da5be1455b SHA1 78b0ddf28d343dcd3f16bc1c93bf2f8385d0dc02 SHA256 9e00ec8557bcd0341c472ee7617e637267dc753435c0bc719beb5aa44e7863aa
+EBUILD gnuconfig-20090819.ebuild 1597 RMD160 a1d3305686cb9a036ec6f8b432476e2b2a800113 SHA1 570dfcb456f963ff81d7852c7fb69d0d414917a1 SHA256 64b0f502886dd466ffec9ea388d60caebb9a288ae92b62dad68746f07f8cf354
+EBUILD gnuconfig-20100122.ebuild 1610 RMD160 be11662d8fe237f5d531788417fa6e2fd625bfa5 SHA1 1d152d29be5ceea19e33b8daf21b515af1a0658a SHA256 1d71cfd31bcf35ea601d5e6da31afffffdfa9afad2e3ba62de3a2a5a216dfb42
 EBUILD gnuconfig-99999999.ebuild 1609 RMD160 5c17cf63ecc33dd94096f6aa1898c71acb91d9ee SHA1 70a7a3c7dd679d6536067dfa3fa7cf2200d26032 SHA256 fc38a076a106216c335217c1e29011d5d1e1558f4ffc766b44eb7f6d3c1d9d6d
-MISC ChangeLog 5381 RMD160 8e1577cc8df595827089e869b901c39b6c443fd1 SHA1 5140fe42a16c91833c35c52fec10ca7b3b4b0ec7 SHA256 ac36465ef7652abb9b76971239013b7ca2e12e35161c96669874c531894a6211
+MISC ChangeLog 5618 RMD160 1449a045c2d13f3f3965fc7d48107bf747568a2e SHA1 9f12ccb5675a82376a3110e67c9fb48b5de74124 SHA256 4b2584b2917d4e5d20c2a8293d72e9724a883eea010143ed7d8a392e07af7ce9
 MISC metadata.xml 293 RMD160 78d99462a0074f896ed458f4f469198d127f3a8c SHA1 a845fe87e290f013862900b3f844a467ca1a8067 SHA256 283c16d6da264b63f42e0102f66ca13573cd7cc3aa15a35cc5abb1d91b598564
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktwnQMACgkQTwhj9JtAlp7magD/dl91z7av0X6FhPPhZFZMUbsr
+2fVyZj7LJEYzXr+eI4QA/2xY2nUmHQKydWfhpdsRWMsw8FCpUFkUOcCDaqsz+r8r
+=ivrT
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch b/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
index c3126d081a69..2317f882e962 100644
--- a/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
+++ b/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
@@ -1,24 +1,24 @@
-From d5a10be0ad318f44d81c147033359e487e918ffd Mon Sep 17 00:00:00 2001
+From 8498f76fe6131577ce3e90af58a6be958b3795be Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Thu, 9 Oct 2008 15:51:09 -0400
 Subject: [PATCH 1/2] add uClibc guess support
 
 ---
- config.guess |   77 +++++++++++++++++++++++++++++++++++++---------------------
- 1 files changed, 49 insertions(+), 28 deletions(-)
+ config.guess |   89 ++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 52 insertions(+), 37 deletions(-)
 
 diff --git a/config.guess b/config.guess
-index bb0b03e..12734a7 100755
+index c2246a4..bf48496 100755
 --- a/config.guess
 +++ b/config.guess
-@@ -139,6 +139,25 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+@@ -140,6 +140,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
 +case "${UNAME_SYSTEM}" in
 +Linux|GNU/*)
 +	eval $set_cc_for_build
-+	cat << EOF > $dummy.c
++	cat <<-EOF > $dummy.c
 +	#include <features.h>
 +	#ifdef __UCLIBC__
 +	# ifdef __UCLIBC_CONFIG_VERSION__
@@ -27,17 +27,26 @@ index bb0b03e..12734a7 100755
 +	LIBC=uclibc
 +	# endif
 +	#else
++	# ifdef __dietlibc__
++	LIBC=dietlibc
++	# else
 +	LIBC=gnu
++	# endif
 +	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 +	;;
 +esac
 +
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -849,7 +868,7 @@ EOF
+@@ -849,11 +872,11 @@ EOF
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit ;;
      *:GNU/*:*:*)
  	# other systems with GNU libc and userland
@@ -46,7 +55,17 @@ index bb0b03e..12734a7 100755
  	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
-@@ -859,31 +878,31 @@ EOF
+@@ -869,50 +892,42 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  	    | grep -q __ARM_EABI__
  	then
@@ -73,6 +92,18 @@ index bb0b03e..12734a7 100755
 -    	echo frv-unknown-linux-gnu
 +    	echo frv-unknown-linux-${LIBC}
  	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -87,10 +118,10 @@ index bb0b03e..12734a7 100755
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -906,16 +925,16 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
+@@ -931,51 +946,51 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
@@ -98,29 +129,14 @@ index bb0b03e..12734a7 100755
 -	echo or32-unknown-linux-gnu
 +	echo or32-unknown-linux-${LIBC}
  	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -928,43 +947,43 @@ EOF
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
- 	objdump --private-headers /bin/sh | grep -q ld.so.1
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
      padre:Linux:*:*)
 -	echo sparc-unknown-linux-gnu
 +	echo sparc-unknown-linux-${LIBC}
  	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -132,9 +148,13 @@ index bb0b03e..12734a7 100755
 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
  	esac
  	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-${LIBC}
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
@@ -163,21 +183,8 @@ index bb0b03e..12734a7 100755
 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -979,9 +998,11 @@ EOF
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		;;
- 	esac
-+	# This should get integrated into the C code below, but now we hack
-+	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 -- 
-1.6.4
+1.6.6.1
 
diff --git a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
index ad2d89e9b123..067bb1f7235f 100644
--- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
+++ b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
@@ -1,4 +1,4 @@
-From 96cb2b8095c7ac9d211f0abc6704b769344a8afa Mon Sep 17 00:00:00 2001
+From 8550922eda8dc401a3059c1e9eb2d70a359cb8a9 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Thu, 9 Oct 2008 15:51:35 -0400
 Subject: [PATCH 2/2] add ps2 targets to config.sub
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] add ps2 targets to config.sub
  1 files changed, 20 insertions(+), 2 deletions(-)
 
 diff --git a/config.sub b/config.sub
-index 8ca084b..3243784 100755
+index c2d1257..4c0d959 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -251,7 +251,7 @@ case $basic_machine in
+@@ -252,7 +252,7 @@ case $basic_machine in
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  	| bfin \
  	| c4x | clipper \
@@ -20,7 +20,7 @@ index 8ca084b..3243784 100755
  	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
-@@ -747,6 +747,24 @@ case $basic_machine in
+@@ -752,6 +752,24 @@ case $basic_machine in
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -45,15 +45,15 @@ index 8ca084b..3243784 100755
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -1296,7 +1314,7 @@ case $os in
+@@ -1305,7 +1323,7 @@ case $os in
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
 -- 
-1.6.4
+1.6.6.1
 
diff --git a/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch b/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch
deleted file mode 100644
index 4b707318c77d..000000000000
--- a/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-the test relies on `uname -m`, so it'll fail on non-i386 systems
-
-diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
-index 7f6f214..189b067 100644
---- a/testsuite/config-guess.data
-+++ b/testsuite/config-guess.data
-@@ -32,8 +32,6 @@ xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu
- x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
- i386	1.0			MINGW		ignored	i386-pc-mingw32
- SX-8R	1.0			SUPER-UX	ignored	sx8r-nec-superux1.0
--i86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
--i86pc	5.6			SunOS		ignored	i386-pc-solaris2.6
- IA64	6.0			Interix		ignored	ia64-unknown-interix6.0
- BePC	1.0			Haiku		ignored	i586-pc-haiku
- padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu