From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 20 Mar 2015 10:22:31 +0000 (+0000)
Subject: Fix tcl/tk slotting; drop old
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f6860dd9871c1e7b13977d95bdd45eff0db65ca4;p=gentoo.git

Fix tcl/tk slotting; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
---

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index e949d7b614fe..2d896f50a592 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/expect
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.93 2014/05/27 14:34:13 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.94 2015/03/20 10:22:30 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -expect-5.43.0-r1.ebuild,
+  -expect-5.43.0.ebuild, -expect-5.44.1.15-r1.ebuild, expect-5.44.1.15.ebuild,
+  expect-5.45.ebuild:
+  Fix tcl/tk slotting; drop old
 
 *expect-5.44.1.15-r1 (18 Aug 2013)
 
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 02e6acdc1547..f2035acc79dd 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX expect-5.39.0-libdir.patch 480 SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a SHA512 ef9f44102c9fd0950e6506d109ca4b7cb031cb80e863f512b40332daea18c9e629e80865d841a7e01afa262d99a4771d93e4913d8a9bcd04ece2d6231ec1fcd4 WHIRLPOOL 90153a23c22bbe1caff76c88d44b8fd485829bac21b9e56710dd78f9be0f893178b761c741672f05974a75b2a6c79a656d15c2d4ba07b65fc6740ca2220d492c
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610 SHA512 f195c66f705788195039c5525c65a702b41cdfedf159b05a4e99228369a6dbcc7694e3ff549d807334e477d3c206d77be47dbe8cb2f3b6355235eec6da1b7902 WHIRLPOOL e659e74016c8b87665b8a9e0c60bc42621b63d9d30f5c6203f2d9aa056de19bf1435450d2eadec6837009a59205f8db91516f5eea1330f2029a417aa8c466d4d
@@ -15,20 +15,28 @@ AUX expect-5.45-darwin-install_name.patch 727 SHA256 40673730c4c47fa9a8284e6d0eb
 AUX expect-5.45-gfbsd.patch 996 SHA256 5126942c16a7186e7d68b47db80949696f4d53c5fe1c643a68d0f3cd5f939dca SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242 WHIRLPOOL 4e88af63d192340578c85f6636035220f1ed5f665e17638d03d930a1017baa55cb5461b6eb2d5712229a65ff851b78f246c112019491b5e3e671c22468893907
 AUX expect-5.45-headers.patch 2280 SHA256 a1c49b2491b0d8d5650afa938521e36e4738a2d486ca1b95df05b084113c493f SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c WHIRLPOOL 6e55f50364cb86e879b935a449c9f4b7e1ded54922fdc6f28e2a57aefdb7ab7f17dff0279da32a8ecd9a9696c6fa142d3ddc559ceebfbab23e84e233beb62fe9
 AUX expect.m4 20468 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca SHA512 3012265a1e090bb189aba6d19d28873d270db0d2ec4ae9e2746c2a4e5be6faf7d333b6b65457dfd22b5ef65a1004fb0524a7ce6dddd801ccc9f0f70a5430b8d6 WHIRLPOOL f55920c23e5571a185763870066fe1449f87010cf31558f6a3bdf4fc0d12c558e7ee13c4a3846448b10a79f786debab2de7b2989f3051a88fd2e15fc6bf1215d
-DIST expect-5.43.0.tar.gz 525572 SHA256 4c9decec3c5541806f1758706fe649193d5c8afa2913a79361d9fa5f2c993ba1 SHA512 692ceac0eea5f2e8f75c42217fab3b2e2c202b0c460a06d5986f56a81789fbe895032a1c50b7e7fb96fb0a3d3f52f8383e706cbd0b81aa0fe03fdcc8b3ae4143 WHIRLPOOL 282486ac8189d4fdc6267b69bd8beaabc772c6fe618b5cdaa75f14b510831e3a1a92c5fd74ea24753862319760ff28c72687533aa970a76de29c07aed3b327aa
 DIST expect-5.44.1.15.tar.bz2 547655 SHA256 c8565b869d67389995684b60553685168dd40135aa50022bd759f2d5e757d6f1 SHA512 ef7b90dcad733d8c02264d9ff2ad1b018bb50923f78fd16181e9cae2bcdd49dba723da1ef8bada0a3b570399760f198390e7e51f5f90a34f80f845c2244ea336 WHIRLPOOL cf464abf7f27fc7dd33dd9d98bb7dfc27cfde9cc90bf74098fcce17a7a4d78c46db49b72bcd0c7bd7a45580ec37cf5f3b57971bacb4302586c1520413ce5dfd0
 DIST expect5.45.tar.gz 628808 SHA256 b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51 WHIRLPOOL e28a5019036d20260f76b13cbd47d2e56661b0107592ead296118c12ed28157a1300a091730820e088d2fa6f86396e7244e844c7bc2e942fc6cf995e4194f10f
