- stable on arm #91654 - cleanup most vuln non stabilized versions of gdb

Package-Manager: portage-2.0.51.21

15 files changed, 40 insertions, 503 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 50cd42feae9f..f721408642cf 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.76 2005/05/15 19:47:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.77 2005/05/15 21:55:35 solar Exp $
+
+*gdb-6.2.1-r1 (15 May 2005)
+
+  15 May 2005; <solar@gentoo.org> -gdb-6.0-r1.ebuild, -gdb-6.0.ebuild,
+  -gdb-6.1.1.ebuild, -gdb-6.2.1-r1.ebuild, -gdb-6.2.ebuild, gdb-6.3-r3.ebuild,
+  -gdb-6.3.ebuild:
+  - stable on arm #91654 - cleanup most vuln non stabilized versions of gdb
 
   15 May 2005; <plasmaroo@gentoo.org> gdb-6.3-r3.ebuild:
   Stable on IA64, bug #91654.
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c325a95a4e2d..a951a375fd13 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,38 +1,38 @@
-MD5 144e71caf7eea917b1cff49ca34accff ChangeLog 10992
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 93827ee04453324bacd51781cf0c9246 gdb-6.3-r3.ebuild 2997
 MD5 fb4ab4aaccb90b523c650a5f30d02281 gdb-6.2.1.ebuild 1784
-MD5 57458d1a8413bf3f90849fb93f2747d5 gdb-6.3.ebuild 2446
-MD5 e0f3ee7e8ce992eefd2302af54b33d6a gdb-6.0.ebuild 1906
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 4fd3e363d0a40676217df9b0faee4d80 gdb-6.2.1-r1.ebuild 1928
-MD5 686556423ec5590d0341718d4a545189 gdb-6.1.1.ebuild 1850
+MD5 29d655fc1180322331d1ea21f429d4b4 ChangeLog 11263
 MD5 2a52c4cd9bf5e2667c6bc7312e179fa0 gdb-6.1.ebuild 1807
-MD5 44fe1e6f031c991736e4ea4b17697926 gdb-6.2.ebuild 1782
-MD5 943e7fcaab51f8a013fbf508a6a37623 gdb-6.3-r3.ebuild 2996
-MD5 c2e11638acab3f11b88466a4f261eacc gdb-6.0-r1.ebuild 2043
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
 MD5 d3ab2683d88b3cbecb8a9faa439703a1 files/bfd-malloc-wrap.patch 782
-MD5 c7d303fad9794b8a463bddf3c43737e5 files/gdb-6.2.1-200-uclibc-readline-conf.patch 586
-MD5 bcc4ae6718ad45a97ca7822df03bb8af files/digest-gdb-6.2 131
-MD5 0ddba28928cd6fa87537312ddfa9d5ee files/gdb-6.3-gdbinit-stat.patch 431
-MD5 6516e95e4ed8409e4173d7f1f66f03b8 files/digest-gdb-6.3-r3 183
+MD5 7ea8f83bb7b0d70e7e6d6c8cf42292d3 files/gdb-6.x-crash.patch 678
+MD5 dc01eff75d7495a2159e2ff9fc48f164 files/gdb-6.0-xfreemod-all.patch 1599
+MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1 133
 MD5 e497ab2f05d847bde74f4e3441e2c7a2 files/gdb-6.0-coreutils.patch 1964
-MD5 2560a7e81574df415f79e0798503ecc0 files/digest-gdb-6.3 121
-MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
-MD5 374352fdf0b1516a88eeaf0a921a2208 files/gdb-6.2.1-relative-paths.patch 3499
-MD5 2657b597618d0c35b48f47e3f808d171 files/gdb-6.3-relative-paths.patch 3286
-MD5 cc65dade388e6a21b5858b146f52b6eb files/gdb-6.1-uclibc.patch 6363
-MD5 a4610ec65e88f73e0b00b525467a5372 files/gdb-6.3-scanmem.patch 6652
-MD5 adbe09f334ca5267284ca9404400d2f5 files/gdb-6.0-threadver-aug2003.patch 4081
 MD5 37007f485c9f93564f99675e59b65e7f files/gdb-6.2.1-pass-libdir.patch 300
-MD5 9b939edb72d0e54160869b48f2ebc080 files/gdb-6.2.1-400-mips-coredump.patch 736
-MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1 133
-MD5 8b7f5c46b8dabbc9239c37f52278b971 files/gdb-6.3-uclibc.patch 8221
 MD5 1de0e1b91ac150426719e904f0e1a5cd files/gdb-5.3-sparc-nat-asm.patch 521
