gentoo Easter resync : 12.04.2020

30 files changed, 44 insertions, 99 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index c91847956c40..2ee85161a0ad 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 06b9bcca0cca..34a146d9a4c8 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -11,6 +11,6 @@ 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 3532 BLAKE2B 7b94f6060f0b8b2b6c523c496505396724b0f0ce86731c14874ea6c26263ac3ef64d312ddceb26493c90b8b8368cf0e8ac0e37d510d1e0fbe3aa5087eaaa7480 SHA512 e506e38b539f39e425a01dad56ecc286f1e3e5d414d8ae26be6dacfd7f139c79ad04ccd77098c3d727fb5d704b4a738e485bcff3b69971b433b6ddf94c1dc87b
-EBUILD blt-2.4z-r14.ebuild 3587 BLAKE2B c8f20345d15ba18c12de35c6816991905452db776e019fa7abd5b99eff9f181a02529a9626f7cb9334cb26d9d052e38d1336dcec61d6bd68409b48b2ff445c25 SHA512 d9562b1189e3d8d4488427b5d5d84efe43ac75a97408c8b02a24863013dca1ab643da2aa6cf34cd33f954bd5e6a212cf65c852c383bca79f5f494a4d773da6db
+EBUILD blt-2.4z-r13.ebuild 3529 BLAKE2B f0a517d3c39bfeb0f582c8527face1c128500b787850fb0889c1ba7cb8c79142146a82ae9507e69db02ba055eddfc9e44e23e984e91aafdf9d3f6d43124f8a73 SHA512 49f907260ce3edd40e0cf86a15df57fb4c538f1d4b592f649c119882c265646acb4dfd8b6abb1829cf3f21c72b090a2b9d1e3182d49d9f823bf56859d4cb3b7c
+EBUILD blt-2.4z-r14.ebuild 3583 BLAKE2B e23961628c3b43d944b62f8b1bcd19adbbbf59d03a312d26ec4ddef0e4a58158beafa134957633dd4c2c6184c6f1b04feb80a1912701a7aebd6630c1773bbc1d SHA512 4b2b212b00bfd7aa66d8027024cbbdf268c25062b2d905c1eaf434086765b6ad08b99007bba2a61d9d80eb327c21cfae4a4d0dc281390b07fd9ce8eeee651c2d
 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 6b2cdecac560..7cdc91cc6e31 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-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 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/blt/blt-2.4z-r14.ebuild b/dev-tcltk/blt/blt-2.4z-r14.ebuild
index 896f8c28b833..5fe84228912e 100644
--- a/dev-tcltk/blt/blt-2.4z-r14.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-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 ~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/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index 29f8518654f9..dc4a56fa4023 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,6 +1,6 @@
 AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
 DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b SHA512 0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f
 DIST bwidget-1.9.14.tar.gz 261654 BLAKE2B 2c0e8ed33624f6304e775da3be02975aced85c8eeb8ca7fd736858a9323f7bd6aad96bb3697db1c9c571d5dc72ff21d3c161d4f2a8ada83f9ec615391c0f1890 SHA512 7db9c69ae423e97356ff3e54ffc77a450fb967907b32356f343aa4321faceb3e807e63babb2edf0e2c6ab086af570dbd6a02a85e4ca2c1f020ae4df78c8f0fe8
-EBUILD bwidget-1.9.12.ebuild 800 BLAKE2B 878abc1527396f219063346030c270cbd3c3035f8d34a59867b96459ea2161f4e41078118aaf6328fefacbc40dc123e4baf1f64d68fbcd9d982cd9f5379d86ed SHA512 4ec94c300951c3c14cf3e768b703ec68bdbacc0837ce96347fee6135b1de968825f0bf15a9138b13b0034388e6d98ca5aa259f05362291106f221e23c0fe43b6
+EBUILD bwidget-1.9.12.ebuild 801 BLAKE2B 912846162e8da0319ad189a0fa645b1ce23f287b66dd6f5405116734f5f1bcd1016ba3ff803551023a724793fc529f3ec4b1b244abc4297b9778a4e343323a1f SHA512 fa5e0e9555266290a58f0bc771727d9e0628ee013977423842a17325ac9b92d5ee039102cfdbd883d3402e866ceb51bba8d3e274289ecf3eac7dfea8d40a730a
 EBUILD bwidget-1.9.14.ebuild 808 BLAKE2B 3065e752e92963d6ca203359ad6659f8cc0d52bc1778395bfca5f1e7398094a74ccfdbb8971a2995cbcf55c4b0456b22738e104ca5fbfb81aefa37718cbb945c SHA512 70a03ff912c72261c215ae0b1148da98b49ea632cbd60585b08b29101dd70e25d5ca8ad3e581a86c4c5b524e31d2a11d227d35939c630f7452698073e479b918
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
index a385c787c3c5..fd5ec618a15d 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 7a98573a464f..be86f34af469 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -5,5 +5,5 @@ AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
 AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
