Fix sparc-multilib in binutils.

4 files changed, 8 insertions, 32 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index 9a0a8c5c46c5..b81be1f8bd77 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,11 +1,10 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.172 2004/12/11 06:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.173 2004/12/12 01:34:04 eradicator Exp $
 
   10 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/2.15/10_sparc_binutils-sparc64-multilib.patch,
   binutils-2.15.92.0.2-r1.ebuild:
-  Updated for sparc64-multilib.  Added patch to properly detect sparc64b CHOST.
+  Updated for sparc64-multilib.
 
 *binutils-2.15.90.0.1.1-r4 (04 Dec 2004)
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 536b477ecc97..be86e2a2c3b5 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2bb6cab8d6cfe476837f82b3dbb34ee9 ChangeLog 37743
+MD5 a105f0967ab858d5a2153e1bd4ceb39f ChangeLog 37639
 MD5 5592af01b4edd8259ffab688578acdb0 binutils-2.15.94.0.1.ebuild 441
 MD5 9e9aaba5c0f359d4fd788d985248f49e binutils-2.14.90.0.6-r8.ebuild 435
 MD5 3d0d31288270f1f9adedea59a72c7fa7 binutils-2.15.90.0.1.1-r4.ebuild 488
@@ -15,7 +15,7 @@ MD5 0c25a829197c155f46205e5a23ea4e16 binutils-2.15.90.0.3-r3.ebuild 4975
 MD5 0a2e87d8fa7ba203b47fc8f5c795ec42 binutils-2.15.91.0.1.ebuild 4707
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 47b50dfab666ec01e53e417deeb957d5 binutils-2.15.91.0.2.ebuild 5161
-MD5 623a14f1b810af79b96943de6aaf2648 binutils-2.15.92.0.2-r1.ebuild 5407
+MD5 61ee77bb57493d94a7adcf348905229e binutils-2.15.92.0.2-r1.ebuild 5307
 MD5 8903d93c82472f0a22bfdcac81fda9fb files/digest-binutils-2.15.92.0.2-r2 249
 MD5 6c06201fe991e098f44f6f75dd5d53f4 files/digest-binutils-2.15 68
 MD5 e3effee7a8054f5e0344034c596cb6fc files/binutils-2.14.amd64-32bit-path-fix.patch 456
@@ -82,11 +82,10 @@ MD5 8dfe15fc6599a60b3330ab9fdabaf60f files/2.14/binutils-2.14.90.0.6-debian.patc
 MD5 8f619fc0c409a5ba768f126f172ee6bc files/2.15/05_all_binutils-2.15-elf32-arm-textrel.patch 2009
 MD5 bad6ba9f63eb3a86d7006191848a47b8 files/2.15/52_all_binutils-20040527-uclibc-100-conf.patch 21576
 MD5 907ce8c972e2a984590d4bfc04181c1d files/2.15/40_all_binutils-uclibc-linker.patch 530
-MD5 9c5782a322eafe22ead93694ff654dfe files/2.15/10_sparc_binutils-sparc64-multilib.patch 907
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBupC/ArHZZzCEUG0RAt50AJ9JV5jpq56WHqBTiu069J/+LdiYEwCeL2LJ
-2wprC+b0fPJ0fLviAaA3idU=
-=9Iiq
+iD8DBQFBu6AXArHZZzCEUG0RAq/aAKCADqla8ibi2TzsrOSWM+vSlte+kwCfQLnT
+DpB50mDG+OyQxJQkUlXj1tQ=
+=/Cs0
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild b/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild
index 692ba27ce00f..203dae2f7e86 100644
--- a/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.16 2004/12/11 06:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.17 2004/12/12 01:34:04 eradicator Exp $
 
 inherit eutils libtool flag-o-matic gnuconfig
 
@@ -46,9 +46,6 @@ src_unpack() {
 		rm -rf ${x}.orig
 	done
 
-	# Fix regexps in configure.host
-	epatch ${FILESDIR}/2.15/10_sparc_binutils-sparc64-multilib.patch
-
 	gnuconfig_update
 }
 
diff --git a/sys-devel/binutils/files/2.15/10_sparc_binutils-sparc64-multilib.patch b/sys-devel/binutils/files/2.15/10_sparc_binutils-sparc64-multilib.patch
deleted file mode 100644
index 895bb369c16e..000000000000
--- a/sys-devel/binutils/files/2.15/10_sparc_binutils-sparc64-multilib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- binutils-2.15.92.0.2/ld/configure.host.orig	2004-05-27 11:26:04.000000000 -0700
-+++ binutils-2.15.92.0.2/ld/configure.host	2004-12-10 18:17:33.986011492 -0800
-@@ -209,12 +209,12 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`'
-   ;;
- 
--sparc-*-linux-gnu*)
--  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib/ld-linux.so.2,"`
-+sparc64*-*-linux-gnu*)
-+  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib64/ld-linux.so.2,"`
-   ;;
- 
--sparc64-*-linux-gnu*)
--  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib64/ld-linux.so.2,"`
-+sparc*-*-linux-gnu*)
-+  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib/ld-linux.so.2,"`
-   ;;
- 
- x86_64-*-linux-gnu*)