fix the uclibc patch rather than patching a patch

(Portage version: 2.0.51.21-r1)

3 files changed, 156 insertions, 118 deletions

diff --git a/sys-devel/gdb/files/gdb-6.3-pass_all-uclibc.patch b/sys-devel/gdb/files/gdb-6.3-pass_all-uclibc.patch
deleted file mode 100644
index 1d8f6a92b3c1..000000000000
--- a/sys-devel/gdb/files/gdb-6.3-pass_all-uclibc.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- gdb-6.3/opcodes/configure.mps	2005-05-06 09:15:56 +0200
-+++ gdb-6.3/opcodes/configure	2005-05-06 09:17:25 +0200
-@@ -3577,16 +3577,15 @@
- 
- # This must be Linux ELF.
- linux-gnu*)
--  case $host_cpu in
--  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
--    lt_cv_deplibs_check_method=pass_all ;;
--  *)
--    # glibc up to 2.1.1 does not perform some relocations on ARM
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
--  esac
-+  lt_cv_deplibs_check_method=pass_all
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  ;;
-+
- netbsd* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gdb-6.3/bfd/configure.mps	2005-05-06 09:14:10 +0200
-+++ gdb-6.3/bfd/configure	2005-05-06 09:14:21 +0200
-@@ -3573,13 +3573,7 @@
- 
- # This must be Linux ELF.
- linux-gnu*)
--  case $host_cpu in
--  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
--    lt_cv_deplibs_check_method=pass_all ;;
--  *)
--    # glibc up to 2.1.1 does not perform some relocations on ARM
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
--  esac
-+  lt_cv_deplibs_check_method=pass_all
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
---- gdb-6.3/libtool.m4.mps	2005-05-06 09:10:28 +0200
-+++ gdb-6.3/libtool.m4	2005-05-06 09:11:30 +0200
-@@ -635,19 +635,14 @@
- 
- # This must be Linux ELF.
- linux-gnu*)
--  case $host_cpu in
--  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
--    lt_cv_deplibs_check_method=pass_all ;;
--  *)
--    # glibc up to 2.1.1 does not perform some relocations on ARM
--    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
--  esac
-+  lt_cv_deplibs_check_method=pass_all
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
- linux-uclibc*)
-   lt_cv_deplibs_check_method=pass_all
-   lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  ;;
- 
- netbsd* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
diff --git a/sys-devel/gdb/files/gdb-6.3-uclibc.patch b/sys-devel/gdb/files/gdb-6.3-uclibc.patch
index d292f6e23a89..cc69ff33bd82 100644
--- a/sys-devel/gdb/files/gdb-6.3-uclibc.patch
+++ b/sys-devel/gdb/files/gdb-6.3-uclibc.patch
@@ -1,79 +1,78 @@
-diff -Nrup gdb-6.3.orig/bfd/config.bfd gdb-6.3/bfd/config.bfd
---- gdb-6.3.orig/bfd/config.bfd	2004-10-15 01:47:11.000000000 -0400
-+++ gdb-6.3/bfd/config.bfd	2004-11-27 20:15:57.000000000 -0500
-@@ -129,7 +129,7 @@ case "${targ}" in
+--- gdb-6.3/bfd/config.bfd.orig	Fri Oct 15 07:47:11 2004
++++ gdb-6.3/bfd/config.bfd	Mon Feb 28 00:04:43 2005
+@@ -129,7 +129,7 @@
      targ_defvec=ecoffalpha_little_vec
      targ_selvecs=bfd_elf64_alpha_vec
      ;;
 -  alpha*-*-linux-gnu* | alpha*-*-elf*)
-+  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*)
++  alpha*-*-linux-* | alpha*-*-elf*)
      targ_defvec=bfd_elf64_alpha_vec
      targ_selvecs=ecoffalpha_little_vec
      ;;
-@@ -139,7 +139,7 @@ case "${targ}" in
+@@ -139,7 +139,7 @@
    alpha*-*-*)
      targ_defvec=ecoffalpha_little_vec
      ;;
 -  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
-+  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu | ia64*-*-linux-uclibc*)
++  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
      targ_defvec=bfd_elf64_ia64_little_vec
      targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
      ;;
-@@ -216,7 +216,7 @@ case "${targ}" in
+@@ -216,7 +216,7 @@
      targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
 -  armeb-*-elf | arm*b-*-linux-gnu*)
-+  armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*)
++  armeb-*-elf | arm*b-*-linux-*)
      targ_defvec=bfd_elf32_bigarm_vec
      targ_selvecs=bfd_elf32_littlearm_vec
      ;;
