gentoo resync : 13.10.2019

40 files changed, 165 insertions, 303 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index ff91b822f35b..33ba71621045 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 3db450dc7d41..fba74af609b5 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -10,5 +10,5 @@ AUX blt-2.4z-tcl8.6.patch 3281 BLAKE2B bc4963adc5016d8b2606d357538ed6a2940b2e47f
 AUX blt-2.4z-tk8.6.patch 781 BLAKE2B 46e29dc6390033981e9db351d8d00503c37c45a0f7c6777f6d18c1855a143f11be3cb7fd4fde8b26e33c266ba74eb4e7ba32d53cfc7a63b4319004b0f4544f08 SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602
 AUX blt2.4z-64bit.patch 891 BLAKE2B ddf77f3a5d47a5252271e57adff1afeb9a4bca868a89c4060a13b7c494355499cd14238a5087cd6da43e7f589be8894f7cbdedb2d04c7ea004a7193da63e2c8f SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4
 DIST blt2.4z-8.5.2.tar.gz 2326234 BLAKE2B 83ea57989ee1e7bbbc243058b1a734942c4b6d796d06aa3a702012ea8d01eb059e76b6b8ff0efc9b43b000f1cfe7545419e2d892f1794b2add3d8c2c602e22ba SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a
-EBUILD blt-2.4z-r13.ebuild 3556 BLAKE2B 77dfc3480393d2b362a61c2c6fc58350ad6f000eeba079797d79e8778be9c6c6942568563098d377e9b5d52d924c96208ea705ddd784ad60b405149f2306da0e SHA512 ca2735519b91ea3d49aa2292405874a3fc7a471f787b6c8d70551f667855ada237f72f3341f3d8d76b81b46f201a5055610f7f7fc9d68cf3bea9300f9e175b7d
+EBUILD blt-2.4z-r13.ebuild 3534 BLAKE2B 3d5d25030e2875f9268d8c89193fa61f9c2990f868ded3fbdbd39f581859b3d12598450507b64d64c750ae7f1e1b4684b6d7bb43c875f85aac410ef77e7bc2dc SHA512 fda536f17ed19192d100000bb58cb71cd4b47ed2d3d22e3150e46e8f6fad4e682813a8e3bf7f680b7b22851b14f35d6d214a0ae76bb59049ea1a07284b30a741
 MISC metadata.xml 336 BLAKE2B 42e123497016c3cffffc99cd56d04cf37bc81ad11487a39a97f1200df91edfb8d2c359ef76a3be83d4682cc6e2ba2695fd460af1de06d8f15b0932dd1f3ad211 SHA512 32593908c71225b7869b03d96dde6b7ed0d3db25f921257cf5027c80830cca794d0ed30b73c3189edd34553d6766ae57daf8caceb106bc49398fb519fd95d28c
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index 2b9f4b0c0f04..ea0a00ff5311 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 IUSE="jpeg static-libs X"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
index c70497c1cdfe..b2c4ea9fb8ef 100644
--- a/dev-tcltk/expect-lite/Manifest
+++ b/dev-tcltk/expect-lite/Manifest
@@ -1,9 +1,3 @@
-DIST expect-lite_4.6.1.tar.gz 142875 BLAKE2B 9e7143d78d68338c4d6ec2858f3a24c5b5330193bfc064c27b190bf6ac7b01e53340e48006f5313cb301b6f6f9f858e818ead8fbe6117ba9ee8c6035b9f9b059 SHA512 a250f34472dad6c44149edf85d35f7ea159e0673aa5619864a71eb78003d0c1a2ec3d25505618f616d12d82d50bda8039a239b443014b43b2387059e6b6eb7d6
-DIST expect-lite_4.7.2.tar.gz 145084 BLAKE2B 053f26ceaa98cde7bfe680f3076cdcd5391cfb6483c6ec0d0c9bcdf1f51e4b53c6429cef50a10915cbb01955fbee77bb6075bde612b6299bfd95357ab88f7408 SHA512 1f635f87fb53624f687477bae41edd37474c5358de368af8065d4222181ed4a5efdb55c8fda47e1f1b4c163fa2a423e7d84a7da8415b17cd250417432ee0fc5b
-DIST expect-lite_4.8.0.tar.gz 148917 BLAKE2B 0aeba8356c41f740807b914941c58a7ed26cc826ce2e297c5275b4f9a8c227437b2120d74f60229274aa56858ce03021245ef218e8d75a64cc6508f43b3afe2b SHA512 b4956dbcdde1e5648a51be99069069be6ff2ae6fb7a67116a35bbbb8786228920e9177bd1b14d0ac3dd0a8ebdd6fa523c62bb7f23c84407ebe73abe3523e43c0
 DIST expect-lite_4.9.0.tar.gz 149560 BLAKE2B 6db5c7f37d996996bcd94ef5e0b7d2d2d592cfd88f56f751c35f53826d3cea473861d332327caf4e9c6950a983b2d907955a7b68e8ea46655e07a8197fbe1f6b SHA512 1a210f5937cf31768a77c9f8d7147be1d8bd3f4e3c68c8941fef7871d22c209c9946aa1f3b2705a0332523439a7e8c9ef7ae3a46d4b5174b5e759bf15dcad4e5
-EBUILD expect-lite-4.6.1.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
-EBUILD expect-lite-4.7.2.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
-EBUILD expect-lite-4.8.0.ebuild 609 BLAKE2B 03e0ccd1544a9c4dff58d7b5e02bef9a5878ddac6e5361725357aded02e4ee164a09a2f08991872ee273302f33ff8251718dd2e744568dd56a81da2c1e017e13 SHA512 659555ec0eb741831fd52046fd335c297046033111102b37591bcc87118a263e1b77649af5ec9fa30db0c81ad32fd74058f7fb50a61e46e4c319ed4acf165b67
-EBUILD expect-lite-4.9.0.ebuild 637 BLAKE2B 7ce4e71b0660132fbb352e10154191bbd3a2b0b5f508fbc7a5471294e81f5e773f8e058b8d10b369b6cc8c906c807ae60f922bde4012c29e7f967e5ad2de7e6b SHA512 cd40e2f9eacbee0bb7bcdbab7dac8e0cb33ccc460346794e9fe093417944b25adff28c00d53d48e14953248b4e038fcbf1b768e6e2d9a6bd17587ed52761782f
+EBUILD expect-lite-4.9.0.ebuild 635 BLAKE2B c6c84f54d8f129545223f0e3497643d9d4e6ded023bf35e400d95653a19c63e22aa1a567ba7cf281d1b604c57f9e22bd3526433a9e497aa5e79d9a58ef687206 SHA512 ac97c4a8153746bc5e93464907012309aa5c980f58c4814581efe30b7a3cdab1c21af4ab1bff90d48ad2638fee42a84d00df970901989f78cebf886e072555e7
 MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild b/dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild
deleted file mode 100644
index 4440e9994297..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild b/dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild
deleted file mode 100644
index c460f1458eef..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild
deleted file mode 100644
index 37fb9d98e18b..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN}
-	doman man/*
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
index 5f96fcf7d046..7e006fefdd6b 100644
--- a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
+++ b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug examples"
 
 RDEPEND="dev-tcltk/expect
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index eb869e962440..1e6f8c419a19 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -6,6 +6,6 @@ AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb3
 AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 DIST expect5.45.tar.gz 628808 BLAKE2B d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
-EBUILD expect-5.45.4.ebuild 2343 BLAKE2B f310e830afd5b5e32ef51f2ae7c9c5f7d894fb773eb47eb2bcb64c768937d44b28a1957ec199a1ae897a76491d06370cf03521f7985c5591a5b60e0e1b111f11 SHA512 edfe6533c8087d084e7f28f6d6e5eebb007d8b921d63b0e023e15e12607fed6d0ddddb589d848254774c00aba4906b15b2412f4187f458e4269ac061771a9077
-EBUILD expect-5.45.ebuild 2323 BLAKE2B a7ddc999f1d2c1b3c8f1a8c5983b94c89e4a4e8dcc3d06e229b63f359d41ea108c3f2d7d92d2427e6ada3fa01c840cc233cc839335d21c41be67cf84378b9808 SHA512 bfef9b4a10fa57845aa223962a457949db55fdcd41fdb507c9413f4fd223bfe37a5cee231394912d0d919dc10641e9f6908cf445e508fc794b5d2dc4c10d3582
+EBUILD expect-5.45.4.ebuild 2321 BLAKE2B 62d7499cc92b58dbae40ca873580eb3a81862ca1341393920d5fadc2556f6d37211ac2edaf0866540b08d679171a54f7171dbce2c849caa816513e306f8634fd SHA512 d5d5274e93d27bbc3569319766510439172e357239df99e3bb72d6e7fd35b803ea8aae83fce89a359484f678cef2f7556f2a852692d3ce3ed400b2f28fe086a5
+EBUILD expect-5.45.ebuild 2301 BLAKE2B e70d84ed1341cbec6da302326eee881aff55afa871f698b9a8b68fc265dd04b2fca764a5e764447f3f5091ec5f052058dec49b1dd728f69697392ab274de3958 SHA512 59ea91fccd1e777d49a9f60872609d528a981bd8f20db39e7b34070c55f7d388224561dfb8aad3146f8a5618943881a709a13a07296188451f11a3343a67fd47
 MISC metadata.xml 329 BLAKE2B 9eebe793b4602782f9bd2db8dd7a0cfdfdab3f89400f3ececcf25862220c47e78feebc579b468ae5dc44ae482b8a69f844f141a2f535fbd61dec73f11c8eea83 SHA512 cd5b6144b39381b2b69791171489dd907c3d779ae488b361f744ffacb2459b0c72cb70a72a85dce6bd7a25774e1a42da511dd0d041b25580bf243a515095f3d1
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index 25c1ef726c69..fc73824be68c 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
 IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index bfcd37e9d3e4..2824b6599448 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
 IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index e12946c17570..59707ed84a6c 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,10 +1,5 @@
-AUX 4.0.1-path.patch 2352 BLAKE2B 4868024ece21be33bb69f95fe827591b559ca8e3cbd77d2e7f06d60acbf40495cd69fe175e3845305bc2b0cc59ecc5c817c85b8fc3f5be5d26f9e9e95fc54ea6 SHA512 1ca0d44372ee3e559dc47d773dde0dde3e1db4e8d6966c825143694ab20dc857feb52611d81f0c1ff045f947e282596430e5a3b4e0ceb673c57f8985fa11260f
-DIST itcl3.2.1_src.tgz 427026 BLAKE2B f37612bc21916bfad082d60cd216e28f2e427307e0ea80aa0ca1506c1d247471bfcd20be744a16ef57f5e04db0c34fcc436f2fbe53715462417202377a6cf0e4 SHA512 f6b832f20e53bac66c8bcdbf64aa4aad932ee827fb8059ad2e0dca0c61db01affde6b67c1e0acb331a3837eebcb38282fa7bec90f5d6ed4b65799f4424679f3f
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
 DIST iwidgets-4.1.1.tar.gz 720630 BLAKE2B f276159893b19d7af7cbbe3653f9e406184c76065ae7906c34388545bdfff1b9e427a6e9b1985f349e9229c69c935b5b85ae8a0fd15ef28b0a1312fc4fcec8f4 SHA512 56fd91d832c59426b030bde2ec7136e46751503dac1b650d195251cac7ef1d1a7024adb2d995fe835f1039a0f99eb616db97a9e9c591f827a911eea2c233c305
-DIST iwidgets4.0.1.tar.gz 647960 BLAKE2B 3dafbe73a40e4babff574a82b4bd68546f109a52197f15228877950560f8089f95a44da93c3ff2723e2a40f26bac0e00ca4f34099e716591b93e9aba846e4257 SHA512 61d1980eb8beb2821fbd8333f5d1f6faa8bf59d98392fee8d166eef213b27c6b66121d42b8eef64d151e5249009be56076a8cf8bb6635072ee6ee4075858182e
-EBUILD iwidgets-4.0.1-r3.ebuild 1433 BLAKE2B c866699220a46cbeb18fa09df403e2cea4b8afcfc791f0b2989a035d6fb85c8a19ec7c5ba4c5e0c12dbe71d5a67eeedd651d0252dbe6e4680c23eb49a1eaf422 SHA512 750fd18f58409e9642b7112ea07d23616ba19ce6e2c00df4b7fda62bbf2e7b41c7b4331890c2fb8d10a398c68586f8d6581db206569c13e2f44ec0c81a7af5b0
-EBUILD iwidgets-4.0.1.ebuild 863 BLAKE2B 6d4adbb993dd99a0a0b4e1924c7e8f23296430f17d78fbbb9e122bf58949e62b2bbfbc8915ce327b9a76c2d71b280f1293188a06999839d1948d472c361c2dc6 SHA512 1920f61dd8b29a1b8621aa61f802ed0006983f4b4528233219cfbade9e0a7aa89d634365e112b6925a584e2fea3cf2f84e19d4ad26ad12a55a3b57238262bd14
 EBUILD iwidgets-4.1.1.ebuild 1374 BLAKE2B 4c1c5b244aeec6b7a3e936520d870acfd7c78a89e479e2a4c8943730f32b09572cb8eac3a41fca566da296f832012db4fe685473287e2f989f87c64a9127204f SHA512 b2769c170bb2d208ac57fd4a655f619feb72938d7ffe3636fc49e83abc2b7ad81c8b4d7cdde84e5d3ab42c2fcb563d584b756f739eefdae9d3e7b2de6081ce47
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/iwidgets/files/4.0.1-path.patch b/dev-tcltk/iwidgets/files/4.0.1-path.patch
deleted file mode 100644
index 5d71eeb64744..000000000000
--- a/dev-tcltk/iwidgets/files/4.0.1-path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,6 +30,7 @@
- 
- srcdir = @srcdir@
- bindir = @bindir@
-+mandir = @mandir@
- 
- # The following definition can be set to non-null for special systems
- # like AFS with replication.  It allows the pathnames used for installation
-@@ -48,7 +49,9 @@
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
- 
- # Top-level directory in which to install manual entries:
--MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)/mann
-+
-+DATA_DIR = $(INSTALL_ROOT)$(prefix)/share/iwidgets$(IWIDGETS_VERSION)
- 
- # Directory containing Tcl source code (for library used during test):
- TCL_SRC_DIR = @TCL_SRC_DIR@
-@@ -135,26 +138,26 @@
- 	    done;
- 
- install-demos:
--	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
--	@echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
-+	@$(MKINSTALLDIRS) $(DATA_DIR)/demos/images $(DATA_DIR)/demos/html
-+	@echo "Installing demos from $(srcdir)/demos into $(DATA_DIR)/demos"
- 	@for i in $(srcdir)/demos/*; \
- 	    do \
- 	    if [ -f $$i ] ; then \
--	        $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
-+	        $(INSTALL_SCRIPT) $$i $(DATA_DIR)/demos; \
- 	    fi; \
- 	    done;
--	@echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
-+	@echo "Installing images from $(srcdir)/demos/images into $(DATA_DIR)/demos/images"
- 	for i in $(srcdir)/demos/images/*; \
- 	    do \
- 	    if [ -f $$i ] ; then \
--	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
-+	        $(INSTALL_DATA) $$i $(DATA_DIR)/demos/images; \
- 	    fi; \
- 	    done;
--	@echo "Installing html man pages from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
-+	@echo "Installing html man pages from $(srcdir)/demos/html into $(DATA_DIR)/demos/html"
- 	for i in $(srcdir)/demos/html/*; \
- 	    do \
- 	    if [ -f $$i ] ; then \
--	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
-+	        $(INSTALL_DATA) $$i $(DATA_DIR)/demos/html; \
- 	    fi; \
- 	    done;
- 
-@@ -169,7 +172,6 @@
- 	        $$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
- 	    chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
- 	    done;
--	$(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
- 
- Makefile: $(srcdir)/Makefile.in
- 	$(SHELL) config.status
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
deleted file mode 100644
index 50ecc6a9de46..000000000000
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib
-
-MY_P="${PN}${PV}"
-ITCL_MY_P="itcl3.2.1"
-
-DESCRIPTION="Widget collection for incrTcl/incrTk"
-HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="
-	mirror://sourceforge/incrtcl/${MY_P}.tar.gz
-	mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
-
-LICENSE="HPND Old-MIT tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	>=dev-tcltk/itcl-3.2.1
-	>=dev-tcltk/itk-3.2.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PV}-path.patch )
-
-src_prepare() {
-	default
-	sed \
-		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
-		-i Makefile.in || die
-
-	# Bug 115470
-	rm doc/panedwindow.n
-}
-
-src_configure() {
-	econf \
-		--with-itcl="${WORKDIR}/${ITCL_MY_P}" \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	# parallel borks #177088
-	emake -j1 INSTALL_ROOT="${D}" install
-
-	dodoc CHANGES ChangeLog README
-
-	# bug 247184 - iwidget installs man pages in /usr/man
-#	mkdir -p "${ED}"/usr/share/man/mann
-#	mv "${ED}"/usr/man/mann/* "${ED}"/usr/share/man/mann/
-#	rm -rf "${ED}"/usr/man
-
-	# demos are in the wrong place:
-#	mkdir -p "${ED}/usr/share/doc/${PF}"
-#	mv "${ED}/usr/$(get_libdir)/${MY_P}/demos" "${ED}/usr/share/doc/${PF}/"
-}
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
deleted file mode 100644
index a3b02f1740f0..000000000000
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${PN}${PV}
-ITCL_MY_PN="itcl"
-ITCL_MY_PV="3.2.1"
-ITCL_MY_P="${ITCL_MY_PN}${ITCL_MY_PV}"
-
-DESCRIPTION="Widget collection for incrTcl/incrTk"
-HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="
-	mirror://sourceforge/incrtcl/${MY_P}.tar.gz
-	mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
-
-LICENSE="HPND Old-MIT tcltk"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="
-	>=dev-tcltk/itcl-3.2.1
-	>=dev-tcltk/itk-3.3-r1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} --with-itcl=${WORKDIR}/${ITCL_MY_P}"
-	econf ${myconf}
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc CHANGES ChangeLog README || die
-	# Bug 115470
-	rm doc/panedwindow.n
-	doman doc/*.n || die
-}
diff --git a/dev-tcltk/scwoop/Manifest b/dev-tcltk/scwoop/Manifest
index 54e3f6db0a25..8a4b04e78f07 100644
--- a/dev-tcltk/scwoop/Manifest
+++ b/dev-tcltk/scwoop/Manifest
@@ -1,3 +1,4 @@
 DIST scwoop-4.1.tar.gz 86368 BLAKE2B 3bd736e2f3aad4b6ca10582e78c0b6bafdb8314577c6176ca386f98074d1ecc81151fe724423e09a6c2fa553d9ecee7f246b4297f74e42c78539f1ef169f2c6b SHA512 8fd3fc01bd133aa155b45dcc5a821986aa72115fe248e0382611604f9e23596506f0d34ac331c4824bfd84dce7958b7a10186551604a0614572ee4e84fa3be21
-EBUILD scwoop-4.1.ebuild 547 BLAKE2B 85869d6311ce16cb99ebcad38acdc293c4bf458d3a683532d2cadb63ffbefa23c9038aedeb8deee92793f367320d030dc3a679d2003e286b5186f60b73ca9c93 SHA512 66505ad0d7f5425c160269e14b791b6d8463b9b3a96757b3edfde312d8d6b39abef4cb4255bcd8de911d0c892aef0e300f071ca8717f35d91e9debdd56912cdc
+EBUILD scwoop-4.1-r1.ebuild 577 BLAKE2B 8137e32800f61b02fd8dc5c13eef746d4c290372161360384633266033edbbad76a6bc0df96fa44696c1c4c33a3cf9807a8a0cf2f99a758412043f521c225bee SHA512 83b10e7085cf967729f2a49508cfa74295269f167154d78814fb10a2d50eedf54ec09cf1cc8ffc8d71a927fa0859192bb0e82460c2d98729f98c255198408e52
+EBUILD scwoop-4.1.ebuild 567 BLAKE2B 2b341c5159689a41c2998c6838def9ce31cfa07e4cec2a07bc40c32823f519a904259188ceb306c9d4eb994ccd8d52eccd47147eff09b8af2f5c44606e5321b9 SHA512 c5895a9e034895487ca36bf91f20297e18d48c5687b3744ba2258a6f8b8a6c62f5fcf70be992e87c85b157b41316a8b134fbb8a456e27daa239eec378c6cc5a9
 MISC metadata.xml 249 BLAKE2B d3e8bf26f513e970f3ac032d9caae9692296590cb38e8ff81bc3cdf692492ad4a297d79a7f7adcc6b68f5ba220a1b086d42c70c579a043e104933f51bbb3f49e SHA512 e0b0007b4cfb9cb2af7a9bd33d578bc2bf1819985fa37d2dc8ec14cc1ae2987583d4054ad7497d9cf6c603b33f502bc6ee579ff990daa341b2e0572d585fbea6
diff --git a/dev-tcltk/scwoop/scwoop-4.1-r1.ebuild b/dev-tcltk/scwoop/scwoop-4.1-r1.ebuild
new file mode 100644
index 000000000000..16a2cf48043c
--- /dev/null
+++ b/dev-tcltk/scwoop/scwoop-4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple Composite Widget Object Oriented Package"
+HOMEPAGE="http://jfontain.free.fr/scwoop41.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.gz"
+
+LICENSE="jfontain"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-tcltk/tcllib"
+RDEPEND="${DEPEND}"
+
+HTML_DOCS=( scwoop.htm )
+
+src_install() {
+	dodir /usr/lib/scwoop
+	./instapkg.tcl "${D}"/usr/lib/scwoop || die
+
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}/demo
+	docinto demo
+	dodoc demo*
+}
diff --git a/dev-tcltk/scwoop/scwoop-4.1.ebuild b/dev-tcltk/scwoop/scwoop-4.1.ebuild
index 6a61670703e9..13f55586d5e3 100644
--- a/dev-tcltk/scwoop/scwoop-4.1.ebuild
+++ b/dev-tcltk/scwoop/scwoop-4.1.ebuild
@@ -13,6 +13,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="dev-tcltk/tcllib"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	dodir /usr/lib/scwoop
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 9b951aabf085..3729c9b42747 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,6 +1,6 @@
 DIST tcllib-1.15-patchset.tar.xz 16164 BLAKE2B 590f6ea38aa2cf98e80011591d5bf06f27d4ca2af03b2e633a2752c184d2c1d78cc22f9b8472a2e5af7052cbb742a22fec0d487974a7599e4d4081bd5e80dcfe SHA512 85507cd00692138ea3c791f88bf4bbdadefa91168a55aebd1da7a89a9de37c3352be27db25bfdb7478dfc90865f906b290fdcbd858be0c01e3502f0446f03262
 DIST tcllib-1.15.tar.bz2 5030648 BLAKE2B 9731be4282bc3b3b0bb56021c3f0a7943ff4163d04ae397b1e0543cbce0642cbf5f64b66c57348a932d9e29c53273223998f2d8b0b087ff7ac679191e8a35ece SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
-EBUILD tcllib-1.15-r2.ebuild 1126 BLAKE2B 4230c77b24b9aa9a22c1bfca957622c1b1bdf987f41e704cac8ab9b71edb046b5c27837619b6e9440dc296abb43d15f3646b047ed812c52ec478384ee28b7d76 SHA512 8e3318997ebf7a07181d76fef022febf286ad44ea92b2a9b411a15e9e73154598d90c7a763f576e9f0afbe9ac95419aea6c568c037e0aa0321d87fa96d437201
-EBUILD tcllib-1.19.ebuild 1166 BLAKE2B ecb357fa3cb0ed8bdd29029e8f0de9d8ae0da218d89053c0c0241cac7191fe667a5941535a150aede2e0a109fb481329dcdd6c6e8c16b8afe31177bd53268b0e SHA512 3331e50638491fad65f85bc1067bbb682c26c655d4da87fbb694ccb1fcdac26fde1b0144f94747d6a53e99710b0d21078556ee5273fb56500dbb815520d0a8db
+EBUILD tcllib-1.15-r2.ebuild 1116 BLAKE2B 3135c725e7a4093e1cc81d1bdcc63766cab29191737fc1afefe5ede81198f8b438dc9b3a25c1fe3682090fec4bdef9410fa1cc630c929b198cc41b3042042210 SHA512 8154057edf45d29dcc2f1476a05e46db901c73574d1f5f76072b00849bbab867d1fd877c6126c3e830ff743b6879fb3e2fba47a0a862505631fd030fe5a9ae0b
+EBUILD tcllib-1.19.ebuild 1144 BLAKE2B d703264afde2edea945ae174df11a4482c6bf7453e38a2c754ab939ebd23e532e4c392a67c3595b9964d23e755db3f1f017fa2d7a1192e99dedd8daae1763583 SHA512 c4b9e24a4ff5fcd99e13fc5b63d9ccd6e936d69be6db5c806cfb0279b27b93025a4c116702448d3b93829fad9738668b9990b46acd9620b4db266e02d734f6ef
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
index f5ba207bc472..5a08bfcb714b 100644
--- a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/tcl:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
index 63a889b07792..d00b44232ee8 100644
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-lang/tcl:0=
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 52909755068d..5ef48285e241 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -7,6 +7,6 @@ AUX tdom-0.9.1-tnc.patch 2429 BLAKE2B 5ceb9f3a28df5436019f2ee8fb542eda7e4d93c79c
 AUX tdom-0.9.1.patch 2328 BLAKE2B df4952d6c660426e24f8bcbde225f42fb005dcaccc9ee456fa00588e00eba523bff20de4fb78fa5f5168561803e52c020d9379c041f0ebcd78b0ea231da14048 SHA512 e39e0c7d2285a325423cf1da268cbc66ab5e1ead67a0b5d8fb8311e6eb02dc905fc87a54b101396c69bad8dbca58fb0c1ee4d91fd7db825eff32c6fef6efa559
 DIST tDOM-0.8.3.tgz 990367 BLAKE2B 172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
 DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
-EBUILD tdom-0.8.3-r4.ebuild 1949 BLAKE2B 017c59279c56fe962b608b766f2143d80fd3fe1e5f8f14cb9f94c2123e6684b4703df8f8258023ef1c8f64c7ec1fca4518266b8fa83d8eb4fce7600ea477fa8b SHA512 8fc3d4970e633fceeca7ebd9c41bf9773d4b7e59eb3db8dc82f2d1a65cab0bb39c769e99c17a8dfca14b0b6c0cd93df9502040dcf0321aadeee7af209154c032
-EBUILD tdom-0.9.1.ebuild 1768 BLAKE2B 7ae602d221f213165e00ff2d1e0be96727622a070dc207ddcdead1d7c86bb5fed1afa7d43c5e14ed971141fe9a59125ade5690d9c458ed12b1cf4862b9adcaca SHA512 af97d245727b3d676fda98f082a91296053258262c4e7e73617c16f0a1316cd035d4ae9261d4f6aef65e8168957866a0529b1c5ed258814e103e4674d7b61fc6
+EBUILD tdom-0.8.3-r4.ebuild 1937 BLAKE2B 5b95a705b4fa6308299cf8154b3d60a6cd192b1ce7f2b361dc84b590286922068404568a6bef72070f63e3988bf5929a98b3e11d29361da1b810108aff1afb3d SHA512 05174c0e1e0679415324721b469bfae70e8fdda138f0a6dbd0e57cc449f5a46d000e25bfbc36b03d0dbb46f01cfbc489460dad62485a4f294bd73b851dc818d0
+EBUILD tdom-0.9.1.ebuild 1756 BLAKE2B 8a715676ce8c44e443792413aeda6c54fa83ecbe06290a022c4374a033dde021e560818b62d7381df8960ae09b4e7e8c69824b6295d850a2793e651c0d8bc305 SHA512 78288fcd9aed76583847822ee0c378b392abb039af3c38df5ea6dc8d8da544432443ec1720035b37b11bd41be39b7440f62ad27776856481e407ccbb98ab3b62
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
index a75030b63b7d..353d66a20f6a 100644
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs threads"
 
 DEPEND="
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index b2938532de33..b17a5516bba0 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://tdom.org/downloads/${P}-src.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs threads"
 
 DEPEND="
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index c03acc218cd0..c9e83c01df95 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,7 +1,7 @@
 DIST thread2.7.1.tar.gz 295134 BLAKE2B 785e832f8acf926f550cbffa3e2383eb6ad7fdbb480830e3c0f56d207375053c865d6eb201361acb8ca2df8951a037603b015f85ab4903d80a92f9d957af9dcd SHA512 18ebd9431b6f6bfb1e6a60797af39db0dee29a16cd457ddab2a18cd5dfd9ef2dea9284ab99238fb05b8284fcc855c2ef8011eb3ed02d7e54d715379d133512dc
 DIST thread2.7.3.tar.gz 291332 BLAKE2B 96e7b03cf22227e85462994a6f955fd04d2e40384e540e7cbf78f93c661611607312eb1ceb195cecbe672ecb53df464f1cff4e9b9768864cfeef6be82595e17e SHA512 0efe8db04ffb1cbe539d1bbc9f82e52df994cf0cb570a2eeb79b6f821ee5d585e0b034b970e793a54c588b08321e5ea286c7b9173a09a5cc573b11fbf00c2888
 DIST thread2.8.2.tar.gz 346222 BLAKE2B 194673b14b3f6b98a46330afa58caaf705feb2d8713606547d0d7e5b18770c5729fd562c81e66b403040622afdbdf62b994bd3ef62678d00915ba48f1eafc786 SHA512 0889f54ba8c76413f0333bdf6f17cca38c4fa8ccfff7e1554a63f38f19471dc72c3afe34d2e38ea00724aa3f0c007051999392a8d188d47265dbf0527dadceea
-EBUILD thread-2.7.1.ebuild 1090 BLAKE2B d9e090abd0052a457ae17ef1c604781c89d453d9ab70c601ac4b8a728db0efbc1fd4d3a400f3091c0c8f9893a5f400b03c3c6e7730c171e8374ddeb3a8475bec SHA512 4a4ffe65e33c306cc03b79d79c24ff14744b4415b15ef1e2b59e76a8a76524baebe5df8967c75a205de454fdf7ea7e537ea5902a2fb77dbd074a5bd29726defc
-EBUILD thread-2.7.3.ebuild 888 BLAKE2B 03d56a7e8cf2ab0b01fd157666a13cda269df56ddf7c2632cfa5ae93f6136d4a3a712ae982c53e4abb48bc15e6e41c5d303dd84937ba20c8b74d71cde6ddb6c5 SHA512 b1f901f1ea3cb2117ecd985563e3c07726a64266d0667b375761e8b76013a7dd73df7055cc1533d5d1d759f62b0087bf2a73c0e13f495b5a25c72c9b934e3f9c
-EBUILD thread-2.8.2.ebuild 868 BLAKE2B e9880fd15b82393e1467f2fe489766d853c95153703a88ec98270b16657fd58f1c4059fd1255dbc55a5ba1d351300f3a203bdfdda70868fd1c1afbf7bf8ba44d SHA512 2d380c212ae40ca4034c1fad5b055aff6480127507a6c67dc4eab8a680590be8d50d21619fba08a69ec196ab7a423fbcaad5e2cf46d1be5ad59c5ef6e959fff7
+EBUILD thread-2.7.1.ebuild 1080 BLAKE2B 810f4780283bd9646a48a4750ca7ef630d0a9b284d8d63abaafef09211d93d2fb44d7e6987f0cc8f45f79983ef570d1d2fba21cf46dcf3d24e60d6a6d5614734 SHA512 e6457bc33f7a2f43b4a1e4092b93e95bfa54a8a14890c2ddddefe8e01d254f7de0d7b34906a3bb1b146c780dc899b01f85564202cb5c8299d043f52a0edd6f10
+EBUILD thread-2.7.3.ebuild 878 BLAKE2B 6de128dab5cba0705c990a27294f5eafba5e64b29b0901336a6fc7f48542b30f634b0ac457b5150e1ac5b1ac68adeeaf63101ebd16f6e27719d45c3774578618 SHA512 639c886c0c45aacbc85411c626871eff11cf769fc2aaccaef0c41a1829346f506522282ac84c630173c36b21b74bcdf7f5219b068977ae3c0ef68d066498dc0f
+EBUILD thread-2.8.2.ebuild 858 BLAKE2B b176c805aa9f282033dcdb10c31495fbbaa45d76e252c29298fac8066fb5052f4c977f7f4d2e4d1e9f315d7dc11d1b7f488863692f00bff2e8a8d87fdf9dbb4c SHA512 10ffd36754f4b722aeb9499ef31742d05459a6af9b85fa677f6ee05b67a9d394f8b06af13437edbe3fbc25fd0f1a8667da9d3af5c1ceda88ea8674ee5e5929d5
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-tcltk/thread/thread-2.7.1.ebuild b/dev-tcltk/thread/thread-2.7.1.ebuild
index 3028f887d212..a114ff1e8df9 100644
--- a/dev-tcltk/thread/thread-2.7.1.ebuild
+++ b/dev-tcltk/thread/thread-2.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/tcl/Tcl/${TCL_VER}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="debug gdbm"
 
 DEPEND="
diff --git a/dev-tcltk/thread/thread-2.7.3.ebuild b/dev-tcltk/thread/thread-2.7.3.ebuild
index 147853cab232..4b42c4ef121d 100644
--- a/dev-tcltk/thread/thread-2.7.3.ebuild
+++ b/dev-tcltk/thread/thread-2.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/tcl:0=[threads]"
diff --git a/dev-tcltk/thread/thread-2.8.2.ebuild b/dev-tcltk/thread/thread-2.8.2.ebuild
index 700cd2a92305..07bff869f9be 100644
--- a/dev-tcltk/thread/thread-2.8.2.ebuild
+++ b/dev-tcltk/thread/thread-2.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/tcl:0=[threads]"
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 3d94164e3034..d737591748a7 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -2,5 +2,5 @@ AUX tix-8.4.3-link.patch 402 BLAKE2B 229737acefdcea3f424ab0e961cbd6561b981b061c8
 AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb9e8baf9f7815938439d3a463035ee2724339700a75ace4705e7d03761bccf76b4f2b177a38876d945da4d58a SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd
 AUX tix-8.4.3-tcl8.6.patch 665 BLAKE2B 188df36874cedc7aade7f04b567dabbfe95c2451fc095d4ece12b1750bc4837c26bb6cb93ad33ee61632cf7d1e5ad82de479030d73b81bf2db7b6b8f8ec1f051 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e
 DIST Tix8.4.3-src.tar.gz 1831503 BLAKE2B ec3a388bd8ce4f2b433defece3cafcd64aa07da9d8f9b1e23dc5c62f2dca0170cae3c5fc2e8df0ceeada7c48a749929ae9138346d8d38b528ba99b52d036f8da SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852
-EBUILD tix-8.4.3-r1.ebuild 1376 BLAKE2B 36ed6ae6b88948af499fbf4ed3e972526372e9e4c37cdeabc4e48bb28638bc6f4d52f0b7cd1febdc656aa53ee79ce96d314a57e4615f6461e283314f1f89e6e8 SHA512 3889acc7b693196c1804da46dc20ee9ab60354e2dd11f39ca65465daec1e3934962321b5e21a839a8daef788b4f4f23a2ad5ae6205dd9677f57ca700fa00f1ee
+EBUILD tix-8.4.3-r1.ebuild 1354 BLAKE2B d8abcc187d9c0aa058624f9cf8c6652e02c7373df40b94f34ae1cff12bdf528d0b65fa5779147218781a5a20c8c6cc0a60f1d3b565db3bd84a55a5947ed9938b SHA512 e55d48f9d67633b24180f692601a45dbe374259934bbf0fe9804b0d9b10e9d3371117aab6f082fa6283ab0ca881a5f1cc47724c517061bc4cad78062b3375c24
 MISC metadata.xml 326 BLAKE2B 3dd7044d395bacde28195a421c60be7f696572b5e308ecc2e1f8e2012f6a3e1645f849fd67a577bd00f756ab1ed8baa1efce1e64ea3b758fd79a012b9391c9d9 SHA512 dff5470f4f3ea0164cd7bac8ea41ea6589134bd59f8a0992021bcec2962cbaecdfb4f76e68ea417c8b9ec4c573f89dcb109821208d429672dd5467814148aae7
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
index fea8efa756fc..3a8b17e5bf86 100644
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
index 2d389433c341..d3e26ed162e0 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1,3 +1,4 @@
 DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
+EBUILD tkcon-2.5-r1.ebuild 741 BLAKE2B cb3a8805e2dc72aa954eb2dc8d05f5eabf34d2f1be21d7aa42d9c94bff74c7d4bcf7443346d5bca7a11069d05600c712af6f13e82c1f04ef94c6b3d4f8b85413 SHA512 9d335b762625038b0c21bf949ecb8d5c7566970639adde82f63bd6040cb9f11db5692f2b3e1bc04eab3f6eec98836930a0ce3af5e8823de02893f774c2640168
 EBUILD tkcon-2.5.ebuild 681 BLAKE2B 01bb36105f4171fef0b304e7ffdaa7232cdcf42864d65c8de5039ea3f6965114484943a3dbeb2fecc4b37af0929d2fc87a915dd99b297513e8f87259d285c369 SHA512 71a3d592b49e86562499923f6b0087dc31e6a293ace3fca72afacf0528e68739e4efa3f063191e8e4914b21c73b274b30578c195b4367de7f1988c64e292fdad
 MISC metadata.xml 695 BLAKE2B cb5dc622e2500fdac5984ac2e8578acc747b1f7904acddc4419658a767b9c55ce29fdaca7f56dea5496d68f815724bba106b56edaceaf422ef6ccfbc5326081e SHA512 f28fdbee5350ce1169b00081cfd326a2ed108b3f7347d5bef7365adbd6f098ea40cfb2088a3aa20d9cbd9c0bd650318119ef03db0a0a2e8bdf2aee6259544817
diff --git a/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild b/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild
new file mode 100644
index 000000000000..cbc35d044200
--- /dev/null
+++ b/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib
+
+DESCRIPTION="Tk GUI console"
+HOMEPAGE="http://tkcon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:*"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	mv docs/changes.txt CHANGES
+}
+
+src_install() {
+	local tclver="$(echo 'puts $tcl_version' | tclsh)"
+	local instdir=/usr/$(get_libdir)/tcl${tclver}/${PN}2.5
+	dodir ${instdir}
+	cp -pP pkgIndex.tcl tkcon.tcl "${D}"${instdir} || die
+	dodir /usr/bin
+	dosym ${instdir}/tkcon.tcl /usr/bin/tkcon
+	if use doc; then
+		HTML_DOCS=( docs/* )
+	fi
+	einstalldocs
+}
diff --git a/dev-tcltk/tkpiechart/Manifest b/dev-tcltk/tkpiechart/Manifest
index bf82e058218c..eea9a5497722 100644
--- a/dev-tcltk/tkpiechart/Manifest
+++ b/dev-tcltk/tkpiechart/Manifest
@@ -1,3 +1,4 @@
 DIST tkpiechart-6.5.tar.bz2 38096 BLAKE2B d49f54f693d849c3563d28f4387e65d1f2cd19ec647db7e3aa56d85ffb630ca170113ef81e97eb4e464320d37e6e10c7a8bda5cf19fb478a0609226ea28a77f1 SHA512 828f106be8fe37ab8876c7e0b8ee00dee7f067f21489710653909ba277aed65de169e0f592ce0fedf5bc0ffc584d633d163b1b72fb628c1b2e541e8a850636aa
-EBUILD tkpiechart-6.5-r1.ebuild 635 BLAKE2B ab2a142ede7c225988f16b7a2fe0d3b464d11d64cee352e92c2bb42b5780500f67b80fbc15ebc78629de16b8ab0b0c5fe35bedb296c6cda3030affe9ed291984 SHA512 1633fdf7c61ae34a63388b13ea25ec7b922c3188f0cb3fbb4a4b7cd02077ae7a8e956daf62a816c6ca9909ae26e5d62398dcabde83a09f4d05e6ef3ec74459db
+EBUILD tkpiechart-6.5-r1.ebuild 652 BLAKE2B 974c60337f3534ae2fc09fa580d63f7c40ce689768f27a31d2bf070d1d513ce5162f483be08d1c7fa78a4363bea2c6b5bb3da117aebb8b2c8f068112da3bc90b SHA512 923626c923664b55c8ae1647c7d3df70e7ece59b3f436d43cc4e3583b6e52ee77f08764be10dc2a0ee202f4976fc00e08329b10edab3e21af1d0fbe889499f9c
+EBUILD tkpiechart-6.5-r2.ebuild 655 BLAKE2B 3b9453b3aab4e24576c9ca5f2d92210b4a7a7afb17e0bbef0304e22f62e8155afa76d9e16efa05e3a1495c8fa8019fc042cadf54a8fdae0335d1631699540e52 SHA512 c5c4b390723df8d279ad50cf45132aa15ad34932b7dbce8792d20b913aae6744c04a024da405e71c88f943377e663ab5f6f71b32bfc7e2cb60877363952a997f
 MISC metadata.xml 249 BLAKE2B d3e8bf26f513e970f3ac032d9caae9692296590cb38e8ff81bc3cdf692492ad4a297d79a7f7adcc6b68f5ba220a1b086d42c70c579a043e104933f51bbb3f49e SHA512 e0b0007b4cfb9cb2af7a9bd33d578bc2bf1819985fa37d2dc8ec14cc1ae2987583d4054ad7497d9cf6c603b33f502bc6ee579ff990daa341b2e0572d585fbea6
diff --git a/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild b/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
index ca9a67327bfa..4df808b2fe79 100644
--- a/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
+++ b/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -16,6 +16,7 @@ IUSE=""
 
 DEPEND=">=dev-lang/tk-8.3
 	dev-tcltk/tcllib"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	dodir /usr/$(get_libdir)/tkpiechart
diff --git a/dev-tcltk/tkpiechart/tkpiechart-6.5-r2.ebuild b/dev-tcltk/tkpiechart/tkpiechart-6.5-r2.ebuild
new file mode 100644
index 000000000000..de6b80785f34
--- /dev/null
+++ b/dev-tcltk/tkpiechart/tkpiechart-6.5-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="create and update 2D or 3D pie charts in a Tcl/Tk application"
+HOMEPAGE="http://jfontain.free.fr/piechart6.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="jfontain"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/tk:*
+	dev-tcltk/tcllib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir /usr/$(get_libdir)/tkpiechart
+	./instapkg.tcl "${D}"/usr/$(get_libdir)/tkpiechart || die
+
+	HTML_DOCS=( *.gif *.htm )
+	einstalldocs
+	docinto demo
+	dodoc demo*
+	docompress -x /usr/share/doc/${PF}/demo
+}
diff --git a/dev-tcltk/togl/Manifest b/dev-tcltk/togl/Manifest
index 4b3cffafaeb9..d13446e37b2c 100644
--- a/dev-tcltk/togl/Manifest
+++ b/dev-tcltk/togl/Manifest
@@ -1,3 +1,3 @@
 DIST Togl2.0-src.tar.gz 244968 BLAKE2B f094fb4bba7049470d7f61a2748d4a5baaf47c99c766d96ef8061e254673acf7f2a11555e202ec01f5d6b7a00ae7c275a33981fba5df7f1478f69da17f3180b8 SHA512 2be3062baada848d96b2802582bc5590b215f2ab4dc02c91761e72af2bf8c0ba768a71a2ffb8107bca83b63b7d1321ee83de19b97f83b1c2f0962f9288948b0a
-EBUILD togl-2.0-r2.ebuild 871 BLAKE2B eb08c55e5a7a64ae0eb63ce9620531c91d8ca72147f4711317590fd242465a6cdd0c31b71d5dec9b70a1b8d01f5147f0f97f261c76adabe431c12a8762a54223 SHA512 abfe4987bdb7a2f77f105386d4093bec7aa9e7f0d301ce0871a34535ca92ac9aabae37bf82ab15b1c7587710945677f0ac310b5c852d3f3c3820697165ed1a8a
+EBUILD togl-2.0-r2.ebuild 849 BLAKE2B 2bf947c321a43e5c5588cb15189a26933ad7b259460d7c960371e9cad6d28596882a022aa29b71c7b557a0afc2323a3d075bfee88b6504567bf3a66c0770c148 SHA512 e85525fef7a244aa71c0108929611b6d6428da7e1b5fe80c0a0f956acaab587693431264f526b78a073bff7db284f223cb179d8579ce5cd8569c49454636a37d
 MISC metadata.xml 1191 BLAKE2B c421c6f81a32e715643716995a0c336166f1892c46f663bbcd4f910f2c208f9e5249e2820b9df10e22c76111d27bec7d61e4d405ebb9193a9c44166aed58c52b SHA512 890b9b1bb4b9ae4255e9fa24efb01e3f109a8e7675055ef9166a71d9ec1624494d2e5115cf3d8f074f400f805a61a3409558a8f21d544f91e4d8775fb2f3c5ef
diff --git a/dev-tcltk/togl/togl-2.0-r2.ebuild b/dev-tcltk/togl/togl-2.0-r2.ebuild
index 58d12aadd6c7..d4ddc9a345eb 100644
--- a/dev-tcltk/togl/togl-2.0-r2.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug +threads"
 
 RDEPEND="
diff --git a/dev-tcltk/vtcl/Manifest b/dev-tcltk/vtcl/Manifest
index 61d7d0fb91df..9f55125cb9d1 100644
--- a/dev-tcltk/vtcl/Manifest
+++ b/dev-tcltk/vtcl/Manifest
@@ -1,3 +1,4 @@
 DIST vtcl-1.6.0.tar.gz 554727 BLAKE2B abf5e9a9fbc42e8c9ab1c216f0d103fcd88c9894a73185d50b56e0c87c88e82e6f368dd3acd7339f3a1875c9cda22123e4df82f6852343da10abac330896c899 SHA512 bfc2ed114af4bee375e820e4b1e47d394a800541eb9917204ef42481a4033927c432d7d2b005d13edd086c7c91bd594908965aae512cc4af9e5654a2bfd296de
-EBUILD vtcl-1.6.0-r1.ebuild 892 BLAKE2B 8bfc231abf18cf6d58d3ac9f68c14dd73b3ead2cf0ae970831a69b832935cde86624bcb9115c8a7734f4a4a8790948bc1a1c0817aab82c76a4cf7ade170aa858 SHA512 d5ed7977f7fc29bbbd0adc515f55f8157979fd80fe08c946b8d764b97d5f0b9a3b26e5a38ccd617f68b97bfe5419c24236f812dd741229a6109c47c8e109d54b
+EBUILD vtcl-1.6.0-r1.ebuild 909 BLAKE2B dba5c0b6716076f01f14e530af42924341493b04a4c40bd963beebe5de8388a02ac5bc5f8eef24a351569c44c81f714056d3577874424f6948028a53c1d3e345 SHA512 002f17f386f98771ad8da4e7b3996e38751114e8b5304362517bbacd62559fbbb06b40fda92c10d6f377d7043bbc45dec8a1191eed58ae6936f12d4a4f60f3b0
+EBUILD vtcl-1.6.0-r2.ebuild 871 BLAKE2B a9d6c20611b88d64f0dfd596d0f3b3411815629e830a0fac98e7acedb0b3fa0eac54ab2c9e29fc32b7a88924dcf6471bb8f12420e7ce6003e91bca3360828686 SHA512 eea6fde48ce4a338890ef67e40a6938e69a8eb1a1247dff39388bb80dcebe9b2d91c0af0f73116621dbc643e374ba146ddecc88977b3c45f0314d0ad15b805a6
 MISC metadata.xml 320 BLAKE2B fc4506f2388dd451c4b88073e6df61db8024feb95db4cd0641ab28e0264aacb2934980afa86da71304aeceaa0f5b3e7581f8351cd577efeb44718e381441334e SHA512 bc023971a766ee2e121d6f5d22bc0fe38437802957e021ef193770ba386169c344b238c79df9d5d7aa32c2bd1ac7b448c6d688580f8be4a67c1df95cc942b60c
diff --git a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
index 596e52294e4e..6b09343c4210 100644
--- a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
+++ b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,6 +11,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 DEPEND="dev-lang/tk"
+RDEPEND="${DEPEND}"
 
 MY_DESTDIR=/usr/share/${PN}
 src_compile() {
diff --git a/dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..5080e7e70cc1
--- /dev/null
+++ b/dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Visual Tcl is a high-quality application development environment"
+HOMEPAGE="http://vtcl.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+DEPEND="dev-lang/tk:*"
+RDEPEND="${DEPEND}"
+
+MY_DESTDIR=/usr/share/${PN}
+
+src_compile() {
+	sed -i 's,^\(VTCL_HOME=\).*,\1'${MY_DESTDIR}',g' vtcl	|| die "Path fixing failed."
+	sed -i 's,package require -exact Tk ,package require Tk ,' lib/tkcon.tcl || die "Tcl8.5 patch failed"
+}
+
+src_install() {
+	dodir ${MY_DESTDIR}
+	dobin vtcl
+	cp -r ./{demo,images,lib,sample,vtcl.tcl} "${D}/${MY_DESTDIR}" || die "Data installation failed."
+	if use doc; then
+		DOCS=( ChangeLog README doc/tutorial.txt )
+		HTML_DOCS=( doc/*html )
+	fi
+	einstalldocs
+}