-EBUILD expect-5.45.4.ebuild 2321 BLAKE2B ffd98942a9d2c683b152045437cfaedd474a2da3f7fa68917e3a294a92159690a69f7ac27fc690861c0385d1e0d513c2ac270bfffc36de9a880beb6ebf68d8fb SHA512 7ad8ec88eab25d31633a46449fc3414d31a7f931263d7a37a17877d4a903c05efaaa56c81b1a0c692b1cdf798ab9acc526492b80ddda7b74d955aff7b29a1718
+EBUILD expect-5.45.4.ebuild 2318 BLAKE2B 70d08037181e72018e5d86da251d9d59eeb1630164697b598ea6dca5ee1bf1aa62b3ecd7490d003619223b3d9f23a3a76f883646b1d6f6e9d549596a41bd84bc SHA512 25f0aacc84427e2a0b66ea7edcaadea816360dc2d145907fed446f2fc0086d4310d358b3ccfc51189f95e1e5ca7599ccf64f540ca92c85407aa5e6d2560a893d
 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 242333cf557a..160adb01533a 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-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 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/itcl/Manifest b/dev-tcltk/itcl/Manifest
index cc19cbf499fb..bf62f11bf3c9 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -2,8 +2,8 @@ DIST itcl3.4.1.tar.gz 263316 BLAKE2B ba4a94d2dfe80b095e754d01036b189130918d7f297
 DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itcl4.2.0.tar.gz 428635 BLAKE2B 38898f3377583115eed3b4d5a8a610e0d0a515a1e4852fe3cea04eea68fe64f158bc79d7d5f3041831f97e5e28cee5a67721a187ed5cfbaa33c69e4668b55f31 SHA512 42d13d7f4f841bff49c508fe5d17c12e81b7e381db470d7db658c925b6e609a0821953aa8344764633a3b996eb5757aaae7014df13f4e38ade2dd7aa068ba385
