Do a little cleanup while at it

Package-Manager: portage-2.1.2.3

10 files changed, 12 insertions, 397 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 1f50bcc16441..4b223ddf8f3f 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.44 2007/04/07 14:45:30 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.45 2007/04/07 14:48:02 jokey Exp $
+
+  07 Apr 2007; Markus Ullmann <jokey@gentoo.org> -expect-5.37.1-r2.ebuild,
+  -expect-5.40.0.ebuild, -expect-5.40.0-r1.ebuild, -expect-5.42.1.ebuild:
+  Do a little cleanup while at it
 
   07 Apr 2007; Markus Ullmann <jokey@gentoo.org> expect-5.42.1-r1.ebuild,
   expect-5.43.0.ebuild:
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 0b75bbd77411..9d3d67afc23c 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -9,54 +9,24 @@ AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912
 MD5 2103ff302f6e8a0dd748772f6512b3a5 files/expect-5.42.1-multilib.patch 507
 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b files/expect-5.42.1-multilib.patch 507
 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002 files/expect-5.42.1-multilib.patch 507
-DIST expect-5.37.1.tar.gz 517284 RMD160 9f29d8944014857d2bf6a667272f3670ac86ef0e SHA1 902c35803ef0a96a977490268708105177eb1142 SHA256 e5778be726a4b719ae9e0a4c035fc1dc959b52d864cc5ff67d581215466eae37
-DIST expect-5.40.0.tar.gz 521414 RMD160 a38505bef2f8f299ea9914bb035bd3534bb0ec9c SHA1 9cf2e318488e6794f422970435d999b4bbd98035 SHA256 f337c13c7a18d8900fd23eacee406354f45cf8fc4141e9039f65bd92bca379be
 DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430
 DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079
-EBUILD expect-5.37.1-r2.ebuild 2975 RMD160 2498a093f1623f444a22da68bdedf07b6de1fc65 SHA1 56d84e2d95f4ff175c2e7f57e9be098fa149c8a1 SHA256 dd9edcea9a1315c26ca746ddcd073601b2a12daf1af0db2a620be707a6950d7e
-MD5 9d789544b9e3f0febbc14cd39f5660c9 expect-5.37.1-r2.ebuild 2975
-RMD160 2498a093f1623f444a22da68bdedf07b6de1fc65 expect-5.37.1-r2.ebuild 2975
-SHA256 dd9edcea9a1315c26ca746ddcd073601b2a12daf1af0db2a620be707a6950d7e expect-5.37.1-r2.ebuild 2975
-EBUILD expect-5.40.0-r1.ebuild 2482 RMD160 b1a624205a704f9b451d2cf501fa21a28bdbb6fb SHA1 f4d1bc867014438bf4ebd37497c40a07f5b99050 SHA256 74fe5a7207b0e915d64bb83de3089db65a3e103eb8205914b37195e88c9f402f
-MD5 0c44337daff8a15da410ec3d9d0f07ec expect-5.40.0-r1.ebuild 2482
-RMD160 b1a624205a704f9b451d2cf501fa21a28bdbb6fb expect-5.40.0-r1.ebuild 2482
-SHA256 74fe5a7207b0e915d64bb83de3089db65a3e103eb8205914b37195e88c9f402f expect-5.40.0-r1.ebuild 2482
-EBUILD expect-5.40.0.ebuild 1745 RMD160 353de502ada069a48848dc510ce7c5a5467437d6 SHA1 52894603d915fb8ec72c17755a2d7fe4b78797ea SHA256 85735a974ca5eaa07937b88a0814426032cb7f26dee0087a6d885c8d1be3253c
-MD5 89f3d815808a0ee9a7a309a548e1a05e expect-5.40.0.ebuild 1745
-RMD160 353de502ada069a48848dc510ce7c5a5467437d6 expect-5.40.0.ebuild 1745
-SHA256 85735a974ca5eaa07937b88a0814426032cb7f26dee0087a6d885c8d1be3253c expect-5.40.0.ebuild 1745
 EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 aa21fca0a0a373b91531ac1040ce96a4d4e05fa4 SHA1 0108e46851d75ca1b6e9d896acb09714dc2705ee SHA256 3ceb2efd4255716118b12135421584d1cc5b7ae07932fa398b6a2acb0b9b8818
 MD5 060629f9353fc3876b706385a7e3cd62 expect-5.42.1-r1.ebuild 3062
 RMD160 aa21fca0a0a373b91531ac1040ce96a4d4e05fa4 expect-5.42.1-r1.ebuild 3062
 SHA256 3ceb2efd4255716118b12135421584d1cc5b7ae07932fa398b6a2acb0b9b8818 expect-5.42.1-r1.ebuild 3062
