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

1 files changed, 30 insertions, 33 deletions

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
 }