-EBUILD itcl-3.4.1.ebuild 1029 BLAKE2B ff15d58721bca40ccbef6ed659276da13622a29fb4093e2bb5a68204c72ed9cea2382565e5f055592ae73c3bbc7452d7701ba080acdd618d5f02f41a47329280 SHA512 5d57b23a7ff31c3242cba2f69c28fe529a2efb4e03d3111b458c982df07e2cd8b3585feff19fe55ff38e2856ec1702025af119e73bd01fd95e11cc431900eeda
-EBUILD itcl-4.0.3.ebuild 1724 BLAKE2B 7d894e9d732d539e6f4e9301ba2594d5ca587e80a8cb73bbe92ab0cd59008845b6f396d0f5dbbd9f9ef44f6ffd0308e8dff731450b306bab30a4b65fd0c87955 SHA512 d8bdfa3762d6ef11322866a4b6337e72e0dec363c753bed1f1241299ddc1776648cc6886542266de7f813724cc78f009d825932c0f6ebb0cac2b1ad6d241e724
-EBUILD itcl-4.1.1.ebuild 1483 BLAKE2B 968101d12ac4cbe79b88e9c77db4bf0941920efc70698ffa05832514d149e10d94a01dde8d3706c7dfe807224985bda8002638c321a84b138f4efed2fa260e70 SHA512 f12b550e79e31396955abffafac1e9cdb46f56a5b43f9d34082c2cc8c7c6b3aa72031ee6daef1bde7b287cfbc1b912b2ac2d2c9fda3716122c96c7bf52a53196
+EBUILD itcl-3.4.1.ebuild 1030 BLAKE2B 57dcbd85085b50806e920c10cc5806504be27703da7f43ccbc880cd3147795f6841ab0012da4b6f5c019e0ecc30c63ba3f2522a721294c4815720db406f267cf SHA512 620f2069331b2aebb967fe12399261af6c57cc1781d5abb5e0007d6eb26709a45f4b3f1e675880acbc25c560ccff04ec79e634ff22b9a8ecc6fd02953b3ccd68
+EBUILD itcl-4.0.3.ebuild 1725 BLAKE2B b2162b15a131590009a6df79661c156a68ac4411b1c0d5013063d49a372b158481a549a8366735e96cb7f8be8b24ae8ebd735d57b2630cf9d1604ba49b00f32c SHA512 2bc931013921a8275a27355ee53c2439b9f13ee56ac41df62e62a7fe768f320286392ff8aba255d1e143434685cad50e3653eaf8e78e64d33a000db761e5efa3
+EBUILD itcl-4.1.1.ebuild 1484 BLAKE2B 2e53aed2ddc216b8a6c87a0416314f31fbf652f35195117230149967afc0b164138004bd5a386383c76794c26cdca74060b932d861440e499196c6f23ff7ebbd SHA512 c3c6c4ccaec9383df8c543b89fa001ff3280ec090e55d647223d96e3ececfbad28c8624f37848edad5daf4ac959a5b34754c54272df8e713b70afbe791226d55
 EBUILD itcl-4.2.0.ebuild 1488 BLAKE2B 56d84f91e6b5f5b79ec3dbfbb96160d4a800ada3828aef9c6a35a58cf1a16b8dac23a2e153b20808b159d3966aa1666fdc339ec6b9999e282e31e1e89936fe19 SHA512 7a5b97507b81075b4774b8a387f678338aa1db9759058ce5c537f86308c2b7e9d3c7ee4b2bab8ff0201bc6952329494e3c4f2512df06a684d9adb4169b976a21
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itcl/itcl-3.4.1.ebuild b/dev-tcltk/itcl/itcl-3.4.1.ebuild
index c5df509dc3c2..1c4c9912741b 100644
--- a/dev-tcltk/itcl/itcl-3.4.1.ebuild
+++ b/dev-tcltk/itcl/itcl-3.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_c
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND="<dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itcl/itcl-4.0.3.ebuild b/dev-tcltk/itcl/itcl-4.0.3.ebuild
index 5c5ea4b4aed5..d2d6a458d42b 100644
--- a/dev-tcltk/itcl/itcl-4.0.3.ebuild
+++ b/dev-tcltk/itcl/itcl-4.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itcl/itcl-4.1.1.ebuild b/dev-tcltk/itcl/itcl-4.1.1.ebuild
index 34e5488aa245..155a7a0da62a 100644
--- a/dev-tcltk/itcl/itcl-4.1.1.ebuild
+++ b/dev-tcltk/itcl/itcl-4.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index d9b7cc95ffb6..689d62c029ff 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -2,8 +2,8 @@ DIST itk3.4.1.tar.gz 182311 BLAKE2B e1db1b9f7e6e8c5b93eec5bb29fc24af7e6cc5cb3f20
 DIST itk4.0.0.tar.gz 177838 BLAKE2B 6bb975c414d40c81bac4b8651ce89f0d84d712114e6f60e1555071d2079f778850f4de7df1a79254db1d1152e8d43f261e0bf9827737fb69abb2801e72d72d6d SHA512 4fd993e3683376bd2852a19e8ac63ec20a9319f3987737a32f7af78b645ff27416b18572b7e30fc1e41a5e4e06ac064280fd86d979738ca9906e2605069c51f3
 DIST itk4.0.1.tar.gz 182029 BLAKE2B fe3ed0adddf71af9bf795949b18baf7d983edc1e6e95939db18bdf896069083afbc8498935b0c59e2c5f4179fdc6f624e67198afa0755e8183d754c181d50642 SHA512 d64beeb42949e96b384ef2fd571971813697086df8b18af79399cedbb80eba19dc013677957959ea93dc0dcd7cdc4be012b3f9a5f0eedf0bd743550837bd78fc
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
-EBUILD itk-3.4.1.ebuild 1348 BLAKE2B cce8c557f7d3a14d0c6c5ecace166f4cac390bdb5b61e40a000337595839a75395bf1ccbacdfa4f85b8b95beaf39a038d98293cd7c3aba63de8eb74094ebb8eb SHA512 68de5452eed995855462a3965d21eb44e3c625c8ee489ababfd3e8a8e9b2801abb1ce8537f1785db1580474d8f7289e2e4c8c0be3f5613d1b93cf5142e3e126f
+EBUILD itk-3.4.1.ebuild 1349 BLAKE2B 8fd619ccc9384226a1351713e77191b328553846627ae63354698512bde66db568249753e608786ca3596ec8d49e28dcb6a08ee14fdcb5307813b73fb325406f SHA512 fe3368daff0f40baa1402bc5a0e08680833cf11796c27ad14b111b0499f01965db2d22db40912b3e009d369215477a605e0281963d9e84025ac81a429f77a49a
 EBUILD itk-4.0.0.ebuild 1460 BLAKE2B 6ca21e3f336cd51cc6ff760bc5d81e02bf4f1148a26da3f98994cd9d873701479097c5f76ab75b4b1b1476a6c9f5fe57f29a906744ffe79b48faeba1ea504d1e SHA512 487bfdfe22e47699411ff5350d9809f66273ba054b933a9912bf0b9f5455de2e4043be8b976095c2ae87b6ddb7a67606badc034db5511d5d8be1f01d57162d02