-MD5 c87a4627da2b7a05406088f51237e5b4 files/digest-gdb-6.0-r1 127
-MD5 31dd65bca08d42b0b7cdb61c53fd647f files/gdb-6.2.1-libiberty-pic.patch 370
-MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1-r1 133
+MD5 c7d303fad9794b8a463bddf3c43737e5 files/gdb-6.2.1-200-uclibc-readline-conf.patch 586
+MD5 cc65dade388e6a21b5858b146f52b6eb files/gdb-6.1-uclibc.patch 6363
+MD5 9b939edb72d0e54160869b48f2ebc080 files/gdb-6.2.1-400-mips-coredump.patch 736
+MD5 a4610ec65e88f73e0b00b525467a5372 files/gdb-6.3-scanmem.patch 6652
+MD5 2657b597618d0c35b48f47e3f808d171 files/gdb-6.3-relative-paths.patch 3286
+MD5 0ddba28928cd6fa87537312ddfa9d5ee files/gdb-6.3-gdbinit-stat.patch 431
+MD5 374352fdf0b1516a88eeaf0a921a2208 files/gdb-6.2.1-relative-paths.patch 3499
 MD5 460629563df21e6a68b8941c07d4f30b files/digest-gdb-6.1 131
-MD5 7ea8f83bb7b0d70e7e6d6c8cf42292d3 files/gdb-6.x-crash.patch 678
-MD5 688c499ca8b7c9006c978595fe5461a7 files/digest-gdb-6.1.1 133
+MD5 adbe09f334ca5267284ca9404400d2f5 files/gdb-6.0-threadver-aug2003.patch 4081
 MD5 1da0dcdbff7ba48a06350a28ecdd238e files/gdb-6.1-ppc64-01.patch 359
