make sure dejagnu exists before trying to run tests and mark amd64/arm/hppa/ia64/s390/x86 stable

Package-Manager: portage-2.0.51-r15

2 files changed, 13 insertions, 17 deletions

diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 99331f6686b7..c12edf7c2f85 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d3c5abf36167f5310fd1414151462ae2 ChangeLog 4442
 MD5 a15812d97737f672a6d9337ddd345e48 expect-5.37.1-r1.ebuild 1823
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 60eac249d8a22c10b2e44579fb0f2a16 expect-5.37.1-r2.ebuild 3048
 MD5 4c73ddde0d04ccf48e7c4109b995e14f expect-5.40.0-r1.ebuild 2515
-MD5 c9741846c77f28f857d5ee52431055af expect-5.42.1.ebuild 2704
+MD5 602381070dd63bcfbeb2736af792a796 expect-5.42.1.ebuild 2890
 MD5 d72515e421619404da8e13d785d018da expect-5.40.0.ebuild 1778
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0 65
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r1 65
@@ -14,10 +11,3 @@ MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r2 65
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0-r1 65
 MD5 980077a691e90dc8affe4829e3169d66 files/digest-expect-5.42.1 65
 MD5 2103ff302f6e8a0dd748772f6512b3a5 files/expect-5.42.1-multilib.patch 507
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB7u9uroRuSHgZdywRAg9SAJ9f4McBGhXoHJVFjw3Qtj+5QnG0LgCgjnUS
-lDTUNGQ/wdCfT6OlVMIWqtE=
-=cqri
------END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.42.1.ebuild b/dev-tcltk/expect/expect-5.42.1.ebuild
index 6900cb8e3038..26cb0695c898 100644
--- a/dev-tcltk/expect/expect-5.42.1.ebuild
+++ b/dev-tcltk/expect/expect-5.42.1.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/dev-tcltk/expect/expect-5.42.1.ebuild,v 1.3 2005/01/19 23:37:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1.ebuild,v 1.4 2005/01/28 02:17:47 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
 IUSE="X doc"
 
 RDEPEND=">=dev-lang/tcl-8.2
@@ -50,7 +50,7 @@ src_compile() {
 	#configure needs to find the files tclConfig.sh and tclInt.h
 	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
 
-	if use X; then
+	if use X ; then
 		#--with-x is enabled by default
 		#configure needs to find the file tkConfig.sh and tk.h
 		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
@@ -64,7 +64,14 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-src_install () {
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs 
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	make check || die "make check failed"
+}
+
+src_install() {
 	dodir /usr/$(get_libdir)
 	make install INSTALL_ROOT=${D} || die "make install failed"
 
@@ -74,7 +81,7 @@ src_install () {
 	rm ${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
 
 	#install examples if 'doc' is set
-	if use doc; then
+	if use doc ; then
 		docinto examples
 		local scripts=$(make -qp | \
 		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
@@ -87,5 +94,4 @@ src_install () {
 		done
 		dodoc example/README
 	fi
-
 }