dev-lang/tcl: Version Bump

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

4 files changed, 244 insertions, 24 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 74f5908fdde7..11c324e588cd 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.201 2014/09/15 18:28:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.202 2014/12/19 15:02:24 jlec Exp $
+
+*tcl-8.6.3 (19 Dec 2014)
+*tcl-8.5.17 (19 Dec 2014)
+
+  19 Dec 2014; Justin Lecher <jlec@gentoo.org> +tcl-8.5.17.ebuild,
+  +tcl-8.6.3.ebuild:
+  Version Bump
 
 *tcl-8.6.2 (15 Sep 2014)
 *tcl-8.5.16 (15 Sep 2014)
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 882e976f72b3..33a09c3b85d9 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX tcl-8.4.15-tclm4-soname.patch 477 SHA256 2130b8b5fdddadfca35b74e9432d2651733e4f1c7b13d66ffc87b6995865076b SHA512 280295134a053469defb095ccc447bbdd96b75a415eec099bf8aae8b9e5f271766a0228d6646dea564501f697454eb8ffa32d6f0682825f6073f110aa22644b5 WHIRLPOOL bab6dd5ee47af6498d528a9766ae74ab820156f1f4fea987b1e41e5f01da9e4d1176111e806b2afc5db54bc0a563eae05aa712343424ffe711e363fbe73bc23d
 AUX tcl-8.4.16-multilib.patch 988 SHA256 6df0027ee02c1f458e8ae5f07538e0838317d72d028c6e1af97e8433d866b0ce SHA512 a86803a3d676bdea8c601dde47806ab0516dd421f4cf6a375b16d12bc4a68130dc1d5ec4c8de0088b385a17d8bbc0289b08cded6d1c0fa78f686615b1006865a WHIRLPOOL 1768af16e193aa99f24b868586bf8f4b40b0d76a2cfb403269c63c891c11d3832fca4560cb9c61a3f9a11d431f8d3e59b9ad92e32989550dbd4b5b0333c88db1
 AUX tcl-8.4.9-strtod.patch 362 SHA256 93fad4cd880492430d5d55730b96a12697a58e951d8145b2b66025bceca10386 SHA512 add67c1b818c045c25202cb59424788824c68925a376ff89dfeaf2beb1cd1c459b392a8dc83bf9277effe454cc6a4a06dd3fb0cdc25e42dfd02e38408612ce0d WHIRLPOOL 8ea1a92f8a0842f8b5fc0ffb728ae41ebe8a2fabad82f181344fa7a1d3fda3fb6ed39af89eef784d22f844d0d3b3c5e73dc7b32903dbd315030f7c12d41bcb9e
@@ -16,32 +13,17 @@ AUX tcl-8.6.1-conf.patch 518 SHA256 55c4bf1a8e21b9cfc749e4207293c6472f84145082be
 AUX tcl-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2
 DIST tcl-core8.6.1-src.tar.gz 5773335 SHA256 00a25fcd70e0be65f85e996353c2a0717eaaf51dc547cf6e499bb05257e20764 SHA512 d3f4c3200017f3afcc50c19619d79a31cac5441b4aac341524a6dfdda3e6f2eada1e0a70875d24f29afc733998aedf6fa14826cba61fceda496aaf2a2a4a3c5b WHIRLPOOL dbd53216ee28bb9a3fbaa7aa5c07ca5931f098d6761eaa859d74ab5dda409e6dc77a28ee43a312267ceff74d04fb723484b6ea8afccf429c28cea5fd6c64521e
 DIST tcl-core8.6.2-src.tar.gz 5808780 SHA256 8c5142fb275284f7678462a95895b892e64260a76d5fbdc690a6365de72b2667 SHA512 7ff3d3dd4884bb9470a2736b4c0348b957772902f3e6a69ff4a5c81b0927aeb3b1b19ab476c965ceca9eb94606b0936e0895747f4e76e04c265b318eade62b89 WHIRLPOOL 933806a400b4725f5f0ed207ab307bd5e20bd0ed2952d587ccf2ebe8ab041150e830b66450698a8938e3096242298e9191f6b3537b20d0426e9aa18438dda52c
+DIST tcl-core8.6.3-src.tar.gz 5820073 SHA256 7227879e706a3a72b50a53c647904b6eedda216049f255acdc597aaea6131207 SHA512 1ac78eab8a25b8c8e717d630848b5f493c91c345ac31154706a60f1f11c12745c27e91abb67052ff3131189d6c125b7160bb579ee99cb2e479fe7c96d9d1383b WHIRLPOOL e74f70f47bb4b323fe6fcac98a41177f11fff5e3ec73996ca41b312a45582e08d51a9a361c615222647e76f864279205dc06fbe28eaa6d81eb2e2adc27092120
 DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
 DIST tcl8.5.15-src.tar.gz 4536117 SHA256 f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e SHA512 44c8a975ffaeca1f954fbc160fed966064340b5de883e53321691c6c457283716c4ab5c87c7c754ff5c1bd293d46eb14bbf356a0bf6a5ed0078d8789703df3df WHIRLPOOL da369146ccc1a449eae6b2fddc7802457c267b1ed047dba665b2684f27105a0763646b6a985e697891b3da9b3531a89f1ffb78168dc386c27889bcdaaa175e1c
 DIST tcl8.5.16-src.tar.gz 4545982 SHA256 a26cbdb0437d05e5a00c993570737e71fa6cc9084e19174d714097b5cbaac1b1 SHA512 58db492fc688c2238db0e8d8fc7d663808e9b7ccf7628b3476e0fac09e7aadd543a5b8dadec1142c485786dec33e308c067a6907902d6454ca01804109542c4f WHIRLPOOL b626399eed2ee7ff53c17eb52f13bfbe230cd8b64199786cdd3e39add8ccfb4d9f928235fd89ad0e9ed0f87b7f8aaf6c2b9537ee3b9fb9e0fdae2c4d15ed2191