-EBUILD expect-5.43.0-r1.ebuild 3820 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a SHA512 fffc42537b90db93a1c8d5374d3cef9f8150abf95a70ef90a049c7035f18d5d5cd7880282753f36db2194cd544e068a79b4bbaecea4a2def8f8ada213b9acc82 WHIRLPOOL cd62fecca32ef5af6125a0f9db694ee91f09587ae47eab5a654d61cf944901beec827a1d02ffe219d4adf8e2c7b1f3a656590c1e7b365c74d1cdf26c2d24878d
-EBUILD expect-5.43.0.ebuild 3539 SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9 SHA512 0e7b05408a820adcac7be4684addcee4dd35ce2e14607f7b8c51a5c3d96c9fd4b6fd9a88503d93f77bfcff5e4aeb833a7f778ced8659a010099eb6a5079061a4 WHIRLPOOL 2a4d715d16e32084c65f85809e9c88b6d96502b596da34ea2adc99216ab45d3e6a9053bf67e7d59b17c11c24de015834fa301784fe10f436108200eb4dc027e8
-EBUILD expect-5.44.1.15-r1.ebuild 3197 SHA256 8f89bbda7fdb8f397c560e6f4a921315358f90ad8e98716cfe71a6d807ff1e46 SHA512 30fa6821dd21cabd9bceb50c13dccc1b8fe62a6cbf3f651d63cfc6e5e4eb640d9b04ce06ffb05a0f5e89f364d95d4f0df4c2ecead36e1cbb7029285aa47c8bb1 WHIRLPOOL 32f380797103eefb10c8ba1a6dce576f277b695aeb05a1b78925af8a036e07baff12e1750e83c67da9d16bfd6c68817a4a85222e5b61585d76f24ccc191a66a5
-EBUILD expect-5.44.1.15.ebuild 3146 SHA256 f3529bcd30ce6c352499c4f80ca8aa807c22b45a7553382059dc873fbb38f962 SHA512 6c5fedda112395021e1699ad61818700745c780b27397e70c5f32bed03cf2917b529fa653e138fe78fc9387efb27cb7ef39773475ea9a3318e6bcff585073ba8 WHIRLPOOL 2a79f2928ddca7e9871f87f0525ff503239be75bb91f2771ce5f5a75022a775849b36065d6cc0d126856ebcbd34ac983cfd05b05c72dbd3c5e8ff8de45f924d4
-EBUILD expect-5.45.ebuild 2424 SHA256 3e78315bc5139f601ac15f431ae311e09163e24b3571e9ae8cfe038289eb322a SHA512 4ce9f4fbcbf97b72be10ccd73a9bb9fada0c96ceda3b6fb6535daf2b9431e7e44337728a7c1669c627ce73bf8dcc5676308404d35b502711d392fd6399600697 WHIRLPOOL 973d309700c76ab5446a7769b75189151eb1e1f3944452f590b533ec013339f0ebd7870f8697792bdc5c57252bad29a17ac3356faee8428c12be7092bcb49acb
-MISC ChangeLog 13344 SHA256 ef1694916e61874650f6f9eaeb302248534bbf55a0b1cc877646e4f90aee09f4 SHA512 0324c906dee39a5992a34b0fd02bf746d77c3d36166a26ccb6d8af0de5029cbf1ec96124a0db9a8b8e1901136c4a71c2fe39eef922145160cbe499a426feaddd WHIRLPOOL 8e00d68a2614ea81f6bd0254a08db6fd298ade10e48a232733346a9e6ecca9e3452c6056cc351a7c55b25bd5a19f1de71ed12e6b98700bb5e5ebd8cd70883b76
+EBUILD expect-5.44.1.15.ebuild 3150 SHA256 53f6c9f96519719941dc0c29b609f0c6060fdd74dc6e8d5669324e39cee5e243 SHA512 328036ad1f01f3b2d8d23925e3ec7e4ca50c02d116aff3668253a6d52bd21d76fb966db2f350574daffbdc3413ddd48d33e13546bd6cbb9f18dcf12b288cc0c3 WHIRLPOOL 28d860d69017f44f9a3f64bda692c6c7350f6c7eb529a5f10f35e2bec06794dff2291a3fdc486ba1fc1f9517843425f4b35fb8006f9c15f63f73977167c0c8ae
+EBUILD expect-5.45.ebuild 2426 SHA256 f6c80758d76a7cea84a18b2638e7a1ded3bfc728dd1e09a0d07705c40425b2da SHA512 31451d2177d8b1338957d0bdd7d854b550ad32d1d984e4b33e6ac0de3ac761e6cb958c91bdea426e403220cd95996cfa59f22189bf62f9a9aaad6026c922cfff WHIRLPOOL 7c9b1417b2493abd35c7b63a1d926d08dd2368a009431885eb57cecf5f4897878b57150128216b63301d37575c3e09f54cd779e3d72137a5ed2599ba101ac116
+MISC ChangeLog 13552 SHA256 52bb7e99e3b181939f445cef9a4638c620953eca9ecbc55fac8b2b93fd566811 SHA512 a8fd35c92c91dc93c40035cb8bd9778e49835e013f5918a2f39f4a8d3b182290e55f55536828f7395f393f3fe9ba4f3d0adaf161d3f65dc8176e57c2a0893bb1 WHIRLPOOL 59429b4f5309e52cb8dbb9c0c6cbaa0ebd6a250dbf21da112b3ef2969e7c42b28e288cbab420e1b27547635f14160373f14df141a12e0719bebc37681812a53a
 MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlOEomcACgkQVWmRsqeSphOYeQCfWOxHErofUG8KJR7R6Mt3v8mq
