Added fix for bug #29845 and fixed gdb-6.0 compile on sparc.

4 files changed, 23 insertions, 15 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 9a095b552691..ab688afc9f31 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.25 2003/10/17 16:39:40 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.26 2003/10/18 21:34:47 weeve Exp $
+
+  18 Oct 2003; Jason Wever <weeve@gentoo.org> gdb-5.3.90.ebuild,
+  gdb-6.0.ebuild:
+  Added fix for bug #29845 and fixed gdb-6.0 compile on sparc.
 
 *gdb-6.0 (17 Oct 2003)
 
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index f1146b091e96..d9ff85a24a96 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,20 +1,20 @@
-MD5 62f9d1a8416bf3f5f9e4465e66ff93b9 gdb-5.3.90.ebuild 2978
-MD5 7356058590782a9eb65eb1c8375e324e gdb-6.0.ebuild 1681
+MD5 9b31a1d0d6adf6274afa29ba07622ed7 ChangeLog 4381
 MD5 eab96cc13d008c4d03d29f4694315593 gdb-5.1.1-r2.ebuild 1846
 MD5 f20c111afc14048091c5901c32e7a56f gdb-5.2.1.ebuild 1579
+MD5 ecb02c2427fdd221dcfb65d85503e334 gdb-5.3.90.ebuild 2975
 MD5 99a9b0b2f90ab35d725563e417066d11 gdb-5.3.ebuild 2377
-MD5 01bf86657734bc9bd553078af4ecabb4 ChangeLog 4235
-MD5 5b0433c121b92f2a35c2106bbf45bbb9 files/gdb-5.3-hppa-03.patch 2678
-MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
+MD5 fa2c02352eec9c9806f528e9cc68812f gdb-6.0.ebuild 1770
+MD5 c9906583fd4286272dff5fd2503ebe39 files/digest-gdb-5.1.1-r2 63
 MD5 263738287571b63dd7bb69d3d5d50e04 files/digest-gdb-5.2.1 64
-MD5 e497ab2f05d847bde74f4e3441e2c7a2 files/gdb-6.0-coreutils.patch 1964
+MD5 2e43a9ed1afd8f8047e7b752b95f0c12 files/digest-gdb-5.3 128
+MD5 9b0c6e2a754a741a6cd20cacea4f408b files/digest-gdb-5.3.90 158
 MD5 734c7bb9c66275fa7982d104905234da files/gdb-5.1.1-ppc-booltypes.patch 994
+MD5 ca7cf8e4b2eba16df1842e0a453e2b32 files/gdb-5.3-hppa-01.patch 182179
+MD5 d5314bcbc29fb3ce8351caa3a501c351 files/gdb-5.3-hppa-02.patch 926
+MD5 5b0433c121b92f2a35c2106bbf45bbb9 files/gdb-5.3-hppa-03.patch 2678
 MD5 1de0e1b91ac150426719e904f0e1a5cd files/gdb-5.3-sparc-nat-asm.patch 521
 MD5 4d383b990c22a7f0ee0d4a1679b82d20 files/man.diff 607
-MD5 2e43a9ed1afd8f8047e7b752b95f0c12 files/digest-gdb-5.3 128
 MD5 420712ede2a47fedcae76b6f6215b9d4 files/digest-gdb-6.0 62
-MD5 ca7cf8e4b2eba16df1842e0a453e2b32 files/gdb-5.3-hppa-01.patch 182179
-MD5 c9906583fd4286272dff5fd2503ebe39 files/digest-gdb-5.1.1-r2 63
+MD5 e497ab2f05d847bde74f4e3441e2c7a2 files/gdb-6.0-coreutils.patch 1964
+MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
 MD5 adbe09f334ca5267284ca9404400d2f5 files/gdb-6.0-threadver-aug2003.patch 4081
-MD5 9b0c6e2a754a741a6cd20cacea4f408b files/digest-gdb-5.3.90 158
-MD5 d5314bcbc29fb3ce8351caa3a501c351 files/gdb-5.3-hppa-02.patch 926
diff --git a/sys-devel/gdb/gdb-5.3.90.ebuild b/sys-devel/gdb/gdb-5.3.90.ebuild
index aace31c15aad..ede91d4292f3 100644
--- a/sys-devel/gdb/gdb-5.3.90.ebuild
+++ b/sys-devel/gdb/gdb-5.3.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-5.3.90.ebuild,v 1.4 2003/10/16 16:32:32 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-5.3.90.ebuild,v 1.5 2003/10/18 21:34:47 weeve Exp $
 
 IUSE="nls objc"
 
@@ -64,7 +64,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${PN}-5.3-sparc-nat-asm.patch
 	fi
 
-	if [ -n "`use objc`" -a -n "${SNAPSHOT}" ]
+	if [ -n "`use objc`" -a -z "${SNAPSHOT}" ]
 	then
 		cd ${WORKDIR}
 		unpack gdb-5_3-objc-patch.tgz
diff --git a/sys-devel/gdb/gdb-6.0.ebuild b/sys-devel/gdb/gdb-6.0.ebuild
index 59903f7d524a..098425e438b7 100644
--- a/sys-devel/gdb/gdb-6.0.ebuild
+++ b/sys-devel/gdb/gdb-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.0.ebuild,v 1.1 2003/10/17 16:39:40 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.0.ebuild,v 1.2 2003/10/18 21:34:47 weeve Exp $
 
 IUSE="nls"
 
@@ -25,6 +25,10 @@ src_unpack() {
 	epatch ${FILESDIR}/gdb-6.0-threadver-aug2003.patch
 	epatch ${FILESDIR}/gdb-6.0-coreutils.patch
 	epatch ${FILESDIR}/gdb-6.0-info.patch
+
+	if [ "${ARCH}" = "sparc" ]; then
+		epatch ${FILESDIR}/${PN}-5.3-sparc-nat-asm.patch
+	fi
 }
 
 src_compile() {