Clean up ebuilds and add support for maketest (#68643). Also add misc patches to resolve segfaults/sandbox violations (#49582 #65404) and package collisions (#69496).

12 files changed, 394 insertions, 196 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 94711505432e..ec18d9602bf1 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.57 2004/11/04 01:58:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.58 2004/11/10 02:19:13 vapier Exp $
+
+  09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/gdb-6.2.1-pass-libdir.patch, +files/gdb-6.2.1-relative-paths.patch,
+  +files/gdb-6.x-crash.patch, gdb-6.0-r1.ebuild, gdb-6.0.ebuild,
+  gdb-6.1.1.ebuild:
+  Clean up ebuilds and add support for maketest (#68643). Also add misc
+  patches to resolve segfaults/sandbox violations (#49582 #65404) and package
+  collisions (#69496).
 
   03 Nov 2004; Joshua Kinard <kumba@gentoo.org> gdb-6.2.1.ebuild,
   gdb-6.2.ebuild:
diff --git a/sys-devel/gdb/files/digest-gdb-6.2.1-r1 b/sys-devel/gdb/files/digest-gdb-6.2.1-r1
new file mode 100644
index 000000000000..3a21f125fbfc
--- /dev/null
+++ b/sys-devel/gdb/files/digest-gdb-6.2.1-r1
@@ -0,0 +1,2 @@
+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/gdb-6.2.1-pass-libdir.patch b/sys-devel/gdb/files/gdb-6.2.1-pass-libdir.patch
new file mode 100644
index 000000000000..d9576246114d
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.2.1-pass-libdir.patch
@@ -0,0 +1,10 @@
+--- sim/Makefile.in.orig	2004-11-09 20:45:47.791471074 -0500
++++ sim/Makefile.in	2004-11-09 20:45:59.029419609 -0500
+@@ -86,6 +86,7 @@
+ 	"prefix=$(prefix)" \
+ 	"exec_prefix=$(exec_prefix)" \
+ 	"bindir=$(bindir)" \
++	"libdir=$(libdir)" \
+ 	"mandir=$(mandir)" \
+ 	"against=$(against)" \
+ 	"AR=$(AR)" \
diff --git a/sys-devel/gdb/files/gdb-6.2.1-relative-paths.patch b/sys-devel/gdb/files/gdb-6.2.1-relative-paths.patch
new file mode 100644
index 000000000000..315bae5d0a95
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.2.1-relative-paths.patch
@@ -0,0 +1,100 @@
+--- gdb-6.2.1-orig/gdb/dwarf2read.c	2004-07-06 23:29:30.000000000 +0400
++++ gdb-6.2.1/gdb/dwarf2read.c	2004-09-26 17:39:21.120776752 +0400
+@@ -762,7 +762,7 @@
+ static void dwarf_decode_lines (struct line_header *, char *, bfd *,
+ 				struct dwarf2_cu *, struct partial_symtab *);
+ 
+-static void dwarf2_start_subfile (char *, char *);
++static void dwarf2_start_subfile (char *, char *, char *);
+ 
+ static struct symbol *new_symbol (struct die_info *, struct type *,
+ 				  struct dwarf2_cu *);
+@@ -5951,12 +5951,10 @@
+ 	     directory and file name numbers in the statement program
+ 	     are 1-based.  */
+           struct file_entry *fe = &lh->file_names[file - 1];
+-          char *dir;
++          char *dir = NULL;
+           if (fe->dir_index)
+             dir = lh->include_dirs[fe->dir_index - 1];
+-          else
+-            dir = comp_dir;
+-	  dwarf2_start_subfile (fe->name, dir);
++	  dwarf2_start_subfile (fe->name, dir, comp_dir);
+ 	}
+ 
+       /* Decode the table. */
+@@ -6044,17 +6042,15 @@
+                    but the directory and file name numbers in the
+                    statement program are 1-based.  */
+                 struct file_entry *fe;
+-                char *dir;
++                char *dir = NULL;
+                 file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+                 line_ptr += bytes_read;
+                 fe = &lh->file_names[file - 1];
+                 fe->included_p = 1;
+                 if (fe->dir_index)
+                   dir = lh->include_dirs[fe->dir_index - 1];
+-                else
+-                  dir = comp_dir;
+                 if (!decode_for_pst_p)
+-                  dwarf2_start_subfile (fe->name, dir);
++                  dwarf2_start_subfile (fe->name, dir, comp_dir);
+               }
+ 	      break;
+ 	    case DW_LNS_set_column:
+@@ -6112,7 +6108,8 @@
+ 
+ /* Start a subfile for DWARF.  FILENAME is the name of the file and
+    DIRNAME the name of the source directory which contains FILENAME
+-   or NULL if not known.
++   or NULL if not known.  COMP_DIR is the value of DW_AT_comp_dir.  If
++   DIRNAME specifies a relative path, it is appended to COMP_DIR.
+    This routine tries to keep line numbers from identical absolute and
+    relative file names in a common subfile.
+ 
+@@ -6131,8 +6128,19 @@
+    subfile, so that `break /srcdir/list0.c:1' works as expected.  */
+ 
+ static void
+-dwarf2_start_subfile (char *filename, char *dirname)
++dwarf2_start_subfile (char *filename, char *dirname, char *comp_dir)
+ {
++  struct cleanup *back_to = make_cleanup (null_cleanup, 0);
++
++  /* If we have a relative dirname, append it to comp_dir.  */
++  if (dirname != NULL && !IS_ABSOLUTE_PATH (dirname) && comp_dir != NULL)
++    {
++      dirname = concat (comp_dir, "/", dirname, NULL);
++      make_cleanup (xfree, dirname);
++    }
++  else if (dirname == NULL)
++    dirname = comp_dir;
++
+   /* If the filename isn't absolute, try to match an existing subfile
+      with the full pathname.  */
+ 
+@@ -6140,19 +6148,20 @@
+     {
+       struct subfile *subfile;
+       char *fullname = concat (dirname, "/", filename, NULL);
++      make_cleanup (xfree, fullname);
+ 
+       for (subfile = subfiles; subfile; subfile = subfile->next)
+ 	{
+ 	  if (FILENAME_CMP (subfile->name, fullname) == 0)
+ 	    {
+ 	      current_subfile = subfile;
+-	      xfree (fullname);
++	      do_cleanups (back_to);
+ 	      return;
+ 	    }
+ 	}
+-      xfree (fullname);
+     }
+   start_subfile (filename, dirname);
++  do_cleanups (back_to);
+ }
+ 
+ static void
diff --git a/sys-devel/gdb/files/gdb-6.x-crash.patch b/sys-devel/gdb/files/gdb-6.x-crash.patch
new file mode 100644
index 000000000000..b43a12442e09
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.x-crash.patch
@@ -0,0 +1,20 @@
+--- gdb/symfile.c.orig	2004-04-27 21:17:40.955704896 +0200
++++ gdb/symfile.c	2004-04-27 21:18:02.591415768 +0200
+@@ -788,4 +788,4 @@
+   bfd *abfd;
+-  struct section_addr_info *orig_addrs;
+-  struct cleanup *my_cleanups;
++  struct section_addr_info *orig_addrs = NULL;
++  struct cleanup *my_cleanups = NULL;
+ 
+@@ -804,4 +804,2 @@
+ 
+-  orig_addrs = alloc_section_addr_info (bfd_count_sections (abfd));
+-  my_cleanups = make_cleanup (xfree, orig_addrs);
+   if (addrs)
+@@ -809,2 +807,5 @@
+       int i;
++      orig_addrs = alloc_section_addr_info (addrs->num_sections);
++      my_cleanups = make_cleanup (xfree, orig_addrs);
++
+       orig_addrs->num_sections = addrs->num_sections;
diff --git a/sys-devel/gdb/gdb-6.0-r1.ebuild b/sys-devel/gdb/gdb-6.0-r1.ebuild
index e6c7f42e58e8..aad291581a9c 100644
--- a/sys-devel/gdb/gdb-6.0-r1.ebuild
+++ b/sys-devel/gdb/gdb-6.0-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2004 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.4 2004/10/13 20:49:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.0-r1.ebuild,v 1.5 2004/11/10 02:19:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/
-		http://www.logix.cz/michal/devel/gdb-xfreemod"
+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="~x86 ~ppc amd64 ~ppc64"
-IUSE="nls"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls makecheck"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -35,50 +36,43 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf `use_enable nls` \
-	--libdir=/usr/$(get_libdir) || die
+	econf $(use_enable nls) || die
 	make || die
 }
 
 src_install() {
-	 make \
+	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die
-
-	cd gdb/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
-
-	cd ${S}/bfd/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
-
-	cd ${S}
+		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 -rf ${D}/usr/include
-
-	dodoc COPYING* README
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/COPYING* gdb/README \
-		gdb/MAINTAINERS gdb/NEWS gdb/ChangeLog* \
-		gdb/TODO
-
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-
-	docinto mmalloc
-	dodoc mmalloc/COPYING.LIB mmalloc/MAINTAINERS \
-		mmalloc/ChangeLog mmalloc/TODO
+	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
index 23489a05911b..37c75b3b2551 100644
--- a/sys-devel/gdb/gdb-6.0.ebuild
+++ b/sys-devel/gdb/gdb-6.0.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/gdb/gdb-6.0.ebuild,v 1.14 2004/08/03 17:33:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.0.ebuild,v 1.15 2004/11/10 02:19:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,10 +10,12 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha -hppa amd64 mips ppc64 ia64"
-IUSE="nls"
+KEYWORDS="alpha amd64 -hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="nls makecheck"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -28,48 +30,43 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf `use_enable nls` || die
+	econf $(use_enable nls) || die
 	make || die
 }
 
 src_install() {
-	 make \
+	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
+		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die
-
-	cd gdb/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+		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
 
-	cd ${S}/bfd/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+	if ! has noinfo ${FEATURES} ; then
+		cd gdb/doc
+		make \
+			infodir=${D}/usr/share/info \
+			install-info || die "install doc info"
 
-	cd ${S}
+		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 -rf ${D}/usr/include
-
-	dodoc COPYING* README
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/COPYING* gdb/README \
-		gdb/MAINTAINERS gdb/NEWS gdb/ChangeLog* \
-		gdb/TODO
-
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-
-	docinto mmalloc
-	dodoc mmalloc/COPYING.LIB mmalloc/MAINTAINERS \
-		mmalloc/ChangeLog mmalloc/TODO
+	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
index 550127873e3d..98eb1a1fa2ff 100644
--- a/sys-devel/gdb/gdb-6.1.1.ebuild
+++ b/sys-devel/gdb/gdb-6.1.1.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/gdb/gdb-6.1.1.ebuild,v 1.11 2004/10/21 18:49:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.1.1.ebuild,v 1.12 2004/11/10 02:19:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,10 +11,12 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha arm hppa ~ppc64 sparc"
-IUSE="nls"
+KEYWORDS="~alpha arm hppa ~ppc64 sparc ~x86"
+IUSE="nls makecheck"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -28,44 +30,43 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf `use_enable nls` || die
+	econf $(use_enable nls) || die
 	make || die
 }
 
 src_install() {
-	 make \
+	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
+		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die
+		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
 
-	cd gdb/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+	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
-
-	cd ${S}
+		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 -rf ${D}/usr/include
-
-	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
+	rm -r ${D}/usr/share/locale
+	rm -r ${D}/usr/include
 }
diff --git a/sys-devel/gdb/gdb-6.1.ebuild b/sys-devel/gdb/gdb-6.1.ebuild
index e7269abd99b2..3e52de6165b5 100644
--- a/sys-devel/gdb/gdb-6.1.ebuild
+++ b/sys-devel/gdb/gdb-6.1.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/gdb/gdb-6.1.ebuild,v 1.9 2004/09/22 03:02:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.1.ebuild,v 1.10 2004/11/10 02:19:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,10 +11,12 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc64 ~hppa ~alpha s390"
-IUSE="nls"
+KEYWORDS="~alpha ~hppa ppc64 s390 ~x86"
+IUSE="nls makecheck"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -27,48 +29,43 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf `use_enable nls` || die
+	econf $(use_enable nls) || die
 	make || die
 }
 
 src_install() {
-	 make \
+	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
+		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die
-
-	cd gdb/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+		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
 
-	cd ${S}/bfd/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+	if ! has noinfo ${FEATURES} ; then
+		cd gdb/doc
+		make \
+			infodir=${D}/usr/share/info \
+			install-info || die "install doc info"
 
-	cd ${S}
+		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 -rf ${D}/usr/include
-
-	dodoc COPYING* README
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/COPYING* gdb/README \
-		gdb/MAINTAINERS gdb/NEWS gdb/ChangeLog* \
-		gdb/TODO
-
-	docinto sim
-	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
-
-	docinto mmalloc
-	dodoc mmalloc/COPYING.LIB mmalloc/MAINTAINERS \
-		mmalloc/ChangeLog mmalloc/TODO
+	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
new file mode 100644
index 000000000000..5953f35a283f
--- /dev/null
+++ b/sys-devel/gdb/gdb-6.2.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 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.1 2004/11/10 02:19:13 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 makecheck"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( 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.1.ebuild b/sys-devel/gdb/gdb-6.2.1.ebuild
index 65d218bc898e..cd1bb5e68f10 100644
--- a/sys-devel/gdb/gdb-6.2.1.ebuild
+++ b/sys-devel/gdb/gdb-6.2.1.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/gdb/gdb-6.2.1.ebuild,v 1.3 2004/11/04 01:58:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.2.1.ebuild,v 1.4 2004/11/10 02:19:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,10 +11,12 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~arm hppa ~ppc64 ~amd64 -sparc ~ppc mips"
-IUSE="nls"
+KEYWORDS="~alpha ~amd64 ~arm hppa mips ~ppc ~ppc64 -sparc ~x86"
+IUSE="nls makecheck"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -25,47 +27,43 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf \
-		`use_enable nls` \
-		--libdir=/usr/$(get_libdir) || die
+	econf $(use_enable nls) || die
 	make || die
 }
 
 src_install() {
-	 make \
+	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die
-
-	cd gdb/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+		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
 
-	cd ${S}/bfd/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+	if ! has noinfo ${FEATURES} ; then
+		cd gdb/doc
+		make \
+			infodir=${D}/usr/share/info \
+			install-info || die "install doc info"
 
-	cd ${S}
+		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 -rf ${D}/usr/include
-
-	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
+	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
index 8134e43b937c..e793e5b80ea4 100644
--- a/sys-devel/gdb/gdb-6.2.ebuild
+++ b/sys-devel/gdb/gdb-6.2.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/gdb/gdb-6.2.ebuild,v 1.5 2004/11/04 01:58:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.2.ebuild,v 1.6 2004/11/10 02:19:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,10 +11,12 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~arm hppa ~ppc64 ~amd64 -sparc ppc ~mips"
-IUSE="nls"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ppc ~ppc64 -sparc ~x86"
+IUSE="nls makecheck"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	maketest? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -25,47 +27,43 @@ src_unpack() {
 
 src_compile() {
 	replace-flags -O? -O2
-	econf \
-		`use_enable nls` \
-		--libdir=/usr/$(get_libdir) || die
+	econf $(use_enable nls) || die
 	make || die
 }
 
 src_install() {
-	 make \
+	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		libdir=${D}/usr/$(get_libdir) \
 		infodir=${D}/usr/share/info \
-		install || die
-
-	cd gdb/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+		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
 
-	cd ${S}/bfd/doc
-	make \
-		infodir=${D}/usr/share/info \
-		install-info || die
+	if ! has noinfo ${FEATURES} ; then
+		cd gdb/doc
+		make \
+			infodir=${D}/usr/share/info \
+			install-info || die "install doc info"
 
-	cd ${S}
+		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 -rf ${D}/usr/include
-
-	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
+	rm -r ${D}/usr/share/locale
+	rm -r ${D}/usr/include
 }