-EBUILD itk-4.0.1.ebuild 1462 BLAKE2B a491cc3bf34f0aebd7ea44d4d43e4995b8181ab7b1674f407cc48fd2d2189d155c01c04472072b28231038ebb55ce6a941246047b587cb08fe101c7367af65c3 SHA512 4c342ad3d6c8fb4cb7ce941d603fe1273a17053279d828703fcd00a3daf08e7d8557c5b414ac2343a2d9719f09270e5a4c85b287e7a28731a623b578773e0021
-EBUILD itk-4.1.0.ebuild 1349 BLAKE2B dbdb438fd227da270c6edfc6b2cd41fcd425e46077dc0509982a3cfa82d643ed69df3675b695e4dc3bffea6144932891e03f1c16c37b88914fb029195b3b32d6 SHA512 9669aa6bb84323de37021955618c8777a00d24f4d57b46e8fb5f17e2e330773feffc1accd3cc442ac43e16b6fddad9475076368289811bdedec2dbf401d633d1
+EBUILD itk-4.0.1.ebuild 1463 BLAKE2B 3f07a6420076684e79676f6aeb892d67a1d8c04626457e4cef2815d6c496d01ad935a3d8f8ff2f65c29a1ccc92a74c345b8efc88faab1f8f505533cc7d5be70e SHA512 064661f251bb93ebcedc49f77cd00b25489014e324e06b532c05c05aa913f4b67817e3c89fa870551b6a4e0e729461aa0c26219c53dd4813765df7f55270896d
+EBUILD itk-4.1.0.ebuild 1435 BLAKE2B 686716f1d5e56b0ebd953bb18a97a3baf77109c80f254a59ca3e8e86ea6ca97d7fe08a7bb4e12099c38b69b439e0425e231d36b7794eb53246a99ac416d7cdc5 SHA512 358dbc3d3ca9431088834d0e0eeee47811c9a6fb9da01ae420f9752b4f3b4033e1ec5d897db380d43588764c2daa97f1b617505f826b5f0950a9e19e09d675c2
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itk/itk-3.4.1.ebuild b/dev-tcltk/itk/itk-3.4.1.ebuild
index 04fc85436e25..98286e3171dd 100644
--- a/dev-tcltk/itk/itk-3.4.1.ebuild
+++ b/dev-tcltk/itk/itk-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PV}/$
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/itk/itk-4.0.1.ebuild b/dev-tcltk/itk/itk-4.0.1.ebuild
index 95b6ed04e96c..7178266a0e60 100644
--- a/dev-tcltk/itk/itk-4.0.1.ebuild
+++ b/dev-tcltk/itk/itk-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%2
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-lang/tk-8.6:=
diff --git a/dev-tcltk/itk/itk-4.1.0.ebuild b/dev-tcltk/itk/itk-4.1.0.ebuild
index 51ca9d3669c4..5c8acfb52d7d 100644
--- a/dev-tcltk/itk/itk-4.1.0.ebuild
+++ b/dev-tcltk/itk/itk-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,6 @@ EAPI=7
 inherit autotools multilib virtualx
 
 MY_PV=${PV/_beta/b}
-ITCL_VERSION=$(ver_cut 1-2)
 
 DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
 HOMEPAGE="http://incrtcl.sourceforge.net/"