-MD5 dc01eff75d7495a2159e2ff9fc48f164 files/gdb-6.0-xfreemod-all.patch 1599
-MD5 420712ede2a47fedcae76b6f6215b9d4 files/digest-gdb-6.0 62
+MD5 6516e95e4ed8409e4173d7f1f66f03b8 files/digest-gdb-6.3-r3 183
+MD5 31dd65bca08d42b0b7cdb61c53fd647f files/gdb-6.2.1-libiberty-pic.patch 370
+MD5 8b7f5c46b8dabbc9239c37f52278b971 files/gdb-6.3-uclibc.patch 8221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQofE4Z4WFLgrx1GWAQJrWgP+JJ+y07tKWAlj9IL3Ou8Zeu1VONeC9o5l
+yyCmcCb5L2tuCxs77U8EMVE7+H7peC1lqjlAi/WzOp7/phZT0qGnWjNXj/SOLvB7
+fijWJyKReQr30qicAvOTjjn+X7yxF2a4tHNn0uwIU0vHeyLK2GkaNA/y+6nQPvAm
+OgxP4YVMtNk=
+=7ea9
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/files/digest-gdb-6.0 b/sys-devel/gdb/files/digest-gdb-6.0
deleted file mode 100644
index 87d17858b44f..000000000000
--- a/sys-devel/gdb/files/digest-gdb-6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14371795b7903b816a6a88c69cace168 gdb-6.0.tar.bz2 11965008
diff --git a/sys-devel/gdb/files/digest-gdb-6.0-r1 b/sys-devel/gdb/files/digest-gdb-6.0-r1
deleted file mode 100644
index 111c1740f323..000000000000
--- a/sys-devel/gdb/files/digest-gdb-6.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 14371795b7903b816a6a88c69cace168 gdb-6.0.tar.bz2 11965008
-MD5 e9a198cbe3a3188fd75eb25ce4293d31 gdb-xfreemod-6.0.diff 29705
diff --git a/sys-devel/gdb/files/digest-gdb-6.1.1 b/sys-devel/gdb/files/digest-gdb-6.1.1
deleted file mode 100644
index ab90b23d6948..000000000000
--- a/sys-devel/gdb/files/digest-gdb-6.1.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dd25473f61a3a2e1b08dee5f67ebae28 gdb-6.1.1.tar.bz2 12586670
-MD5 3e0f43b95685125b20fc866c88d1d122 gdb-6.1-hppa-01.patch.bz2 41093
diff --git a/sys-devel/gdb/files/digest-gdb-6.2 b/sys-devel/gdb/files/digest-gdb-6.2
deleted file mode 100644
index ec8405943438..000000000000
--- a/sys-devel/gdb/files/digest-gdb-6.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 01871f7667345262e317a1e6e1a32768 gdb-6.2.tar.bz2 12819441
-MD5 3e0f43b95685125b20fc866c88d1d122 gdb-6.1-hppa-01.patch.bz2 41093
diff --git a/sys-devel/gdb/files/digest-gdb-6.2.1-r1 b/sys-devel/gdb/files/digest-gdb-6.2.1-r1
deleted file mode 100644
index 3a21f125fbfc..000000000000
--- a/sys-devel/gdb/files/digest-gdb-6.2.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3b3898cfd426e1acd5efc89560aa93ba gdb-6.2.1.tar.bz2 12820148
-MD5 3e0f43b95685125b20fc866c88d1d122 gdb-6.1-hppa-01.patch.bz2 41093
diff --git a/sys-devel/gdb/files/digest-gdb-6.3 b/sys-devel/gdb/files/digest-gdb-6.3
deleted file mode 100644
index 3d22e6917604..000000000000
--- a/sys-devel/gdb/files/digest-gdb-6.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 05b928f41fa5b482e49ca2c24762a0ae gdb-6.3.tar.bz2 13446729
-MD5 35e70c29e393433b3847527d808f59c2 gdb_init.txt.bz2 6247
diff --git a/sys-devel/gdb/gdb-6.0-r1.ebuild b/sys-devel/gdb/gdb-6.0-r1.ebuild
deleted file mode 100644
index 6db83db62995..000000000000
--- a/sys-devel/gdb/gdb-6.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.0-r1.ebuild,v 1.8 2005/01/11 21:14:19 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-		http://www.logix.cz/michal/devel/gdb-xfreemod/gdb-xfreemod-${PV}.diff"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls test"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gdb-6.0-threadver-aug2003.patch
-	epatch ${FILESDIR}/gdb-6.0-coreutils.patch
-	epatch ${FILESDIR}/gdb-6.0-info.patch
-	cd ${S}/gdb
-	epatch ${DISTDIR}/gdb-xfreemod-${PV}.diff
-	epatch ${FILESDIR}/gdb-6.0-xfreemod-all.patch
-	cd ${S}
-	if [ "${ARCH}" = "sparc" ]; then
-		epatch ${FILESDIR}/${PN}-5.3-sparc-nat-asm.patch
-	fi
-}
-
-src_compile() {
-	replace-flags -O? -O2
-	econf $(use_enable nls) || die
-	make || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
-		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
-
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
-
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
-
-	# These includes and libs are in binutils already
-	rm -f ${D}/usr/lib/libbfd.*
-	rm -f ${D}/usr/lib/libiberty.*
-	rm -f ${D}/usr/lib/libopcodes.*
-	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
-}
diff --git a/sys-devel/gdb/gdb-6.0.ebuild b/sys-devel/gdb/gdb-6.0.ebuild
deleted file mode 100644
index 7819281af2b7..000000000000
--- a/sys-devel/gdb/gdb-6.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.0.ebuild,v 1.18 2005/01/11 21:14:19 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 -hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="nls test"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gdb-6.0-threadver-aug2003.patch
-	epatch ${FILESDIR}/gdb-6.0-coreutils.patch
-	epatch ${FILESDIR}/gdb-6.0-info.patch
-	[ "${ARCH}" = "sparc" ] && epatch ${FILESDIR}/${PN}-5.3-sparc-nat-asm.patch
-	strip-linguas -u bfd/po opcodes/po
-}
-
-src_compile() {
-	replace-flags -O? -O2
-	econf $(use_enable nls) || die
-	make || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
-		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
-
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
-
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
-
-	# These includes and libs are in binutils already
-	rm -f ${D}/usr/lib/libbfd.*
-	rm -f ${D}/usr/lib/libiberty.*
-	rm -f ${D}/usr/lib/libopcodes.*
-	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
-}
diff --git a/sys-devel/gdb/gdb-6.1.1.ebuild b/sys-devel/gdb/gdb-6.1.1.ebuild
deleted file mode 100644
index c523fcbce772..000000000000
--- a/sys-devel/gdb/gdb-6.1.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.1.1.ebuild,v 1.15 2005/01/11 21:14:19 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha arm hppa ~ppc64 sparc ~x86"
-IUSE="nls test"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gdb-6.1-ppc64-01.patch
-	epatch ${WORKDIR}/gdb-6.1-hppa-01.patch
-	epatch ${FILESDIR}/gdb-6.1-uclibc.patch
-	strip-linguas -u bfd/po opcodes/po
-}
-
-src_compile() {
-	replace-flags -O? -O2
-	econf $(use_enable nls) || die
-	make || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
-		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
-
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
-
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
-
-	# These includes and libs are in binutils already
-	rm -f ${D}/usr/lib/libbfd.*
-	rm -f ${D}/usr/lib/libiberty.*
-	rm -f ${D}/usr/lib/libopcodes.*
-	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
-}
diff --git a/sys-devel/gdb/gdb-6.2.1-r1.ebuild b/sys-devel/gdb/gdb-6.2.1-r1.ebuild
deleted file mode 100644
index e2d3d22ba6b6..000000000000
--- a/sys-devel/gdb/gdb-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.2.1-r1.ebuild,v 1.4 2005/01/11 21:14:19 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 -sparc ~x86"
-IUSE="nls test"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gdb-6.1-uclibc.patch
-	epatch ${FILESDIR}/gdb-6.2.1-relative-paths.patch
-	epatch ${FILESDIR}/gdb-6.x-crash.patch
-	epatch ${FILESDIR}/gdb-6.2.1-pass-libdir.patch
-	strip-linguas -u bfd/po opcodes/po
-}
-
-src_compile() {
-	replace-flags -O? -O2
-	econf $(use_enable nls) || die
-	make || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
-		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
-
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
-
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
-
-	# These includes and libs are in binutils already
-	rm -f ${D}/usr/lib/libbfd.*
-	rm -f ${D}/usr/lib/libiberty.*
-	rm -f ${D}/usr/lib/libopcodes.*
-	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
-}
diff --git a/sys-devel/gdb/gdb-6.2.ebuild b/sys-devel/gdb/gdb-6.2.ebuild
deleted file mode 100644
index d4159e0eef76..000000000000
--- a/sys-devel/gdb/gdb-6.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.2.ebuild,v 1.9 2005/01/11 21:14:19 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ppc ~ppc64 -sparc ~x86"
-IUSE="nls test"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/gdb-6.1-uclibc.patch
-	strip-linguas -u bfd/po opcodes/po
-}
-
-src_compile() {
-	replace-flags -O? -O2
-	econf $(use_enable nls) || die
-	make || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/$(get_libdir) \
-		infodir=${D}/usr/share/info \
-		install || die "install"
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
-
-	if ! has noinfo ${FEATURES} ; then
-		cd gdb/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install doc info"
-
-		cd ${S}/bfd/doc
-		make \
-			infodir=${D}/usr/share/info \
-			install-info || die "install bfd info"
-	fi
-
-	# These includes and libs are in binutils already
-	rm -f ${D}/usr/lib/libbfd.*
-	rm -f ${D}/usr/lib/libiberty.*
-	rm -f ${D}/usr/lib/libopcodes.*
-	rm -f ${D}/usr/share/info/{bfd,configure,standards}.info*
-	rm -r ${D}/usr/share/locale
-	rm -r ${D}/usr/include
-}
diff --git a/sys-devel/gdb/gdb-6.3-r3.ebuild b/sys-devel/gdb/gdb-6.3-r3.ebuild
index 42d73e4f547a..00f99e153cdc 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.10 2005/05/15 19:47:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r3.ebuild,v 1.11 2005/05/15 21:55:35 solar Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2 LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~s390"
 IUSE="nls test"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/sys-devel/gdb/gdb-6.3.ebuild b/sys-devel/gdb/gdb-6.3.ebuild