-EBUILD expect-5.42.1.ebuild 2974 RMD160 763f32a19d7e6e28be68be9dca359f955f574995 SHA1 e41552648fc9fe74ee2368c0cec5767fcfa7e9ae SHA256 811bfb7c52c6c3e531dc3368942bc64fa6cea30c0355e2d87e4ba3179d73fdea
-MD5 7eabf15c1fb1f43657a24e45b0a2bab4 expect-5.42.1.ebuild 2974
-RMD160 763f32a19d7e6e28be68be9dca359f955f574995 expect-5.42.1.ebuild 2974
-SHA256 811bfb7c52c6c3e531dc3368942bc64fa6cea30c0355e2d87e4ba3179d73fdea expect-5.42.1.ebuild 2974
 EBUILD expect-5.43.0.ebuild 3094 RMD160 0288f0a7a4f387a41d0f4b61d1c193bd812efad5 SHA1 f396338990d64098b8c56d080aa774fe54dd871d SHA256 6fc7a4d0cb941ed954bf4e5f28e32b4c7dfa85c13392fe272801919ea409f1e0
 MD5 7088626363b7130f4efb1c7109160d83 expect-5.43.0.ebuild 3094
 RMD160 0288f0a7a4f387a41d0f4b61d1c193bd812efad5 expect-5.43.0.ebuild 3094
 SHA256 6fc7a4d0cb941ed954bf4e5f28e32b4c7dfa85c13392fe272801919ea409f1e0 expect-5.43.0.ebuild 3094
-MISC ChangeLog 6308 RMD160 e152ad0430b848c8ca3be843e37425fb4282a76e SHA1 986439d25bd4794fe2ae35b72140a76fcd5501cc SHA256 ccf53dc570461be6cc7f95730d0f422f0c4757f03f3ebb789e82944936cd8305
-MD5 f2c5f404d468c2ee98b99fdb4af682ad ChangeLog 6308
-RMD160 e152ad0430b848c8ca3be843e37425fb4282a76e ChangeLog 6308
-SHA256 ccf53dc570461be6cc7f95730d0f422f0c4757f03f3ebb789e82944936cd8305 ChangeLog 6308
+MISC ChangeLog 6492 RMD160 f9c1294a3af417411b2735203764439d7abb68b9 SHA1 937df0e47d6ac37092d0c37a85000e11b78e001c SHA256 717bb0ca21f4306f50043ad4b19fb018a79fb39ef93418f18cffee03a4b19082
+MD5 cd41ca31fa7c7a2fa9428f8ebc15fe28 ChangeLog 6492
+RMD160 f9c1294a3af417411b2735203764439d7abb68b9 ChangeLog 6492
+SHA256 717bb0ca21f4306f50043ad4b19fb018a79fb39ef93418f18cffee03a4b19082 ChangeLog 6492
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158
-MD5 abd1e869bd5cb4a7cd933971ce2c889b files/digest-expect-5.37.1-r2 241
-RMD160 b460d2618caf0b724692b7ce296ccd1ae816fc72 files/digest-expect-5.37.1-r2 241
-SHA256 9fe8c28c690879bfd88a461a9c6eec27e9d0020611e9e08b8e56556198155d3a files/digest-expect-5.37.1-r2 241
-MD5 76d033834286b379e56284e2553bcb8e files/digest-expect-5.40.0 241
-RMD160 ffa06b9e207734329f5e620db2942c61c785fd12 files/digest-expect-5.40.0 241
-SHA256 0728c340e00f4e6edba48cd3f40df60956bc9432596dcdbbecd62a4f49e38a8b files/digest-expect-5.40.0 241
-MD5 76d033834286b379e56284e2553bcb8e files/digest-expect-5.40.0-r1 241
-RMD160 ffa06b9e207734329f5e620db2942c61c785fd12 files/digest-expect-5.40.0-r1 241
-SHA256 0728c340e00f4e6edba48cd3f40df60956bc9432596dcdbbecd62a4f49e38a8b files/digest-expect-5.40.0-r1 241
-MD5 1ee981b7dbf207114bcd315921e76932 files/digest-expect-5.42.1 241
-RMD160 d7431ddd5398e80c0261ef047a8cd3d92d16ade0 files/digest-expect-5.42.1 241
-SHA256 cb3ba9544df60e7a0a14dc4ad404ba3175f10df257ecb730400bd2b686935209 files/digest-expect-5.42.1 241
 MD5 1ee981b7dbf207114bcd315921e76932 files/digest-expect-5.42.1-r1 241
 RMD160 d7431ddd5398e80c0261ef047a8cd3d92d16ade0 files/digest-expect-5.42.1-r1 241
 SHA256 cb3ba9544df60e7a0a14dc4ad404ba3175f10df257ecb730400bd2b686935209 files/digest-expect-5.42.1-r1 241
