gentoo resync : 22.10.2018

5 files changed, 46 insertions, 232 deletions

diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 2055f6b095e0..25c90fbd852a 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -2,15 +2,11 @@ AUX tcl-8.5.13-multilib.patch 258 BLAKE2B ca0453e8e0f6fdc1302f024ff81a8a6e012d0b
 AUX tcl-8.5.14-conf.patch 427 BLAKE2B c7d97bccebc45beec003bcf005fab6ed7f544744d81f08778a997b767ea0a60fd07f7b7cbc464ef8252e47717b34c0c42c871331a04740e23caeddbfb351de16 SHA512 e8097acb127966e6f2914c888278acdd9042d881b4d9436853ad7ed2361e8d67a372d4b0b0d5f0333e6bf90220e72df5c5eeffd4b44bc8e94ea9631ddc98cf16
 AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebccb2c7a64c52c387ce674ad1543dcedb7b73bfa748e8b40424a59e4696057e3a7f6d0e9f7ddbe838473995f SHA512 8524f80bb54851fc28f1994cbbd9c78756f9f9b1ca31a2f602e2cc557bbb22093bb6cce0ce5099cb90847f3c0ed20503a3d122abb400482869afd2469b3867b8
 AUX tcl-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
-DIST tcl-core8.6.5-src.tar.gz 5846556 BLAKE2B 9c3c48acffc13be526b507fc19711b21e710a84642d37d494bb46a2d4ac9445a95749fd9556ffbda57d55f90bd566d0c9cd72a800a34f062616aacf57e811aa4 SHA512 b726f7d3193ad92ba64911b8c724d5454c5a93d5f5e95462ec0a6d8ccbbdf20093888f66c83956d7631392ca805c1a80430f102c0a932de3ed55311101e0e09f
-DIST tcl-core8.6.6-src.tar.gz 5868427 BLAKE2B 3444d474bfdc4958919dbf75527420614251e3cffb0d18fbbf547ffb83ead544f266b6ea868738ae40e02075cf31be6e753e0f89da02a2a81ededf09fc9dd2e6 SHA512 469a0221ed16569b70986cdde261d0c0df3bf64c493b8d6fc8368eb14597f7c2f6a01f082a1c8f27eb720618956e053cc97fbb9aaf7bb29cc96781cdc8e9518c
-DIST tcl-core8.6.7-src.tar.gz 5875027 BLAKE2B bc08e4e6639ba33176c8c1e670b957b8ad62a4790ace4ff8f8dc964f676ca87473c31c28f645d32a8287f844756fa224a077f96f1425f61b9872a4a0ae1429a1 SHA512 95c8c5bcb4fe604a77ca6ba9d49f9e90d156feaa9f3ab97661983f256ab54476b103ec8de01cd47231ed95e6df5e36d60514aed2ba5b8f3619cc5a3698ad3ee5
 DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
+EBUILD tcl-8.5.17-r1.ebuild 3766 BLAKE2B 735b31a87b13a4a107b451f1234699cb1dc4cab210846f992100e8f69543bfb2103e1814cefd1673e7081c6aeafed63cda87e36d433580ddbf5548cb779d8508 SHA512 3c3fadceaafeaad04780a44d40a10bd318d30fff0d1ff38bea683c2bf019ff4a3cb036f7fbc60c79cb095470c3c9a3f59ad8b27caf2ae9e98d2baf0ea6ebab14
 EBUILD tcl-8.5.17-r100.ebuild 2790 BLAKE2B d8de982d4d2f103bd5a1271101bc997cd1920c7274078f9004e6983d30326fa0379588d529c3e459f4e93e9e723548aa37fc5e074df768d046bafc3decb4297e SHA512 b09ac13d74992c34c333fba336e07e6baefbe8ee6a94e8c59b17ac40a508bab4146f7a6d00f712ef70b9d5d8d168d259dbbed77d4e5e2e65c2b45ff2769586d7
+EBUILD tcl-8.5.17-r101.ebuild 2850 BLAKE2B f34283905856e79de70e4894578b4d403c203ee00cdba9a96bc4e9c73e45b0fe4b773a40ec82679792380a87a34dc389ef468440bf32b05ab01c500e49b6aa0d SHA512 a057478a7535e9b596139693d5b104b14968cb7223bb90d8a4528d6560323a2bde925f94b349d1c67e1ce976849203b7105c1ad4792560a9628b7108012e7908
 EBUILD tcl-8.5.17.ebuild 3706 BLAKE2B 4f5b6c6fb9c25a7d31a1adc45fad8fa432478056d5a0895298ba79f2a5904bcd977a73d60f34355ed5290bf5077f5d74ba050583ebf0e99a119f9d4b14dbfe0b SHA512 11816e9baefbf29264fd844ddeb38fa94686b0b8ca667e7046713860a97945caf122f831d7778b7ac78ab392bd4ac9bc10578c70d74b21c83c5da1b479d9c800