deleted file mode 100644
index c799b5047913..000000000000
--- a/sys-devel/gdb/gdb-6.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.ebuild,v 1.14 2005/05/01 04:51:16 vapier Exp $
-
-inherit flag-o-matic eutils
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	mirror://gentoo/gdb_init.txt.bz2"
-#SRC_URI="${SRC_URI} mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ~ppc ppc64 sparc x86"
-IUSE="nls test"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gdb-6.3-uclibc.patch
-	epatch ${FILESDIR}/gdb-6.3-relative-paths.patch
-	#epatch ${FILESDIR}/gdb-6.x-crash.patch
-	epatch ${FILESDIR}/gdb-6.2.1-pass-libdir.patch
-	epatch ${FILESDIR}/gdb-6.3-scanmem.patch
-
-	cp ${WORKDIR}/gdb_init.txt ${S}/ || die
-
-	strip-linguas -u bfd/po opcodes/po
-}
-
-src_compile() {
-	replace-flags -O? -O2
-	econf $(use_enable nls) || die
-	make || die
-}
-
-src_test() {
-	make check || ewarn "tests failed"
-}
-
-src_install() {
-	make \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		libdir="${D}"/nukeme includedir="${D}"/nukeme \
-		install || die "install"
-	# The includes and libs are in binutils already
-	rm -r "${D}"/nukeme
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -r "${D}"/usr/share
-		return 0
-	fi
-
-	dodoc README
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/ChangeLog* gdb/TODO
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-	docinto mmalloc
-	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
-
-	if use x86; then
-		dodir /etc/skel/
-		cp "${S}"/gdb_init.txt "${D}"/etc/skel/.gdbinit \
-			|| die "install ${D}/etc/skel/.gdbinit"
-	fi
-
-	if ! has noinfo ${FEATURES} ; then
-		make -C "${S}"/gdb/doc \
-			infodir="${D}"/usr/share/info \
-			install-info || die "install doc info"
-		make -C "${S}"/bfd/doc \
-			infodir="${D}"/usr/share/info \
-			install-info || die "install bfd info"
-	fi
-}