+DIST tcl8.5.17-src.tar.gz 4546317 SHA256 4c7cd8f2e0900cb36dde899b3f9f4d5c471ee3c4f8304cf9ec71fd18cd5e98d6 SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 WHIRLPOOL 7e97049eb3875bcdc33b2d8ab02b0932173916fbbdfbc7970dd3c3ed1fe520c15ed1d6106215a823b5fc6f5008f12f3ccd1525dd536ec239388e6bf459352ab6
 EBUILD tcl-8.5.13-r1.ebuild 3703 SHA256 eef3815b430316dbefc11c7b3be061e1fb68e00c3b8a8fa652368cb40eab3fba SHA512 bd9631a7deaae6dcad8bc8542fdfe4f8c77b9d75fb156924e2a5f183099b6e11f5d48369c8f998644abace078f68d53d2034a886bb59c4fd31d2d3ff5fa8a18c WHIRLPOOL 8d1079112e9b822d392a8177c4f64aa87e3e6b2a0072cfb7c5c024b80e057b0d93402353ebc39ef4cc9fa115ebe63cd1da878f5bc989351ca925409602d64a90
 EBUILD tcl-8.5.15-r1.ebuild 3844 SHA256 360828138dface703d1f3c1781d555ace5c6d29c8c8e5b4a9feefc299edf0aab SHA512 774dc089cd19a694635a262ec717793d06f62ccb92eebb3b36cc6d44c3ae6e6cb3cfa23c80c2936fe85f1a94406b3c270dadeb3334247def481e1500c8e14deb WHIRLPOOL c5b558e3aef880a9282cc27229ee3919896597c75437b7a417134f201bbab4445264749b82a389649df45ec07468d835689b92ee9f2dc5f27072111c5079d1af
 EBUILD tcl-8.5.16.ebuild 3783 SHA256 f55a1e30e1415289807af7589199f07e54d4ae0ee9ed92d57ac38fa6b05b28a5 SHA512 de25f3b6ed6141e83d4170d9533009ef87cb5795304dbb69854de806177541ab918e1b03dba9c4b6cd4ec85c9b2333de34bf89cac12c6e6ef450d911cecbc053 WHIRLPOOL db3847288326e399e1423038d11c3d726db24789e4cc110554fd2ba02011910944eebb4bdc901c5375df2bf4940c5da3196cf87c608cb641d57cdc764779b77f
+EBUILD tcl-8.5.17.ebuild 3783 SHA256 543c153c087b6d950e5324a695c074d36c29ecfb3ed30fdb06266f522fed0b96 SHA512 e3d34d33f4baa0634e3f782fab8e8a6465cc6e821e0ae4827bd2f01b31e5b99abce99ed2db02455224c2edac4f5cf68b797fa8148a0cfbdaba37f0c2b14f410e WHIRLPOOL 136e7484ce16a5723adaaf851e747ede29faf91f0933381d03109cdb87ea790ea7bdf02b256853d5f8540bf2a9a24588076efd1429278baffa6e0a5c7b646124
 EBUILD tcl-8.6.1-r1.ebuild 3991 SHA256 5582fad80d1ec7735bac1091182ef36eb99b3a7618711b7679352303e1ad401c SHA512 b6b4d7ff4ea4676e2a9a453b9b21dd59026ce34344353f9d6f223c74536cf98f41687ff6d1b85452e84c86883c9c06a31912db1d0c58a30c203261bb5e31d364 WHIRLPOOL 132c345c8d2e62d17f98a6c015dfbb60170914fb92d5e009bb3150ca5fa125df5534d96059c1138a00de9c5813933c9f934d0793e34fe6361e415cbc38a5c5e6
 EBUILD tcl-8.6.2.ebuild 3926 SHA256 13a620f3d77c838dc3a916d292201c4e439c4c14ea97b3999ac1f89c3374f059 SHA512 d4787ba8b75cea0a12a576fc2c875bf768dfebed3a9699de2a741b9317782909450d7635df80406a0c869ec13aaa1c45a1cf5aa4ab55847da5429934a6a9ea04 WHIRLPOOL 75ba6cbbea891948dde7808a55f4fba3d50e3e364f9534a3bd47eccde7060da32e69af9bb86bfef1e27a5e7235fa6ba1548cb94b93c794ce005401489cd40410
