Clean up and move to stable for #42939.

4 files changed, 9 insertions, 58 deletions

diff --git a/dev-util/dejagnu/ChangeLog b/dev-util/dejagnu/ChangeLog
index bdf67b0c55b9..d38063525e32 100644
--- a/dev-util/dejagnu/ChangeLog
+++ b/dev-util/dejagnu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/dejagnu
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/ChangeLog,v 1.9 2004/10/30 03:59:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/ChangeLog,v 1.10 2004/11/10 01:53:24 vapier Exp $
+
+  09 Nov 2004; Mike Frysinger <vapier@gentoo.org> dejagnu-1.4.4-r1.ebuild,
+  -dejagnu-1.4.4.ebuild:
+  Clean up and move to stable for #42939.
 
   31 Oct 2004; Aron Griffis <agriffis@gentoo.org> dejagnu-1.4.4-r1.ebuild:
   add ~alpha and ~ia64
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild
index 2d7ee770ff21..640d05173c06 100644
--- a/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild,v 1.6 2004/10/30 03:59:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild,v 1.7 2004/11/10 01:53:24 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="DejaGnu is a framework for testing other programs"
+DESCRIPTION="framework for testing other programs"
 HOMEPAGE="http://www.gnu.org/software/dejagnu/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips amd64 ppc64 ~alpha ~ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
@@ -23,23 +23,8 @@ src_unpack() {
 	epatch ${FILESDIR}/dejagnu-ignore-libwarning.patch
 }
 
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die
-}
-
 src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
+	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	use doc && dohtml -r doc/html/
 }
diff --git a/dev-util/dejagnu/dejagnu-1.4.4.ebuild b/dev-util/dejagnu/dejagnu-1.4.4.ebuild
deleted file mode 100644
index b6d0209eaf34..000000000000
--- a/dev-util/dejagnu/dejagnu-1.4.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/dejagnu-1.4.4.ebuild,v 1.5 2004/07/02 05:06:49 eradicator Exp $
-
-DESCRIPTION="DejaGnu is a framework for testing other programs"
-HOMEPAGE="http://www.gnu.org/software/dejagnu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~ppc"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	dev-lang/tcl
-	dev-tcltk/expect"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml -r doc/html/
-}
diff --git a/dev-util/dejagnu/files/digest-dejagnu-1.4.4 b/dev-util/dejagnu/files/digest-dejagnu-1.4.4
deleted file mode 100644
index ff03787f0377..000000000000
--- a/dev-util/dejagnu/files/digest-dejagnu-1.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 053f18fd5d00873de365413cab17a666 dejagnu-1.4.4.tar.gz 1080346