-@@ -225,7 +225,7 @@ case "${targ}" in
+@@ -224,7 +224,7 @@
+     targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
-   arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
--  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
-+  arm*-*-uclinux* | arm*-*-linux-uclibc* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
+-  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
++  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
    arm*-*-eabi* )
      targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-@@ -378,7 +378,7 @@ case "${targ}" in
+@@ -378,7 +378,7 @@
      ;;
  
  #ifdef BFD64
 -  hppa*64*-*-linux-gnu*)
-+  hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*)
++  hppa*64*-*-linux-*)
      targ_defvec=bfd_elf64_hppa_linux_vec
      targ_selvecs=bfd_elf64_hppa_vec
      ;;
-@@ -389,7 +389,7 @@ case "${targ}" in
+@@ -389,7 +389,7 @@
      ;;
  #endif
  
 -  hppa*-*-linux-gnu*)
-+  hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*)
++  hppa*-*-linux-*)
      targ_defvec=bfd_elf32_hppa_linux_vec
      targ_selvecs=bfd_elf32_hppa_vec
      ;;
-@@ -522,7 +522,7 @@ case "${targ}" in
+@@ -522,7 +522,7 @@
      targ_selvecs=bfd_elf32_i386_vec
      targ_underscore=yes
      ;;
 -  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
++  i[3-7]86-*-linux-*)
      targ_defvec=bfd_elf32_i386_vec
      targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
      targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -536,7 +536,7 @@ case "${targ}" in
+@@ -536,7 +536,7 @@
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
      ;;
 -  x86_64-*-linux-gnu*)
-+  x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*)
++  x86_64-*-linux-*)
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
      ;;
-@@ -706,7 +706,7 @@ case "${targ}" in
+@@ -706,7 +706,7 @@
      targ_defvec=hp300hpux_vec
      targ_underscore=yes
      ;;
@@ -82,64 +81,156 @@ diff -Nrup gdb-6.3.orig/bfd/config.bfd gdb-6.3/bfd/config.bfd
      targ_defvec=m68klinux_vec
      targ_selvecs=bfd_elf32_m68k_vec
      targ_underscore=yes
-@@ -987,8 +987,8 @@ case "${targ}" in
+@@ -987,7 +987,7 @@
      ;;
  #endif
    powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
 -  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
--  powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
-+  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | powerpc-*-rtems* | \
-+  powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss* )
++  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
+   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
      targ_defvec=bfd_elf32_powerpc_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-     targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1024,8 +1024,8 @@ case "${targ}" in
+@@ -1024,7 +1024,7 @@
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
      ;;
    powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
 -  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
--  powerpcle-*-rtems*)
-+  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* | \
-+  powerpcle-*-vxworks* | powerpcle-*-rtems*)
++  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks* |\
+   powerpcle-*-rtems*)
      targ_defvec=bfd_elf32_powerpcle_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-     targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1192,7 +1192,7 @@ case "${targ}" in
+@@ -1192,7 +1192,7 @@
      targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
      targ_underscore=yes
      ;;
 -  sparc-*-linux-gnu*)
-+  sparc-*-linux-gnu* | sparc-*-linux-uclibc*)
++  sparc-*-linux-*)
      targ_defvec=bfd_elf32_sparc_vec
      targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
      ;;
-@@ -1239,7 +1239,7 @@ case "${targ}" in
+@@ -1239,7 +1239,7 @@
      targ_defvec=sunos_big_vec
      targ_underscore=yes
      ;;
 -  sparc64-*-linux-gnu*)
-+  sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*)
++  sparc64-*-linux-*)
      targ_defvec=bfd_elf64_sparc_vec
      targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
      ;;
-diff -Nrup gdb-6.3.orig/libtool.m4 gdb-6.3/libtool.m4
---- gdb-6.3.orig/libtool.m4	2004-07-21 15:21:41.000000000 -0400
-+++ gdb-6.3/libtool.m4	2004-11-27 20:12:48.000000000 -0500
-@@ -645,6 +645,10 @@ linux-gnu*)
+@@ -1308,7 +1308,7 @@
+     targ_underscore=yes
+     ;;
+ 
+-  vax-*-linux-gnu*)
++  vax-*-linux-*)
+     targ_defvec=bfd_elf32_vax_vec
+     ;;
+ 
+--- gdb-6.3/bfd/configure.orig	Fri Oct  8 16:53:56 2004
++++ gdb-6.3/bfd/configure	Sun Feb 27 18:32:58 2005
+@@ -3583,6 +3583,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
  
 +linux-uclibc*)
 +  lt_cv_deplibs_check_method=pass_all
 +  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
 +
  netbsd* | knetbsd*-gnu)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-diff -Nrup gdb-6.3.orig/ltconfig gdb-6.3/ltconfig