-MISC ChangeLog 26391 SHA256 eb8cc4df5d355fdc81b518ee3d08e8e04b8a00a4002e21dc91d084a27fc27d33 SHA512 c6f24b874e0fac60304092c5bc51d6b47b13cc7a2e20b97a946e4e380b0c746bcf171bb7d8aaf4c29e5fee1de8796297ba2b16927627b37ae869a14fd6c0ab6e WHIRLPOOL df514f2783fc9fe235624167f034d6300df722ebf6c9f720f1a80af991b95271dafdb1cb801a855980435ef5bee90e63d2954ddef0fcf12cfa67884d2c8290f8
+EBUILD tcl-8.6.3.ebuild 3926 SHA256 1b371b75eeae24025010a0e3f8e62d3b16fd15da0d7a77c9526c455ba216aed1 SHA512 039b3bb10ae44cc5b87bd51b87abd5a745e758c7e8cd96f0d31223f64e5bcaa4095e5c6ab25213e664f5aabaa9dbe92df240cf942dd2b02b86cb1a8fa3966d03 WHIRLPOOL 7a2a57a06a142e4f683451bbfdc651d045c96068b5b02278100d746e9c7d8a82e368e3942e8d8584cce30603b34f0173252ffa1480604f021e2f4c916112d57c
+MISC ChangeLog 26547 SHA256 fa8c39007f4813d0ddb4da10553aff0520ab2ea43a5094a4312d28d87b1cd8e0 SHA512 0de3965cac9475444c6c86fa0f2bc4210d387aaef4a431f8f845940cf36125129cf06be1c1db1f83a65135c55edb9a7e532af09c57009c6118896a1746cc5711 WHIRLPOOL 601937541da8eea557c6fd4b129eafdf1f1aea11aa3b4cd3a4f74b19e172d7d4f2011fc34bc166375b13dd26cffee102c048789b0af5a8a6ba4d747c25e97761
 MISC metadata.xml 271 SHA256 55e82636b02ffc7d7c033812851e6bf197a6e2b797fb8b5ee13c59c31246a0ba SHA512 f667a280785dbd69bfb4a0d78cc197e40196a2017f6f9c7fc3e4ed8846dda9608b2e9c9b01b94ab0d57b445fb3080d5fdcfc48d40def19bf90a5edaf188c5372 WHIRLPOOL 1447b7739ba725f572bb5c713d56867e3c5fc2dbad4bfd708d5b2ca8d50e74ff24bda238a3d30aaebb50457a87a8e9528c573fc3a443b6ee12e85a2b24514eeb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJUFy/bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViresAQAI6iowSChYaiFNqmfyGMSbuw
-t7cOwCiDPmKiP2XkVCXDrVbygf6Pc7gxNEGv8Phd40KoU+9AP7ileAtF42F00V6I
-kZvVMlBTfmsl4RWHkyiu2gvXltp0VwmNfkc82W6nh+KBL6C2FKU0jkOm0LmSOxxq
-hKXcgsxdVnkDNq9+d3w0mIuDk9pfH7g3OQnnWQ+SxzAjEDrdL/+SqUa9PuxtluyM
-izK9TApNTROnmCNksTlukHlmFmgeCCwNjbMXnOxa2H/lCNOXFnCgt/CwtsVSqA95
-KX3sAV2f6kUyGnhbtdIhH61SeYRz4HT1f5QE6ooDbR/kvfSZoTymzZd0YFrdtARc
-e6Q8uuwvCw/Lc9bqbVj5jJ9Ra8v85+R2waoEAJzYRl/jun1kD6QIVrsyAFs0Xhg9
-v282Cxm0I2zf/e1iYfXC23U9Z1BymUM2N6n1gOoeHxispuE96hiuj2gNztL7OY8y
-OYJg9UWgq9jtmg8RsM8WhEOOJXqhbZybTUe19aCfbzYVJelHKX3voF8eJ5G2gHik
-Eq6W+oFqiWYnPkoWAZ646YC7CtSCwu9/EgV40cHhJO/sFTlkiy1CtrOUp6tRDwCI
-aYPlUjsUtynkehCpVuHvxrgDVs0J5/LnnFLnSDnAZ3zPN1icxZ+EKXi0F10knW/D
-xXVxaMPstVD0CiVyco2Y
-=OKKZ
------END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.5.17.ebuild b/dev-lang/tcl/tcl-8.5.17.ebuild
new file mode 100644
index 000000000000..13db8bc72469
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.17.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.1 2014/12/19 15:02:24 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+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="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	fi
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.5 ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, 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,"
+			echo
+		fi
+	done
+}
diff --git a/dev-lang/tcl/tcl-8.6.3.ebuild b/dev-lang/tcl/tcl-8.6.3.ebuild
new file mode 100644
index 000000000000..16096af18dad
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.6.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.3.ebuild,v 1.1 2014/12/19 15:02:24 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.6.1-conf.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	fi
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.6 ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, 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,"
+			echo
+		fi
+	done
+}