@@ -15,12 +14,12 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%2
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-lang/tk-8.6:=
-	=dev-tcltk/itcl-${ITCL_VERSION}*"
+	>=dev-tcltk/itcl-4.1"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}${MY_PV}"
@@ -33,6 +32,8 @@ src_prepare() {
 }
 
 src_configure() {
+	local ITCL_VERSION=$(best_version dev-tcltk/itcl)
+	ITCL_VERSION=${ITCL_VERSION:15} # remove category, package name and dash
 	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
 	econf \
 		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index 3979140312f8..9cf8c85571ca 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD iwidgets-4.1.1.ebuild 1394 BLAKE2B e88cd3cb4d90b64c909fe2c4a39ab80cc5021d09fe4f4ca1eb8d6272e339592049611120e5b8afb1707eb7c38c4cdb9097842313f104f65f75f85074e7198eb1 SHA512 a4e0eb6569c1fd3349e7445a480efa2431b792673fc8a52847729af45ba72f944af91de41101df2c2ebadde1aa83c314ca1793854a43f3ff0952ef93b5abf192
+EBUILD iwidgets-4.1.1.ebuild 1395 BLAKE2B d47ff9e86f612be16fb9a0539799346a4f68681bf66f6b3ae83019ae61f524f479bf5efd159a5f3a9fa5d5a880c52939340f44b6db847fe62237113b07f62ed4 SHA512 bee6e673aa24afd6086245e4562fe3a80f9a286cc1ec72a7a35affa1637a4c5ece869c6e1e539912d911456f966228ea1041401803586e5f2d61eaf2e0369583
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
index f1de8e97ed1e..b42ebb70c9c1 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="HPND Old-MIT tcltk"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 42b21af1f8e8..92109e60b4bd 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,7 +1,4 @@
 AUX tcllib-1.19-test.patch 501 BLAKE2B 141beca1582b3fef5a632ff807b86a437883de236ed54b6cbfa38a85b7a5e84b520502689d7b7f04aa4f32fedc3bdb8148162f98a53ea4f15668a69c26658a4d SHA512 b0b10dfade925201a4ea67f1da0c14fb8fa9f7fbad852f38e8263dfd323d3125d807fec10d02d4fced4d07997463a1815475707259a19f32380c7cb31cbdc614
-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 1117 BLAKE2B 619ac30ecf5fb0dd0a3647867cd7e0786559589ca507a94705a6ee8cdee51aef0307128642859715046da9487150ccfc20a3b82863e0e229f13aa76fe0b88d2c SHA512 b6afb49a2c66c53988a7711b168b83adb9dc5c9005c1574eebfc33d4dc447a412301d888431d70c2d4860b5798f52349492ee12d4bf955764be9a20394b5d2d3
-EBUILD tcllib-1.19.ebuild 1212 BLAKE2B 5a6433d8e0f8416b832b050c856abda3dcab5f76299f4aaae8e0a535d1665423d185fba079053f77bda4c2b7c600abfbc48605e31f5d335f819219b352b6a0e6 SHA512 dde6fa52c1927696b5dd08c42fe57dea052ec8eef997129e876989cbe86ef47d87eded6935d4351a4ed1d82be0e3edb71123a56372fd461a0a4c75b8fbc3c1dd
+EBUILD tcllib-1.19.ebuild 1219 BLAKE2B 6eae3d390eac5b17e5cd160b173f779098a02b05f44d3758d78cb226877f4a108dc7b7a2a69099318f4952983324dc3cb9cac6497410af64c7ff28ebb97e3c99 SHA512 5cfe773b4f81507db98941b1524e4fb30db393c6804d6f746e5c2db3a3e79e8e859c15e9b4dc1453d16ab97d90bb5dce2ed333bf1fb6e082630e6c83d88c20e4
 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
deleted file mode 100644
index 9a2cce32875c..000000000000
--- a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils virtualx
-
-DESCRIPTION="Tcl Standard Library"
-HOMEPAGE="http://www.tcl.tk/software/tcllib/"
-SRC_URI="
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz
-	mirror://sourceforge/tcllib/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-lang/tcl:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( DESCRIPTION.txt STATUS )
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patchset/${P}-tcl8.6-test.patch
-	"${WORKDIR}"/${P}-patchset/${P}-test.patch
-	"${WORKDIR}"/${P}-patchset/${P}-manpage-rename.patch
-	"${WORKDIR}"/${P}-patchset/${P}-XSS-vuln.patch
-)
-
-src_prepare() {
-	has_version ">=dev-lang/tcl-8.6" && \
-		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-tcl8.6-test-2.patch )
-	epatch "${PATCHES[@]}"
-}
-
-src_test() {
-	Xemake test_batch
-}
-
-src_install() {
-	default
-
-	dodoc devdoc/*.txt
-
-	dohtml devdoc/*.html
-	if use examples ; then
-		for f in $(find examples -type f); do
-			docinto $(dirname $f)
-			dodoc $f
-		done
-	fi
-}
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
index 074b7414f650..10d517c4fae2 100644
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 7ff8c696e856..84505b7b688b 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -7,5 +7,5 @@ AUX tdom-0.9.1-useCC.patch 868 BLAKE2B f4d3a7a0d79d7213ead1fb29dcaca2e33202901a3
 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 1937 BLAKE2B 5b95a705b4fa6308299cf8154b3d60a6cd192b1ce7f2b361dc84b590286922068404568a6bef72070f63e3988bf5929a98b3e11d29361da1b810108aff1afb3d SHA512 05174c0e1e0679415324721b469bfae70e8fdda138f0a6dbd0e57cc449f5a46d000e25bfbc36b03d0dbb46f01cfbc489460dad62485a4f294bd73b851dc818d0
-EBUILD tdom-0.9.1.ebuild 1684 BLAKE2B 34fb96d30c9fea722bd85662dd7aaa0ff2e13000d89538537629ae48c92d1e53b0da6fe39cceabc82e3b75f1969c0972a7a0f0d674e6603f8bc9108bc6187abd SHA512 1d8e54798f6ad93d6a06370495da97464a956e3ec88f4806c8393519a170a6e64d864295f42ec00e4aa700133bc93b13a536088c094600c4101e314482c10f0d
+EBUILD tdom-0.9.1.ebuild 1691 BLAKE2B d6a1df6665c175e994bae0636e81e6bdb58e74ca9e570f8ecdf9354b83caabb7b9ac46ba4d5ab9a4418b3b805e78abcdf9d98e38f62461c48982db847b432091 SHA512 92077704321623e4c015e9a88b485ed1feb3e7d207b0295706814e04c49d8024e03abed20bdc374c7057efed79bc27858b946e3a24535c899557aefb87ec0b04
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 67ca7a61e0a4..c50815c49605 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 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 64f3e24761c2..7f79a1ec6eac 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,3 +1,3 @@
 DIST thread2.8.2.tar.gz 346222 BLAKE2B 194673b14b3f6b98a46330afa58caaf705feb2d8713606547d0d7e5b18770c5729fd562c81e66b403040622afdbdf62b994bd3ef62678d00915ba48f1eafc786 SHA512 0889f54ba8c76413f0333bdf6f17cca38c4fa8ccfff7e1554a63f38f19471dc72c3afe34d2e38ea00724aa3f0c007051999392a8d188d47265dbf0527dadceea
-EBUILD thread-2.8.2.ebuild 852 BLAKE2B 3a4ae25cfe903940a4e9f3f0df6005a9abc6471bfdaef59e5b5183f7ab62ce5d9498b26c9b40b27644a3fddea172aee86f22d23cbbd415438a490daf48777518 SHA512 d638e74b4d596bdda57b6c35d03a5d66e1d931e562934d1c79a886074734bf81051ea83251533b516e06828225cb71e95a2b76be0761fbac264a208937920112
+EBUILD thread-2.8.2.ebuild 849 BLAKE2B fa011da73a2dcf038c1cf55b13978cf383acd967e67eba36eda11b76bee2c7ac729fec4cdcf4cdebac8c8fd772cbcc4a724ac9581e07ea838ba9236240bbb2e6 SHA512 92370a58cad692442644fa1b80cc533a7370ba2239d2c42acf8c04e4361f32fa8ca692340cad68edf4a8030a948a58fc21c46f17af505db5c8a2de4990bcd9dc
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-tcltk/thread/thread-2.8.2.ebuild b/dev-tcltk/thread/thread-2.8.2.ebuild
index 391435b3eb03..9fc9d6ffc3d3 100644
--- a/dev-tcltk/thread/thread-2.8.2.ebuild
+++ b/dev-tcltk/thread/thread-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/tcl:0=[threads]"
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 9e0b9af7783b..ef2d4abc7b24 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 1352 BLAKE2B d9015c89439377b40a2d57b777d95faf1b6a69b09b911a6155d05073773c0f7565c387cbd21e19f9b0f8063bb6c9d413c9f9b14c15294c0744b4b6f2e97e4300 SHA512 ceed20537c8a1e9b54bedefb9a0ed67a36e2d89291be1dc5a099e3d8b3075486ce5b3cf796aca2d142fc64b3902644eca6cb018547c41de451052d223005f6cc
+EBUILD tix-8.4.3-r1.ebuild 1349 BLAKE2B 80b553181d3403a714069543770b81eee5457795de6f08d755c916e8f778dfff1b5b84a72a7957f24ddcfc943766f7f62ba34377086e622a33523f897f06f329 SHA512 bd9b296ea760e4edb2b37af743b1a9c3fca91d89e6393a1909fc971ad6595157244258c364f7f3f304a0b16b9a72a759ab0ff63a56805798e1ca76e8c5313e14
 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 1a35b7821ae5..5be695c1f866 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-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/dev-tcltk/togl/Manifest b/dev-tcltk/togl/Manifest
index eeafd3086db6..84b2308f2e7b 100644
--- a/dev-tcltk/togl/Manifest
+++ b/dev-tcltk/togl/Manifest
@@ -1,4 +1,4 @@
 DIST Togl2.0-src.tar.gz 244968 BLAKE2B f094fb4bba7049470d7f61a2748d4a5baaf47c99c766d96ef8061e254673acf7f2a11555e202ec01f5d6b7a00ae7c275a33981fba5df7f1478f69da17f3180b8 SHA512 2be3062baada848d96b2802582bc5590b215f2ab4dc02c91761e72af2bf8c0ba768a71a2ffb8107bca83b63b7d1321ee83de19b97f83b1c2f0962f9288948b0a
-EBUILD togl-2.0-r2.ebuild 847 BLAKE2B 067fda12fffa35c2f9aa3ab5fdd42aeb0c4b5b9467ae644a0d1e38eb20b060eebbfe14c8b4b11cb6385ad17cfb37b26ec2f8e2050fcadcc3ee2e87633e88dedb SHA512 cb9f1240bbc9f75ddcf001e40e2b3fab77ee2ff7d7d9b80b088b9cb1a84ef9ba899d0b21d284fb46e3b86b43d5a112091a20bd987aba600ad95be4102e56e1f0
-EBUILD togl-2.0-r3.ebuild 838 BLAKE2B 68b22a10a38d4141bf395497e0febd66af783a52d36034c93c2a13f0e5ebd64eb5791e20b6980aca5121db74644c4eaa8410e08f65492f9d0a09bd5554a82c22 SHA512 8af377b2cab489eb0e82b3bf7dfc624962e6e20135aacfe9372e151f34d9471904ffa572620e8d1df04e2fd2ba23fa9c7883df6c962b9ddb4eee8520de7a7fb8
+EBUILD togl-2.0-r2.ebuild 845 BLAKE2B 25b617bfba83be2d6524ae296de52e7a6b3d2d4dd1a1111416ac930b9f3abadb43168aaa72595f9554eb2abc076006f3887d07621a8057cdc6906e34717f84d3 SHA512 3f0d55400ca135690cf6fb16aa05bdce5af37a62c89115cfdc39a63db8c6478f5bf36702f09683a8e3f5de974a20c64bb4856f2ac84d63bb790ee3d3c666a9b9
+EBUILD togl-2.0-r3.ebuild 838 BLAKE2B 0f613be78b09aa98fb38bd397dfb653a8cd68fc53a0df183e1328e455c2998a65800a3a05f022191e9ee956f80387fb9945bd5b9a5c0aa8e36d632099431ff77 SHA512 28b240b541325672c6d5bcc2e1ee55ed13a5f55409521083ae5c97921d40ec97d3e5417425d5f6d8e1b954f6db3959868aac26d251c4b4ba9e2a0fc3c0ea939a
 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 cb54421cfae7..6c8b09a1194f 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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug +threads"
 
 RDEPEND="
diff --git a/dev-tcltk/togl/togl-2.0-r3.ebuild b/dev-tcltk/togl/togl-2.0-r3.ebuild
index 5791c04242e4..c23593c7cf1c 100644
--- a/dev-tcltk/togl/togl-2.0-r3.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,12 +11,12 @@ 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-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +threads"
 
 RDEPEND="
 	dev-lang/tk:*
-	virtual/opengl
+	media-libs/mesa[X]
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"