---- gdb-6.3.orig/ltconfig	2004-10-05 09:34:42.000000000 -0400
-+++ gdb-6.3/ltconfig	2004-11-27 20:01:13.000000000 -0500
-@@ -602,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+@@ -9914,7 +9919,7 @@
+   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+ 	COREFILE=''
+ 	;;
+-  alpha*-*-linux-gnu*)
++  alpha*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/alphalinux.h"'
+ 	;;
+@@ -9978,7 +9983,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386mach3.h"'
+ 	;;
+-  i[3-7]86-*-linux-gnu*)
++  i[3-7]86-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386linux.h"'
+ 	;;
+@@ -10016,7 +10021,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/hp300bsd.h"'
+ 	;;
+-  m68*-*-linux-gnu*)
++  m68*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/m68klinux.h"'
+ 	;;
+@@ -10150,7 +10155,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxult2.h"'
+ 	;;
+-  vax-*-linux-gnu*)
++  vax-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxlinux.h"'
+ 	;;
+--- gdb-6.3/bfd/configure.in.orig	Fri Oct  8 16:53:59 2004
++++ gdb-6.3/bfd/configure.in	Sun Feb 27 18:14:41 2005
+@@ -163,7 +163,7 @@
+   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+ 	COREFILE=''
+ 	;;
+-  alpha*-*-linux-gnu*)
++  alpha*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/alphalinux.h"'
+ 	;;
+@@ -248,7 +248,7 @@
+ 	TRAD_HEADER='"hosts/i386mach3.h"'
+ 	;;
+ changequote(,)dnl
+-  i[3-7]86-*-linux-gnu*)
++  i[3-7]86-*-linux-*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386linux.h"'
+@@ -289,7 +289,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/hp300bsd.h"'
+ 	;;
+-  m68*-*-linux-gnu*)
++  m68*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/m68klinux.h"'
+ 	;;
+@@ -375,7 +375,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxult2.h"'
+ 	;;
+-  vax-*-linux-gnu*)
++  vax-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxlinux.h"'
+ 	;;
+--- gdb-6.3/libtool.m4.orig	Wed Jul 21 21:21:41 2004
++++ gdb-6.3/libtool.m4	Mon Feb 28 00:08:11 2005
+@@ -653,6 +653,11 @@
+   fi
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
++
+ newsos6)
+   [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+   lt_cv_file_magic_cmd=/usr/bin/file
+--- gdb-6.3/ltconfig.orig	Tue Oct  5 15:34:42 2004
++++ gdb-6.3/ltconfig	Sun Feb 27 18:14:41 2005
+@@ -602,7 +602,7 @@
  
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
  case $host_os in
@@ -148,7 +239,7 @@ diff -Nrup gdb-6.3.orig/ltconfig gdb-6.3/ltconfig
  linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
  esac
  
-@@ -1270,6 +1270,24 @@ linux-gnu*)
+@@ -1270,6 +1270,24 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -173,3 +264,17 @@ diff -Nrup gdb-6.3.orig/ltconfig gdb-6.3/ltconfig
  netbsd*)
    need_lib_prefix=no
    need_version=no
+--- gdb-6.3/opcodes/configure.orig	Fri Sep 17 08:13:38 2004
++++ gdb-6.3/opcodes/configure	Mon Feb 28 00:09:42 2005
+@@ -3595,6 +3595,11 @@
+   fi
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
++
+ newsos6)
+   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+   lt_cv_file_magic_cmd=/usr/bin/file
diff --git a/sys-devel/gdb/gdb-6.3-r3.ebuild b/sys-devel/gdb/gdb-6.3-r3.ebuild
index efa6a447d397..389f27d230ef 100644
--- a/sys-devel/gdb/gdb-6.3-r3.ebuild
+++ b/sys-devel/gdb/gdb-6.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r3.ebuild,v 1.8 2005/05/06 19:07:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r3.ebuild,v 1.9 2005/05/12 11:35:52 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -49,10 +49,9 @@ src_unpack() {
 	# sec bug 91398
 	epatch "${FILESDIR}"/bfd-malloc-wrap.patch
 
-	epatch ${FILESDIR}/gdb-6.2.1-200-uclibc-readline-conf.patch
-	epatch ${FILESDIR}/gdb-6.2.1-400-mips-coredump.patch
-	epatch ${FILESDIR}/gdb-6.2.1-libiberty-pic.patch
-	epatch ${FILESDIR}/gdb-6.3-pass_all-uclibc.patch
+	epatch "${FILESDIR}"/gdb-6.2.1-200-uclibc-readline-conf.patch
+	epatch "${FILESDIR}"/gdb-6.2.1-400-mips-coredump.patch
+	epatch "${FILESDIR}"/gdb-6.2.1-libiberty-pic.patch
 
 	strip-linguas -u bfd/po opcodes/po
 }