@@ -66,7 +36,7 @@ SHA256 624ec0715c6c0f0eabbb9d039d7988673ca7afeac3de518fe1cc205c8a4e2fb7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGF66Tz974XjDVpbkRAoNOAJ9X2OafrEeBjDx/mYYyDu54k+ixyQCgxxz/
-6iASt3D34lsJVNVNZEoex60=
-=GIud
+iD8DBQFGF68nz974XjDVpbkRAh2EAJ9bWso3KdAOdp6PEA0AjPXPDfwBHACfTH6+
+Sd9CGmSh2c0QIBJf9ppf3DA=
+=hgWY
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.37.1-r2.ebuild b/dev-tcltk/expect/expect-5.37.1-r2.ebuild
deleted file mode 100644
index 3905c08f9217..000000000000
--- a/dev-tcltk/expect/expect-5.37.1-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1-r2.ebuild,v 1.11 2007/01/05 07:46:35 flameeyes Exp $
-
-
-#remove the trailing ".0" from the tarball version
-NON_MICRO_V=${P%.[0-9]}
-S=${WORKDIR}/${NON_MICRO_V}
-
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="http://expect.nist.gov/"
-SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64 s390 arm"
-IUSE="X doc"
-
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's#/usr/local/bin#/usr/bin#' ${S}/expect.man
-	sed -i 's#/usr/local/bin#/usr/bin#' ${S}/expectk.man
-	#stops any example scripts being installed by default
-	sed -i 's/^SCRIPTS =/G_SCRIPTS =/' ${S}/Makefile.in
-	sed -i 's/^SCRIPTS_MANPAGES =/G_SCRIPTS_MANPAGES =/' ${S}/Makefile.in
-
-	cat >${WORKDIR}/sed.examples.gentoo <<HERE
-1s;#!\\.\\.;#!/usr/bin;
-1s;#!/depot/path;#!/usr/bin;
-HERE
-
-	cat >${WORKDIR}/Makefile.examples.gentoo <<HERE
-include Makefile
-
-gentoo_examples:
-	for i in \$(G_SCRIPTS) ; do \\
-		if [ -f \$(srcdir)/example/\$\$i ] ; then \\
-			\$(INSTALL_PROGRAM) \$(srcdir)/example/\$\$i \\
-				${D}/usr/share/doc/${PF}/examples/\$\$i ; \\
-			sed -i -f ${WORKDIR}/sed.examples.gentoo \\
-						${D}/usr/share/doc/${PF}/examples/\$\$i ; \\
-		fi ; \\
-	done
-
-	for i in \$(G_SCRIPTS_MANPAGES) ; do \\
-		if [ -f \$(srcdir)/example/\$\$i.man ] ; then \\
-			\$(INSTALL_DATA) \$(srcdir)/example/\$\$i.man \\
-				${D}/usr/share/doc/${PF}/examples/\$\$i.1 ; \\
-			gzip ${D}/usr/share/doc/${PF}/examples/\$\$i.1 ; \\
-		fi ; \\
-	done
-
-HERE
-}
-
-src_compile() {
-	local myconf
-	local tclv
-	local tkv
-	# Find the version of tcl/tk that has headers installed.
-	# This will be the most recently merged, not necessarily the highest
-	# version number.
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	#tkv isn't really needed, included for symmetry and the future
-	tkv=$( grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-
-	#configure needs to find the files tclConfig.sh and tclInt.h
-	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl$tclv/include/generic"
-
-	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
-		myconf="$myconf --with-tk=/usr/lib"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
-
-	econf $myconf --enable-shared || die
-	emake || die
-}
-
-src_install () {
-	make install INSTALL_ROOT=${D} || die
-
-	dodoc ChangeLog FAQ HISTORY NEWS README
-
-	local static_lib="lib${NON_MICRO_V/-/}.a"
-	rm ${D}/usr/lib/${NON_MICRO_V/-/}/${static_lib}
-
-	#install examples if 'doc' is set
-	if use doc; then
-		docinto examples
-		dodoc example/README
-		make -f ${WORKDIR}/Makefile.examples.gentoo gentoo_examples
-	fi
-}
diff --git a/dev-tcltk/expect/expect-5.40.0-r1.ebuild b/dev-tcltk/expect/expect-5.40.0-r1.ebuild
deleted file mode 100644
index 8d537d4285f7..000000000000
--- a/dev-tcltk/expect/expect-5.40.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0-r1.ebuild,v 1.8 2007/01/05 07:46:35 flameeyes Exp $
-
-
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="http://expect.nist.gov/"
-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"
-IUSE="X doc"
-
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-
-NON_MICRO_V=${P%.[0-9]}
-S=${WORKDIR}/${NON_MICRO_V}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
-	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
-	#stops any example scripts being installed by default
-	sed -i \
-		-e '/^install:/s/install-libraries //' \
-		-e 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
-}
-
-src_compile() {
-	local myconf
-	local tclv
-	local tkv
-	# Find the version of tcl/tk that has headers installed.
-	# This will be the most recently merged, not necessarily the highest
-	# version number.
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	#tkv isn't really needed, included for symmetry and the future
-	#tkv=$(grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-
-	#configure needs to find the files tclConfig.sh and tclInt.h
-	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl${tclv}/include/generic"
-
-	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
-		myconf="$myconf --with-tk=/usr/lib"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
-
-	econf $myconf --enable-shared || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make install INSTALL_ROOT=${D} || die "make install failed"
-
-	dodoc ChangeLog FAQ HISTORY NEWS README
-
-	local static_lib="lib${NON_MICRO_V/-/}.a"
-	rm ${D}/usr/lib/${NON_MICRO_V/-/}/${static_lib}
-
-	#install examples if 'doc' is set
-	if use doc; then
-		docinto examples
-		local scripts=$(make -qp | \
-		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
-		exeinto /usr/share/doc/${PF}/examples
-		doexe ${scripts}
-		local scripts_manpages=$(make -qp | \
-		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
-		for m in ${scripts_manpages}; do
-			dodoc example/${m}.man
-		done
-		dodoc example/README
-	fi
-
-}
diff --git a/dev-tcltk/expect/expect-5.40.0.ebuild b/dev-tcltk/expect/expect-5.40.0.ebuild
deleted file mode 100644
index 7e8731aff00e..000000000000
--- a/dev-tcltk/expect/expect-5.40.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.40.0.ebuild,v 1.8 2007/01/05 07:46:35 flameeyes Exp $
-
-
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="http://expect.nist.gov/"
-SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips hppa amd64 ppc64 sh"
-IUSE="X doc"
-
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-
-S=${WORKDIR}/${P%.0}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	local myconf
-	local tclv
-	local tkv
-	# Find the version of tcl/tk that has headers installed.
-	# This will be the most recently merged, not necessarily the highest
-	# version number.
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	#tkv isn't really needed, included for symmetry and the future
-	tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-
-	#configure needs to find the files tclConfig.sh and tclInt.h
-	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl$tclv/include/generic"
-
-	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
-		myconf="$myconf --with-tk=/usr/lib"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
-
-	econf $myconf --enable-shared || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-
-	#docs
-	dodoc Changelog FAQ HISTORY NEWS README
-
-	#install examples if 'doc' is set
-	if use doc; then
-		cd ${S}
-		dodir /usr/share/doc/${PF}/examples/
-		cp example/* ${D}/usr/share/doc/${PF}/examples/
-	fi
-}
diff --git a/dev-tcltk/expect/expect-5.42.1.ebuild b/dev-tcltk/expect/expect-5.42.1.ebuild
deleted file mode 100644
index 26a05b4d4b26..000000000000
--- a/dev-tcltk/expect/expect-5.42.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 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.10 2007/01/05 07:46:35 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="http://expect.nist.gov/"
-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"
-IUSE="X doc"
-
-# We need dejagnu for src_test, but dejagnu needs expect
-# to compile/run, so we cant add dejagnu to DEPEND :/
-RDEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-DEPEND="${RDEPEND}
-	=sys-devel/autoconf-2.1*"
-
-NON_MICRO_V=${P%.[0-9]}
-S=${WORKDIR}/${NON_MICRO_V}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-multilib.patch
-	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
-	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
-	#stops any example scripts being installed by default
-	sed -i \
-		-e '/^install:/s/install-libraries //' \
-		-e 's/^SCRIPTS_MANPAGES = /_&/' \
-		Makefile.in
-	WANT_AUTOCONF=2.1 autoconf
-}
-
-src_compile() {
-	local myconf
-	local tclv
-	local tkv
-	# Find the version of tcl/tk that has headers installed.
-	# This will be the most recently merged, not necessarily the highest
-	# version number.
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	#tkv isn't really needed, included for symmetry and the future
-	#tkv=$(grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-
-	#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
-		#--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
-		myconf="$myconf --with-tk=/usr/$(get_libdir)"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
-
-	econf $myconf --enable-shared || die "econf failed"
-	emake || die "emake failed"
-}
-
-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"
-
-	dodoc ChangeLog FAQ HISTORY NEWS README
-
-	local static_lib="lib${NON_MICRO_V/-/}.a"
-	rm ${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
-
-	#install examples if 'doc' is set
-	if use doc ; then
-		docinto examples
-		local scripts=$(make -qp | \
-		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
-		exeinto /usr/share/doc/${PF}/examples
-		doexe ${scripts}
-		local scripts_manpages=$(make -qp | \
-		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
-		for m in ${scripts_manpages}; do
-			dodoc example/${m}.man
-		done
-		dodoc example/README
-	fi
-}
diff --git a/dev-tcltk/expect/files/digest-expect-5.37.1-r2 b/dev-tcltk/expect/files/digest-expect-5.37.1-r2
deleted file mode 100644
index 2005b690ee61..000000000000
--- a/dev-tcltk/expect/files/digest-expect-5.37.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d570837b6dc6311036d7bdeab19f0e03 expect-5.37.1.tar.gz 517284
-RMD160 9f29d8944014857d2bf6a667272f3670ac86ef0e expect-5.37.1.tar.gz 517284
-SHA256 e5778be726a4b719ae9e0a4c035fc1dc959b52d864cc5ff67d581215466eae37 expect-5.37.1.tar.gz 517284
diff --git a/dev-tcltk/expect/files/digest-expect-5.40.0 b/dev-tcltk/expect/files/digest-expect-5.40.0
deleted file mode 100644
index a20376971e05..000000000000
--- a/dev-tcltk/expect/files/digest-expect-5.40.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ae1b87c9af993a69b901b6e52962c18 expect-5.40.0.tar.gz 521414
-RMD160 a38505bef2f8f299ea9914bb035bd3534bb0ec9c expect-5.40.0.tar.gz 521414
-SHA256 f337c13c7a18d8900fd23eacee406354f45cf8fc4141e9039f65bd92bca379be expect-5.40.0.tar.gz 521414
diff --git a/dev-tcltk/expect/files/digest-expect-5.40.0-r1 b/dev-tcltk/expect/files/digest-expect-5.40.0-r1
deleted file mode 100644
index a20376971e05..000000000000
--- a/dev-tcltk/expect/files/digest-expect-5.40.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ae1b87c9af993a69b901b6e52962c18 expect-5.40.0.tar.gz 521414
-RMD160 a38505bef2f8f299ea9914bb035bd3534bb0ec9c expect-5.40.0.tar.gz 521414
-SHA256 f337c13c7a18d8900fd23eacee406354f45cf8fc4141e9039f65bd92bca379be expect-5.40.0.tar.gz 521414
diff --git a/dev-tcltk/expect/files/digest-expect-5.42.1 b/dev-tcltk/expect/files/digest-expect-5.42.1
deleted file mode 100644
index 795e5611d9f7..000000000000
--- a/dev-tcltk/expect/files/digest-expect-5.42.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fea346fac6aaf74b0851f2441f478571 expect-5.42.1.tar.gz 524882
-RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 expect-5.42.1.tar.gz 524882
-SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430 expect-5.42.1.tar.gz 524882