-RXYAnRIuF8neRnySiGUbjCX16/6lFviM
-=Y0kD
+iQJ8BAEBCgBmBQJVC/TnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirIwYP/A/v2rijBpADI181bxG603Ls
+7R1DW3zkcVu/pmIJAvUScsGlYWKBoy3ghbAbXKRyCSvpM7N81heNG50Q0GK8SVrL
+NYjh0TlRe0YWZqR6cBSW+3O5StM18ocuVEsS2bmZVyxkEfqJoLPk2TliprxqdYST
+VkY9fCCJeJx2U2J3ufsbWukmb2Z/z6bGegHKTDmZG174tyC1NuFpeHC4giWfdSwA
+wobBYugXuN1mxX+xUw8h4TbPsgCMfzh3zGgfTtugoZkRzcQDs6QzmWqzFTrp7ago
+Dzi6i4jWMwaGL3v/n7T2n4KiaZZQ5wwq9I5TqYpCBl1W81HeolZGLKkooXudPEEB
+lzG/6DbkQxut/L9KOrl2+rxzSf8TP6QGufmolMr7Bpkhok6fH0bs3Bay6aA/7kin
+OpiwZ2ho8d7PwFibf9aaJpxoOyHmVr6fDCMUsQoEk6W0U7rjCePj4+8lF9VWLKUi
+UTC16tPz40sAgv3TUGZD5TEbcj5MFG/vPLlC+RvXHpaLAcBpOUmHb3TPN6t7w32z
+TjIUu6kwpPTHnpl8DI3ThRZY1UdmKk9j8NaBHJTrCMD28Qek0mh93sb4VEzZVRSt
+RD+iGbCKrUjptPpX975PXYLsgOD8RD2dkaYvUzGCVGiumhcqLs2EV7CZzMhrsRJ3
+6QR4cktcqu/24pjSLmNH
+=7azE
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.43.0-r1.ebuild b/dev-tcltk/expect/expect-5.43.0-r1.ebuild
deleted file mode 100644
index 3494353aaf2b..000000000000
--- a/dev-tcltk/expect/expect-5.43.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.3 2010/04/23 10:44:12 jlec Exp $
-
-EAPI="3"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils multilib versionator
-
-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc X"
-
-# We need dejagnu for src_test, but dejagnu needs expect
-# to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-RDEPEND="${DEPEND}"
-
-NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
-S=${WORKDIR}/${NON_MICRO_V}
-
-src_prepare() {
-	# fix install_name on darwin
-	[[ ${CHOST} == *-darwin* ]] && \
-		epatch "${FILESDIR}"/${P}-darwin.patch
-	epatch "${FILESDIR}"/"${P}"-multilib.patch
-
-	#fix the rpath being set to /var/tmp/portage/...
-	epatch "${FILESDIR}"/expect-5.39.0-libdir.patch
-
-	#Removes references to functions that Tcl 8.5 no longer exposes.
-	epatch "${FILESDIR}"/"${P}"-avoid-tcl-internals-1.patch
-
-	sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect.man
-	sed -i "s#/usr/local/bin#${EPREFIX}/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
-	#fixes "TCL_REG_BOSONLY undeclared" error due to a change in tcl8.5
-	sed -i -e 's/^#include "tcl.h"/#include "tclInt.h"/' \
-		exp_inter.c exp_command.c
-	#fix missing define of HAVE_UNISTD_H in Dbg.c
-	sed -i -e 's/^\(#include <stdio\.h>\)/\1\n#include "expect_cf.h"/' \
-		Dbg.c
-
-	# fix implicit missing declarations (bug 204878)
-	epatch "${FILESDIR}"/"${P}"-missing-includes.patch
-
-#	epatch "${FILESDIR}"/"${P}"-ldflags.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-	local tcl_version
-	tcl_version="$(best_version dev-lang/tcl | cut -d- -f3 | cut -d. -f1,2)"
-	TCL_HDIR="${EPREFIX}/usr/$(get_libdir)/tcl${tcl_version}/include"
-	#configure needs to find the file tclConfig.sh is
-	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}"
-
-	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
-}
-
-src_compile() {
-	emake TCLHDIRDASHI="-I${TCL_HDIR}/generic -I${TCL_HDIR}/unix" \
-		|| 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 || die
-
-	local lib_basename="lib${NON_MICRO_V/-/}"
-	rm "${ED}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${lib_basename}.a"
-
-	# bug #182278 - /usr/lib/expect.so symlink
-	ln -s "${lib_basename}.so" "${ED}/usr/$(get_libdir)/lib${PN}.so"
-
-	#install examples if 'doc' is set
-	if use doc ; then
-		docinto examples
-		local scripts=$(make -qp | \
-		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
-		insinto /usr/share/doc/${PF}/examples
-		doins ${scripts} || die
-		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.43.0.ebuild b/dev-tcltk/expect/expect-5.43.0.ebuild
deleted file mode 100644
index f565abf39e8c..000000000000
--- a/dev-tcltk/expect/expect-5.43.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.23 2010/04/16 12:07:25 jlec Exp $
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils versionator
-
-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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="X doc"
-
-# We need dejagnu for src_test, but dejagnu needs expect
-# to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
-RDEPEND="${DEPEND}"
-
-NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
-S=${WORKDIR}/${NON_MICRO_V}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/"${P}"-multilib.patch
-
-	#fix the rpath being set to /var/tmp/portage/...
-	epatch "${FILESDIR}"/expect-5.39.0-libdir.patch
-
-	#Removes references to functions that Tcl 8.5 no longer exposes.
-	epatch "${FILESDIR}"/"${P}"-avoid-tcl-internals-1.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
-	#fixes "TCL_REG_BOSONLY undeclared" error due to a change in tcl8.5
-	sed -i -e 's/^#include "tcl.h"/#include "tclInt.h"/' \
-		exp_inter.c exp_command.c
-	#fix missing define of HAVE_UNISTD_H in Dbg.c
-	sed -i -e 's/^\(#include <stdio\.h>\)/\1\n#include "expect_cf.h"/' \
-		Dbg.c
-
-	# fix implicit missing declarations (bug 204878)
-	epatch "${FILESDIR}"/"${P}"-missing-includes.patch
-
-	eautoconf
-}
-
-src_compile() {
-	local myconf
-	local tcl_version
-	local tcl_hdir
-	tcl_version=$(echo 'puts [set tcl_version]' | tclsh)
-	tcl_hdir="/usr/$(get_libdir)/tcl${tcl_version}/include"
-
-	#configure needs to find the file tclConfig.sh is
-	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=$tcl_hdir"
-
-	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 TCLHDIRDASHI="-I${tcl_hdir}/generic -I${tcl_hdir}/unix" \
-		|| 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 lib_basename="lib${NON_MICRO_V/-/}"
-	rm "${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${lib_basename}.a"
-
-	# bug #182278 - /usr/lib/expect.so symlink
-	ln -s "${lib_basename}.so" "${D}/usr/$(get_libdir)/lib${PN}.so"
-
-	#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.44.1.15-r1.ebuild b/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild
deleted file mode 100644
index cd13c3b4ff23..000000000000
--- a/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild,v 1.1 2013/08/18 11:31:36 tomk Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="http://expect.nist.gov/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="debug doc threads X"
-
-# We need dejagnu for src_test, but dejagnu needs expect
-# to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2[threads?]
-	X? ( >=dev-lang/tk-8.2[threads?] )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect{,k}.man || die
-	# stops any example scripts being installed by default
-	sed -i \
-		-e 's/^SCRIPT_LIST[[:space:]]*=/_&/' \
-		-e 's/^SCRIPTS[[:space:]]*=/_&/' \
-		-e 's/^SCRIPTS_MANPAGES[[:space:]]*=/_&/' \
-		Makefile.in
-
-	epatch "${FILESDIR}"/${P}-gfbsd.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}_with-tk-no.patch
-	epatch "${FILESDIR}"/${P}-headers.patch #337943
-	epatch "${FILESDIR}"/${P}-expectk.patch
-	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
-
-	eautoconf
-}
-
-src_configure() {
-	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 ${EPREFIX}/usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	#tkv isn't really needed, included for symmetry and the future
-	#tkv=$(grep	 TK_VER ${EPREFIX}/usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic --with-tk=yes"
-
-	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=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --with-tk=no"
-	fi
-
-	econf \
-		$myconf \
-		--enable-shared \
-		$(use_enable threads) \
-		$(use_enable amd64 64bit) \
-		$(use_enable debug symbols)
-}
-
-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
-	emake test || die "emake test failed"
-}
-
-expect_make_var() {
-	touch pkgIndex.tcl-hand
-	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
-	rm -f pkgIndex.tcl-hand
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog FAQ HISTORY NEWS README
-
-	# install examples if 'doc' is set
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins $(printf 'example/%s ' $(expect_make_var _SCRIPTS)) || die
-		docinto examples
-		dodoc example/README $(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) || die
-	fi
-}
diff --git a/dev-tcltk/expect/expect-5.44.1.15.ebuild b/dev-tcltk/expect/expect-5.44.1.15.ebuild
index c58b6b56040f..2d41e8d572fc 100644
--- a/dev-tcltk/expect/expect-5.44.1.15.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.17 2011/12/27 08:16:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.18 2015/03/20 10:22:30 jlec Exp $
 
 EAPI="3"
 
@@ -17,8 +17,8 @@ IUSE="debug doc threads X"
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2[threads?]
-	X? ( >=dev-lang/tk-8.2[threads?] )"
+DEPEND=">=dev-lang/tcl-8.2:0[threads?]
+	X? ( >=dev-lang/tk-8.2:0[threads?] )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index 5c6935d64a57..778b77bd41e9 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.6 2013/08/18 11:31:36 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.7 2015/03/20 10:22:30 jlec Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2[threads?]"
+DEPEND=">=dev-lang/tcl-8.2:0[threads?]"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}