-EBUILD tcl-8.6.5.ebuild 3951 BLAKE2B 91748bc079cafd2cb6f22f8c4870901f2d36fcfc45c115318f98f10bd024de23c926cab98297ba6db1619ead361cd1147ab182c9615995083765b760f078ce6b SHA512 e587e699d26b55dd7dc95527f260449b3ac0f121a1e593a16eb24c34c46fdd72e33399636177ed9c84fcba7032f2b42e1197bffdf95e965912c3f4a77d6d815d
-EBUILD tcl-8.6.6.ebuild 4038 BLAKE2B f2412b2e2cdd6f3d70fd90ab70e1ea65bafe9cf77d6274cb3a6c8377778c530c8a926a39fe5b9d2098be646168f6dbd00bd7ded07990d06bdfef3b64e2a5096f SHA512 76b1ad672e9f4102b64d945702f6a4daa0973a46a243a54611b9b13ee524815f61cd9b664eec6ea6f6448b86789cab5c5374cbfdaa8ed28dc2137ff8ce767f0c
-EBUILD tcl-8.6.7.ebuild 3964 BLAKE2B a0f5158a4ab510cf394b5df2af7da1c0d9ae4bf5ece4190d766fb3bb17f4e9b7a965456ad8c4f4213e55efc802e73beeed44fa588f7b3463606532b6a1925552 SHA512 fa39358b35da654852e9a097f7ca4dbf85b9dc0b5656805eeb1ccd33b1ba999598ca9ee1456a40676fac8b010e987c37b6ba8fbead23b09cbd7b751b37d89fe7
-EBUILD tcl-8.6.8.ebuild 3995 BLAKE2B a21acbefc4d086965f433fb5576d9b70755ffc17a98205f40de699cc10bdea71cef177dd0f74bff510fb046dcde23cc5b06c3c2faabcc210cf1f1d7e50ce280e SHA512 ab86bb84d7eb467a683838909f05f3c214bfabc7a5c1250de6c736e581be341477c5effe093844fae06cc71ad124215275f8a5a613e6e3716d59da9de76fdfaf
+EBUILD tcl-8.6.8.ebuild 3986 BLAKE2B 0d126b490efcf0165049479fe94d0b31157b8237b0d75a4e3d801c6d56f1a28df88788d612aca0f6e45a5488f73e544550e3c62566ca33b9a99e4b3bccbb9637 SHA512 851baf012be74129624423ad882a7580c14e96827ec4b0fb05a82ffe7dc96d11ce87b091ebce8a6297782beb067f7ae4875288dbf436cc22d5aed0aeb66bde48
 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf
diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
index ddba72845ae3..a56e7f4e4506 100644
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
@@ -1,45 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=5
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
 
-MY_P="${PN}${PV}"
+MY_P="${PN}${PV/_beta/b}"
 
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
-SLOT="0/8.6"
+SLOT="0/8.5"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +threads"
+IUSE="debug threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-# Bug 629680: need to disable testing since network-sandbox creates false negatives
-RESTRICT="test"
 
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
 	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
 
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
+	# Bug 648570
+	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
 
 	# workaround stack check issues, bug #280934
 	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
@@ -50,14 +40,7 @@ src_prepare() {
 		-e '/chmod/s:555:755:g' \
 		-i Makefile.in || die
 
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
 	eautoconf
-
 	multilib_copy_sources
 }
 
@@ -81,6 +64,7 @@ multilib_src_install() {
 	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
 
@@ -119,7 +103,7 @@ multilib_src_install() {
 
 pkg_postinst() {
 	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.6 ${version}; then
+		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"
diff --git a/dev-lang/tcl/tcl-8.6.5.ebuild b/dev-lang/tcl/tcl-8.5.17-r101.ebuild
index e76f93f75edb..c210e2d6ada6 100644
--- a/dev-lang/tcl/tcl-8.6.5.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17-r101.ebuild
@@ -1,43 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+# this ebuild is only for the libtcl8.5.so SONAME for ABI compat
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+EAPI=5
 
-MY_P="${PN}${PV}"
+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/${PN}-core${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
-SLOT="0/8.6"
+SLOT="8.5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +threads"
+IUSE="debug threads"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	!=dev-lang/tcl-8.5*:0"
+DEPEND="${RDEPEND}
+	"
 
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
+DOCS=()
 
 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.5.14-conf.patch
 
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
+	# Bug 648570
+	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
 
 	# workaround stack check issues, bug #280934
 	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
@@ -48,14 +46,7 @@ src_prepare() {
 		-e '/chmod/s:555:755:g' \
 		-i Makefile.in || die
 
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
 	eautoconf
-
 	multilib_copy_sources
 }
 
@@ -74,11 +65,13 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
+	dolib.so libtcl8.5.so
+	dolib.a libtclstub8.5.a
+
 	#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
 
@@ -90,42 +83,14 @@ multilib_src_install() {
 		-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
+		-i 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
+			-i 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
+	insinto /usr/${mylibdir}/tcl${v1}
+	doins tclConfig.sh
 }
diff --git a/dev-lang/tcl/tcl-8.6.7.ebuild b/dev-lang/tcl/tcl-8.6.7.ebuild
deleted file mode 100644
index 4240a4a81029..000000000000
--- a/dev-lang/tcl/tcl-8.6.7.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
-
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-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
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || 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
-}
diff --git a/dev-lang/tcl/tcl-8.6.8.ebuild b/dev-lang/tcl/tcl-8.6.8.ebuild
index 9cbda4fccbbd..31f0fcf3f657 100644
--- a/dev-lang/tcl/tcl-8.6.8.ebuild
+++ b/dev-lang/tcl/tcl-8.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"