dev-lang/tcl: Version Bump, #444296; Cleaned old

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

11 files changed, 65 insertions, 631 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 422c45e23afa..d3dc4cf0b49d 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.158 2012/06/07 16:36:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.159 2012/11/29 14:01:36 jlec Exp $
+
+*tcl-8.5.13 (29 Nov 2012)
+
+  29 Nov 2012; Justin Lecher <jlec@gentoo.org>
+  -files/tcl-8.4.11-multilib.patch, -tcl-8.4.18.ebuild, -tcl-8.5.7.ebuild,
+  -tcl-8.5.8-r1.ebuild, -tcl-8.5.8-r2.ebuild, -files/tcl-8.5.8-fortify.patch,
+  -tcl-8.5.9.ebuild, +files/tcl-8.5.10-conf.patch, -tcl-8.5.11.ebuild,
+  +tcl-8.5.13.ebuild, +files/tcl-8.5.13-autopath.patch:
+  Version Bump, #444296; Cleaned old
 
 *tcl-8.5.11-r1 (07 Jun 2012)
 
diff --git a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch b/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
deleted file mode 100644
index 8ada22d8f93e..000000000000
--- a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur tcl8.4.11.orig/unix/configure tcl8.4.11/unix/configure
---- tcl8.4.11.orig/unix/configure	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure	2005-07-02 20:23:23.000000000 +0900
-@@ -7664,7 +7664,7 @@
- DBGX='${TCL_DBGX}'
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
--TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
-@@ -7788,7 +7788,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
--elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
-diff -Naur tcl8.4.11.orig/unix/configure.in tcl8.4.11/unix/configure.in
---- tcl8.4.11.orig/unix/configure.in	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure.in	2005-07-02 20:23:12.000000000 +0900
-@@ -459,7 +459,7 @@
- DBGX='${TCL_DBGX}'
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
--TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
-@@ -552,7 +552,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
--elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/dev-lang/tcl/files/tcl-8.5.10-conf.patch b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
new file mode 100644
index 000000000000..dd90b06a6e55
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
@@ -0,0 +1,26 @@
+--- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
++++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+@@ -1427,12 +1427,12 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++		CC_SEARCH_FLAGS=''])
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+ 	    AS_IF([test $do64bit = yes], [
+@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_SUFFIX=".so"
+ 
+-	    SHLIB_LD='${CC} -shared'
++	    SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
+ 	    DL_OBJS=""
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tcl/files/tcl-8.5.13-autopath.patch b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
new file mode 100644
index 000000000000..77f0ca6ced0c
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
@@ -0,0 +1,19 @@
+ unix/configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unix/configure.in b/unix/configure.in
+index 65f712a..b606b74 100755
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -840,9 +840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch b/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
deleted file mode 100644
index 0cfce74f0cc0..000000000000
--- a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix buffer overflow with GCC 4.5 -D_FORTIFY_SOURCE=2.
-https://bugs.gentoo.org/317727
-
-https://sourceforge.net/tracker/?func=detail&aid=3048354&group_id=10894&atid=310894
-
---- a/generic/tclTrace.c
-+++ b/generic/tclTrace.c
-@@ -909,7 +909,7 @@ TraceVariableObjCmd(
- 	    }
- 	    ctvarPtr->traceCmdInfo.length = length;
- 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
--	    strcpy(ctvarPtr->traceCmdInfo.command, command);
-+	    memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1);
- 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
- 	    ctvarPtr->traceInfo.clientData = (ClientData)
- 		    &ctvarPtr->traceCmdInfo;
diff --git a/dev-lang/tcl/tcl-8.4.18.ebuild b/dev-lang/tcl/tcl-8.4.18.ebuild
deleted file mode 100644
index 24fd6c306b9e..000000000000
--- a/dev-lang/tcl/tcl-8.4.18.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.18.ebuild,v 1.13 2010/12/23 18:37:30 mattst88 Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug threads"
-
-S="${WORKDIR}/${PN}${PV}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.16-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
-	# cross-compile fix from buildroot.
-	epatch "${FILESDIR}"/${PN}-8.4.9-strtod.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tcl-configure-LANG.patch
-	done
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	local local_config_use=""
-
-	if use threads ; then
-		local_config_use="--enable-threads"
-	fi
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tclConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	if use debug ; then
-		dosym libtcl${v1}g.so /usr/${mylibdir}/libtcl${v1}.so
-		dosym libtclstub${v1}g.a /usr/${mylibdir}/libtclstub${v1}.a
-	fi
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from tcl-8.3, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.11.ebuild b/dev-lang/tcl/tcl-8.5.13.ebuild
index 2ca6c9593dec..5a0a0c682dce 100644
--- a/dev-lang/tcl/tcl-8.5.11.ebuild
+++ b/dev-lang/tcl/tcl-8.5.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.6 2012/04/26 16:15:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13.ebuild,v 1.1 2012/11/29 14:01:36 jlec Exp $
 
 EAPI=4
 
@@ -35,11 +35,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
 
 	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+	epatch "${FILESDIR}"/${PN}-8.5.10-conf.patch
 
 	# Bug 354067
 	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
 
+	epatch "${FILESDIR}"/${P}-autopath.patch
+
 	cd "${S}"/unix
 	eautoreconf
 }
@@ -71,13 +73,16 @@ src_install() {
 	S= emake DESTDIR="${D}" install
 
 	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir)
+	# and drop unnecessary -L inclusion to default system libdir
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix ,TCL_BUILD_LIB_SPEC='," \
 		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix ,TCL_BUILD_STUB_LIB_SPEC='," \
 		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
+		-e "s,^TCL_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TCL_STUB_LIB_SPEC='," \
+		-e "s,^TCL_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TCL_LIB_SPEC='," \
 		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
 	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
 		sed -i \
diff --git a/dev-lang/tcl/tcl-8.5.7.ebuild b/dev-lang/tcl/tcl-8.5.7.ebuild
deleted file mode 100644
index 24b3eeda4bd4..000000000000
--- a/dev-lang/tcl/tcl-8.5.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.7.ebuild,v 1.15 2010/12/23 18:37:30 mattst88 Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tclConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.8-r1.ebuild b/dev-lang/tcl/tcl-8.5.8-r1.ebuild
deleted file mode 100644
index 7b3309426b1e..000000000000
--- a/dev-lang/tcl/tcl-8.5.8-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r1.ebuild,v 1.13 2011/01/13 20:02:06 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.8-r2.ebuild b/dev-lang/tcl/tcl-8.5.8-r2.ebuild
deleted file mode 100644
index 66a2551eb419..000000000000
--- a/dev-lang/tcl/tcl-8.5.8-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r2.ebuild,v 1.4 2010/12/23 18:37:30 mattst88 Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-	epatch "${FILESDIR}"/${P}-fortify.patch # 317727
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.9.ebuild b/dev-lang/tcl/tcl-8.5.9.ebuild
deleted file mode 100644
index af33196a68e9..000000000000
--- a/dev-lang/tcl/tcl-8.5.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.9.ebuild,v 1.9 2011/08/05 08:20:20 naota Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}