gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-tcltk
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
69 files changed, 144 insertions, 1782 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index d213c5647b11..25851d7c647e 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 4a08594b01ff..ed2864a1c870 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,22 +1,7 @@
-AUX blt-2.4z-aclocal.patch 1705 BLAKE2B b6a60380857ad7a70fdf77587f726a7e55e159a9b7ccf9be743ff1594c35ed8d4a43b7c0b7206e245e6df999a3dbf8b6f80cf766c711333c2824c936d97d9891 SHA512 dfc4eb375b12d8ae87a65c039bae6445b70008ff1681cf1a40028a04685bbfcbb5dc841b25b475285679aac9303e0807f88c061f983a26a3de66fc1e1dc2ad12
-AUX blt-2.4z-darwin.patch 1186 BLAKE2B f58e5105e0655d4548d919a5dd95f6e8ea49d3d37cc1e8f4553ead2edf1244eec8a532d49409757a21c766cfba397e90bb8ae7008675fedbe665fff8178de8a0 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5
-AUX blt-2.4z-gbsd.patch 1980 BLAKE2B 2b629aff5a63c8a42bcbf8f8b1922be01f3e5239ea7a0a55ecdb3f3cef67fd0b988ed063fd6fa110ad0d6a912f28f1c432f0d25610b2ec54add1158c694075a4 SHA512 9e3b833445f998af5c070d755c4c6904d78175640b771abc020289c857bb12ab82fdd504eebc16771c3b057b94643d20acf4eb5952184ca2d2f9233ecd55f92c
-AUX blt-2.4z-gentoo.patch 3737 BLAKE2B c125071aabca71dd6401d2a1793cb812d0b9eb679a36bc2f0237b257e4e27dbab84be7a96d561d24c4b4817247d3d9ce27d87d30244d0cbf284873d95bfb7d5c SHA512 82ca35009ec902754432db06cdfbeca2a68803d3079b4dfa0add1745ad3dac67524bf951f86beff9d70026c24b8dda454688e8c639385ddf19ed4ace1c01e61d
-AUX blt-2.4z-ldflags.patch 1086 BLAKE2B 351e459f3ca67a49f77875ddfb1a36cccc859fd8c537bb6d14b5d85d5c3ea5766ba242974de007cba515c13c7550dc3a76318fabce3fc5404c7a900a5566a38b SHA512 d2e19fc9caab2ae013c01e66c9674906bda2f01190bf6e9da93c2d22cb4a36a167f7de34649e6d3efc84b0094b1710fc3380347367830dc012873c3845716445
-AUX blt-2.4z-linking.patch 684 BLAKE2B 1125105c5d8891412f31b966673f876ae8b36fe4349e81e7349dbd7636a49ddbcdbebbc68b78966ad86ff67f75b7236d724ad920176e2991cb8e77a2c07bb0b4 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e
-AUX blt-2.4z-r4-fix-makefile2.patch 728 BLAKE2B aa71cba7b9fae1f546838a722d44c3e276ed88f7417029d3c2b3c88c35c5e6071a73ee63e58bc66b03ca9a9a9fb144ecee1da1a671b75be69d423dd4a12c76c1 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681
-AUX blt-2.4z-r4-fix-makefile3.patch 509 BLAKE2B 54470814577ac56e3ec576d1d07bcaf392a5fc6436d2510adcb3d4eaa51ddf5168b4c0f9c5095b5d62f16dab551498ed79fd78433c6b5115e36801321f84ab47 SHA512 77f432a8ae319ae552a0803c949e4de3e4d1ce258d1f41347481f162d084668c125971ccea5e4fc53dd806054596a4d620786aca41275789c393cf499c9a93b4
-AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 BLAKE2B ee98cfbffe662797c6da757f727044501e3689f21bbf0083a05c4b92a05780c93f12edb759286349aeaffc6276115bebc4462ab03903fd24543c455bdb93fc86 SHA512 036cc9672c6c5f7554ab883d89602f8ead92c7533fb45742a082b97162f32d6442ac52e1e4f7154d669d917915b840cc6191ae544e1261e430222e0a293c0f41
-AUX blt-2.4z-tcl8.6.patch 3281 BLAKE2B bc4963adc5016d8b2606d357538ed6a2940b2e47f6bb4cf1e8e51eb39b3ee1e2fa0a0344719b5687fa2e85c1b3abea312431c7e8fcf90abd72cfcb1ae742f803 SHA512 38aa7a7f38e4ae98adda97948b3a0adb0747e4b8966b493efb87268717636c47a79ccd31caa73f44fb7e673e3d51b4552a23ad1b1a0360327fb678327814840c
-AUX blt-2.4z-tk8.6.patch 781 BLAKE2B 46e29dc6390033981e9db351d8d00503c37c45a0f7c6777f6d18c1855a143f11be3cb7fd4fde8b26e33c266ba74eb4e7ba32d53cfc7a63b4319004b0f4544f08 SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602
 AUX blt-2.5.3-darwin.patch 598 BLAKE2B 59fe5eace3f24eacc829ca6c863f914b348ceee79b5904ad3bddded3281d003966d7527df4fc8e85ebc24403fb0d927b6fd92a1772133a9809c22133ddcc030a SHA512 d658ce866ff6424175a04134ac62c3393184a1a7d852dac7405f50d6f99b94c3602f05168dc22a8292aa4a8b2d60b66edb7b7b25f244cd4bbe68d3cd8c5b1c76
 AUX blt-2.5.3-gbsd.patch 844 BLAKE2B 6459fdff29b2895b055a54111b5ee6f19249978943db23c6a3587c8512751d3008b31f938fb1dbe41a260a9110c6e1a98f3a84f996b6e026aac70366538e6f7e SHA512 6f8620ed4ac8ac69ba2d0dd9d5c3a025feb68d742656c2b54c14015e848b94ab5ae9c0c0b629597e573131b089dc263f5416a5f3d9016ea4a323a12c46d8d29b
 AUX blt-2.5.3-gentoo.patch 1280 BLAKE2B 8c2107115f34b1acb384c490e893d0ef357149c13f29bcf31b18218c3f16c6e2cc0bef05678bb397a812137ccfcac91ec3f9e88339f23992bde0e0055148aaac SHA512 a87deacbb3dcf0be3b1ae96d920de9edc0c6bc223b88c76ccaa417aa23254d6716248b703ba855b97ec30dc1ae4e1931273e811ffae1f727ef5663ab505c83dd
-AUX blt2.4z-64bit.patch 891 BLAKE2B ddf77f3a5d47a5252271e57adff1afeb9a4bca868a89c4060a13b7c494355499cd14238a5087cd6da43e7f589be8894f7cbdedb2d04c7ea004a7193da63e2c8f SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4
 DIST blt-2.5.3-debian-patches.tar.gz 52252 BLAKE2B 700a2df32117ea84f9e211e18bda0d64163d24b633b0c5735808da6f3c5f32b73a69e9f1af548cca7eea4538c2aae57a87d82b2f61673e49709ac30dc036e38a SHA512 3da7831c3c8a7847e004cfb81e911883eb29f565e63f3b7ed47719ccba0a0cb593c0dbb77ff22262d5f8c4a3cb94cc074fd9c02f37729fe7763533be6677a852
 DIST blt-src-2.5.3.zip 2724036 BLAKE2B c669bc033e691d1717b6b6dccf42901fed26f58bb4d2e9fffdd4e7f83eae788e1cbdb8fd1bcdc860845a569232ec26d06773146a420984d8abf5d25ee7f73dd9 SHA512 f589564cc5f790ab11ac1356b2e27659ef0e6132ffde42d4325f0aa8d8aa4269fdb9e81dd1c196017518704e4c1c78c0d4116f32afd1e6a1c60878961b8cdb26
-DIST blt2.4z-8.5.2.tar.gz 2326234 BLAKE2B 83ea57989ee1e7bbbc243058b1a734942c4b6d796d06aa3a702012ea8d01eb059e76b6b8ff0efc9b43b000f1cfe7545419e2d892f1794b2add3d8c2c602e22ba SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a
-EBUILD blt-2.4z-r13.ebuild 3518 BLAKE2B 08ffd4f08f540e9ded0cc873112ea277b1cc9c116ab752fae87aaf6e49c0d835dfccdc9ecf3a12b3727ab6953a07a99001146da8824748c59da126e1abe3d3bc SHA512 4c1493c9ea3bb78074ed69ce2a5cba9112404a6dd0417bb4f5f7895bc3382e09716b26566d12e493124252cf1636987161b74dae00fa597413076b204f3508e4
-EBUILD blt-2.4z-r14.ebuild 3572 BLAKE2B 124e55d895b058f2056d7db4c2f5a60b3dc787805b14c9a89293366f65d831539d7231f44b628a792d6c4881756cf88186abd1749f27fa43a9671603b8ac9c4e SHA512 85dff21f4cc8436ddcafadefdbee6bbfbd9b16483a78ed7a4d177e74906764f67bb0545a42b202fc477613b28e3a2d18ea92d6ccfec500294e13a81d7a4cb0e3
-EBUILD blt-2.5.3-r1.ebuild 3959 BLAKE2B 7ce1f7ec6deff065407a782babb395da022b096eb83cf9ddf2eabae897d955b054bb724659ac4a5b301e2fc95088fa90ba78a70a5a51d0cf36f43bd3d4a5ce02 SHA512 7b1b0465c5eee6a58cb86945079f704ab4e5da58612bd72234c3d65dd36d63e5bce89c11e85bc73e1a78cd3b4f144dbc292ce33b562202f78a6014ed743f441c
+EBUILD blt-2.5.3-r1.ebuild 3952 BLAKE2B 7bbd0a76f3baacac1ebce28e54984ac754a084f1de2052f6ad353be89993317133bbc26e6664020e969e140c08be25bf5f52be75c88b3180b7a4fc993cdfaa5b SHA512 ec8099989693e7f05366a68cc8d4c7808696bd1e7a08e2d32276e205c6a7ed30c6a32b6c909ff39d1fb8c8a7fdccfaec7ec2d499969b3332fc559bb3468cbd86
 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
deleted file mode 100644
index 2e633acc10a5..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_V_SUFFIX="-8.5.2"
-
-DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
-HOMEPAGE="
-	http://blt.sourceforge.net/
-	http://jos.decoster.googlepages.com/bltfortk8.5.2"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
-	http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
-
-IUSE="jpeg static-libs X"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	dev-lang/tk:0=
-	jpeg? ( virtual/jpeg:0= )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch"
-	# From blt-2.4z-6mdk.src.rpm
-	epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
-	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
-
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-
-	# Set the correct libdir and drop RPATH
-	sed \
-		-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
-		-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
-		-e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
-		-i configure* || die "sed configure* failed"
-	sed \
-		-e "/^scriptdir =/s:lib:$(get_libdir):" \
-		-i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
-
-	sed \
-		-e "/AR/s:ar:$(tc-getAR):g" \
-		-e 's:0444:0644:g' \
-		-i src/Makefile.in || die
-
-	epatch \
-		"${FILESDIR}"/${P}-linking.patch \
-		"${FILESDIR}"/${P}-darwin.patch \
-		"${FILESDIR}"/${P}-gbsd.patch \
-		"${FILESDIR}"/${P}-tk8.6.patch \
-		"${FILESDIR}"/${P}-tcl8.6.patch \
-		"${FILESDIR}"/${P}-aclocal.patch
-
-	append-cflags -fPIC
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	LC_ALL=C \
-	econf \
-		--x-includes="${EPREFIX}/usr/include" \
-		--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
-		--with-blt="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tk="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tclincls="${EPREFIX}/usr/include" \
-		--with-tkincls="${EPREFIX}/usr/include" \
-		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
-		--with-cc="$(tc-getCC)" \
-		--with-cflags="${CFLAGS}" \
-		--with-gnu-ld \
-		$(use_enable jpeg) \
-		$(use_with X x)
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	sed \
-		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
-		-i demos/{,scripts/}*.tcl || die
-
-	dodir \
-		/usr/bin \
-		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
-		/usr/share/man/mann \
-		/usr/include
-
-	emake INSTALL_ROOT="${D}" install
-
-	dodoc NEWS PROBLEMS README
-	dohtml html/*.html
-	for f in `ls "${ED}"/usr/share/man/mann` ; do
-		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} || die
-	done
-
-	# fix for linking against shared lib with -lBLT or -lBLTlite
-	dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
-	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
-
-	use static-libs || \
-		find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
-		xargs -r -0 rm -fv
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r14.ebuild b/dev-tcltk/blt/blt-2.4z-r14.ebuild
deleted file mode 100644
index 6e956a11ef6a..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r14.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_V_SUFFIX="-8.5.2"
-
-DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
-HOMEPAGE="
-	http://blt.sourceforge.net/
-	http://jos.decoster.googlepages.com/bltfortk8.5.2"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
-	http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
-
-IUSE="jpeg static-libs X"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	dev-lang/tk:0=
-	jpeg? ( virtual/jpeg:0= )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch"
-	# From blt-2.4z-6mdk.src.rpm
-	epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
-	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
-
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-
-	# Set the correct libdir and drop RPATH
-	sed \
-		-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
-		-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
-		-e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
-		-i configure* || die "sed configure* failed"
-	sed \
-		-e "/^scriptdir =/s:lib:$(get_libdir):" \
-		-i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
-
-	sed \
-		-e "/AR/s:ar:$(tc-getAR):g" \
-		-e 's:0444:0644:g' \
-		-i src/Makefile.in || die
-
-	epatch \
-		"${FILESDIR}"/${P}-linking.patch \
-		"${FILESDIR}"/${P}-darwin.patch \
-		"${FILESDIR}"/${P}-gbsd.patch \
-		"${FILESDIR}"/${P}-tk8.6.patch \
-		"${FILESDIR}"/${P}-tcl8.6.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-aclocal.patch
-
-	append-cflags -fPIC
-
-	mv configure.{in,ac} || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	LC_ALL=C \
-	econf \
-		--x-includes="${EPREFIX}/usr/include" \
-		--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
-		--with-blt="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tk="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tclincls="${EPREFIX}/usr/include" \
-		--with-tkincls="${EPREFIX}/usr/include" \
-		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
-		--with-cc="$(tc-getCC)" \
-		--with-cflags="${CFLAGS}" \
-		--with-gnu-ld \
-		$(use_enable jpeg) \
-		$(use_with X x)
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	sed \
-		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
-		-i demos/{,scripts/}*.tcl || die
-
-	dodir \
-		/usr/bin \
-		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
-		/usr/share/man/mann \
-		/usr/include
-
-	emake INSTALL_ROOT="${D}" install
-
-	dodoc NEWS PROBLEMS README
-	dohtml html/*.html
-	for f in `ls "${ED}"/usr/share/man/mann` ; do
-		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} || die
-	done
-
-	# fix for linking against shared lib with -lBLT or -lBLTlite
-	dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
-	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
-
-	use static-libs || \
-		find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
-		xargs -r -0 rm -fv
-}
diff --git a/dev-tcltk/blt/blt-2.5.3-r1.ebuild b/dev-tcltk/blt/blt-2.5.3-r1.ebuild
index 0374098be13b..cbea8f39681d 100644
--- a/dev-tcltk/blt/blt-2.5.3-r1.ebuild
+++ b/dev-tcltk/blt/blt-2.5.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/wize/${PN}-src-${PV}.zip
 IUSE="jpeg static-libs X"
 SLOT="0/${SHVER}"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tcltk/blt/files/blt-2.4z-aclocal.patch b/dev-tcltk/blt/files/blt-2.4z-aclocal.patch
deleted file mode 100644
index e7c62b5de7f3..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-aclocal.patch
+++ /dev/null
@@ -1,79 +0,0 @@
- aclocal.m4   |  6 +++---
- configure.in | 38 +++-----------------------------------
- 2 files changed, 6 insertions(+), 38 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 7441d3d..b86a6b2 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -11,11 +11,11 @@ if test "$cross_compiling" = yes; then
- else
- cat > conftest.$ac_ext <<EOF
- [#]line __oline__ "configure"
--#include "confdefs.h"
--ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-+[#include "confdefs.h"
-+#ifdef __cplusplus
- extern "C" void exit(int);
- #endif
--])dnl
-+]dnl
- [$2]
- EOF
- eval $ac_link
-diff --git a/configure.in b/configure.in
-index adde26d..b57eaa9 100644
---- a/configure.in
-+++ b/configure.in
-@@ -83,35 +83,9 @@ PWD=`pwd`
- #
- # -----------------------------------------------------------------------
- 
--BLT_ENV_CC=$CC
--
--#
--# CC search order
--#
--#  1. command line (--with-cc)
--#  2. environment variable ($CC)
--#  3. cached variable ($blt_cv_prog_cc)
--#  4. check for program (AC_PROG_CC)
--#  4. default to cc
--#
--
--AC_MSG_CHECKING([which C compiler])
--if test "x${blt_with_cc}" != "x" ; then 
--  CC=${blt_with_cc}
--  unset ac_cv_prog_CPP
--  unset ac_cv_prog_CC
--elif test "x${BLT_ENV_CC}" != "x" ; then
--  unset ac_cv_prog_CPP
--  unset ac_cv_prog_CC
--elif test "x${blt_cv_prog_cc}" != "x" ; then
--  CC=${blt_cv_prog_cc}
--  unset ac_cv_prog_CC
--else 
--  AC_PROG_CC
--fi
--if test "x${CC}" = "x" ; then
--  CC=cc
--fi
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_EGREP
- 
- case $target in
-   *-*-cygwin*|*-*-mingw*)
-@@ -121,12 +95,6 @@ case $target in
-     ;;
- esac
- 
--AC_MSG_RESULT([$CC])
--
--unset blt_cv_prog_cc
--AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
--AC_SUBST(CC)
--AC_PROG_CPP
- if test "x${GCC}" != "x" ; then
-   blt_have_gcc="yes"
- else
diff --git a/dev-tcltk/blt/files/blt-2.4z-darwin.patch b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
deleted file mode 100644
index 0d766fe5e17f..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-darwin.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -183,9 +183,6 @@
-       blt_lib_prefix=""
-     fi
-     ;;
--  *-*-macosx)
--    blt_platform="macosx"
--    ;;
-   *)
-     blt_platform="unix"
-     ;;
-@@ -728,6 +725,9 @@
-   *-hpux*)
-     SHLIB_SUFFIX="sl"
-     ;;
-+  *-darwin*)
-+    SHLIB_SUFFIX="dylib"
-+    ;;
-   *)
-     SHLIB_SUFFIX="so"
-     ;;
-@@ -1145,6 +1145,13 @@
-     LDFLAGS=""
-     ;;
- 
-+  *-darwin*)
-+    SHLIB_CFLAGS=""
-+    SHLIB_LD="${CC}"
-+    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
-+    SHLIB_SUFFIX=".dylib"
-+    ;;
-+
-   *-dgux*)
-     SHLIB_CFLAGS="-K PIC"
-     SHLIB_LD="cc"
---- configure
-+++ configure
-@@ -1279,9 +1279,6 @@
-       blt_lib_prefix=""
-     fi
-     ;;
--  *-*-macosx)
--    blt_platform="macosx"
--    ;;
-   *)
-     blt_platform="unix"
-     ;;
-@@ -3396,6 +3393,9 @@
-   *-hpux*)
-     SHLIB_SUFFIX="sl"
-     ;;
-+  *-darwin*)
-+    SHLIB_SUFFIX="dylib"
-+    ;;
-   *)
-     SHLIB_SUFFIX="so"
-     ;;
-@@ -3943,6 +3943,13 @@
-     LDFLAGS=""
-     ;;
- 
-+  *-darwin*)
-+    SHLIB_CFLAGS=""
-+    SHLIB_LD="${CC}"
-+    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
-+    SHLIB_SUFFIX=".dylib"
-+    ;;
-+
-   *-dgux*)
-     SHLIB_CFLAGS="-K PIC"
-     SHLIB_LD="cc"
diff --git a/dev-tcltk/blt/files/blt-2.4z-gbsd.patch b/dev-tcltk/blt/files/blt-2.4z-gbsd.patch
deleted file mode 100644
index ffdadf1746e5..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-gbsd.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Detect correctly Gentoo/*BSD CHOSTS:
-- *-*-freebsd* means tcl/tk libs will be like libtcl85.so, instead of
-  libtcl8.5.so
-- *-gentoo-*bsd means this is a Gentoo/*BSD system which uses the same toolchain
-  as linux, so we link in the same way.
-
---- blt2.4z-8.5.2/configure.old	2012-05-06 18:11:45.000000000 -0400
-+++ blt2.4z-8.5.2/configure	2012-05-06 18:15:25.000000000 -0400
-@@ -3376,7 +3376,7 @@
- fi
- 
- case $target in
--  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
-+  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
-     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-     ;;
-@@ -4079,6 +4079,12 @@
-     EXTRA_LIB_SPECS="-ldl"
-     ;;
- 
-+  *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*)
-+    SHLIB_CFLAGS="-fPIC"
-+    SHLIB_LD="${CC}"
-+    SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
-+    ;;
-+
-   *-netbsd*|*-freebsd*|*-openbsd*)
-     # Not available on all versions:  check for include file.
-     ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
---- blt2.4z-8.5.2/configure.in.old	2012-05-06 18:11:47.000000000 -0400
-+++ blt2.4z-8.5.2/configure.in	2012-05-06 18:15:08.000000000 -0400
-@@ -708,7 +708,7 @@
- fi
- 
- case $target in
--  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
-+  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
-     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-     ;;
-@@ -1241,6 +1241,12 @@
-     EXTRA_LIB_SPECS="-ldl"
-     ;;
- 
-+  *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*)
-+    SHLIB_CFLAGS="-fPIC"
-+    SHLIB_LD="${CC}"
-+    SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
-+    ;;
-+
-   *-netbsd*|*-freebsd*|*-openbsd*)
-     # Not available on all versions:  check for include file.
-     AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
diff --git a/dev-tcltk/blt/files/blt-2.4z-gentoo.patch b/dev-tcltk/blt/files/blt-2.4z-gentoo.patch
deleted file mode 100644
index b1dac41eea0b..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-gentoo.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- a/src/bltInit.c	2019-11-09 22:03:25.863937619 +0100
-+++ b/src/bltInit.c	2019-11-09 22:03:37.052748213 +0100
-@@ -413,7 +413,7 @@
- 	 * Check that the versions of Tcl that have been loaded are
- 	 * the same ones that BLT was compiled against.
- 	 */
--	if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-+	if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) {
- 	    return TCL_ERROR;
- 	}
- 	/* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl
-@@ -458,7 +458,7 @@
- 	register Tcl_AppInitProc **p;
- 	Tcl_Namespace *nsPtr;
- 
--	if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) {
-+	if (Tk_InitStubs(interp, TK_PATCH_LEVEL, 1) == NULL) {
- 		return TCL_OK;
- 	}
- 
---- a/src/bltHtext.c	2019-11-10 21:37:10.229076065 +0100
-+++ b/src/bltHtext.c	2019-11-10 21:38:24.835776868 +0100
-@@ -3347,7 +3347,8 @@
-      * The page is always draw at full width and the viewport will clip
-      * the text.
-      */
-+    if (htPtr->lineArr) {
-     if ((htPtr->first != oldFirst) || (htPtr->last != oldLast)) {
- 	int offset;
- 	int i;
- 	int first, last;
-@@ -3378,6 +3378,7 @@
-     }
-     DrawPage(htPtr, deltaY);
-+    }
-     SendBogusEvent(tkwin);
- 
-     /* Reset flags */
-     htPtr->flags &= ~TEXT_DIRTY;
---- a/src/bltText.c	2019-11-12 08:33:39.905088060 +0100
-+++ b/src/bltText.c	2019-11-12 08:34:01.995349355 +0100
-@@ -48,7 +48,7 @@
- 
-     fragPtr = textPtr->fragArr;
-     for (i = 0; i < textPtr->nFrags; i++, fragPtr++) {
--#if HAVE_UTF
-+#if 0
- 	Tk_DrawChars(display, drawable, gc, font, fragPtr->text,
- 	    fragPtr->count, x + fragPtr->x, y + fragPtr->y);
- #else
---- a/src/bltWindow.c	2019-11-12 20:38:50.348383884 +0100
-+++ b/src/bltWindow.c	2019-11-12 20:48:05.553043414 +0100
-@@ -362,6 +362,9 @@
-     Atom windowAtom;		/* Atom for TK_WINDOW. */
-     Atom clipboardAtom;		/* Atom for CLIPBOARD. */
-     Atom utf8Atom;		/* Atom for UTF8_STRING. */
-+#if (TK_VERSION_NUMBER >= _VERSION(8,6,0))
-+    Atom atomPairAtom;          /* Atom for ATOM_PAIR. */
-+#endif
- 
-     Tk_Window clipWindow;	/* Window used for clipboard ownership and to
- 				 * retrieve selections between processes. NULL
-@@ -391,6 +394,7 @@
-     Atom appNameProperty;	/* X's name for property used to hold the
- 				 * application name on each comm window. */
- 
-+#if (TK_VERSION_NUMBER < _VERSION(8,6,0))
-     /*
-      * Information used by tkXId.c only:
-      */
-@@ -408,7 +412,7 @@
- 				/* If set, it means a call to WindowIdCleanup
- 				 * has already been scheduled, 0 means it
- 				 * hasn't. */
--
-+#endif
-     /*
-      * Information used by tkUnixWm.c and tkWinWm.c only:
-      */
-@@ -417,6 +421,7 @@
-     struct TkWmInfo *foregroundWmPtr;
- 				/* Points to the foreground window. */
- 
-+#if (TK_VERSION_NUMBER < _VERSION(8,6,0))
-     /*
-      * Information maintained by tkWindow.c for use later on by tkXId.c:
-      */
-@@ -428,6 +433,7 @@
- 				 * can re-use ids in windowStackPtr when
- 				 * server has seen this request and event
- 				 * queue is empty. */
-+#endif
- 
-     /*
-      * Information used by tkVisual.c only:
-@@ -460,7 +466,13 @@
- 				 * display. */
-     Window mouseButtonWindow;	/* Window the button state was set in, added
- 				 * in Tk 8.4. */
-+#if (TK_VERSION_NUMBER >= _VERSION(8,6,0))
-+    Tk_Window warpWindow;
-+    Tk_Window warpMainwin;	/* For finding the root window for warping
-+				 * purposes. */
-+#else
-     Window warpWindow;
-+#endif
-     int warpX;
-     int warpY;
- 
-@@ -475,7 +487,11 @@
- 
-     int iconDataSize;		/* Size of default iconphoto image data. */
-     unsigned char *iconDataPtr;	/* Default iconphoto image data, if set. */
--
-+#if (TK_VERSION_NUMBER >= _VERSION(8,6,0))
-+#ifdef TK_USE_INPUT_METHODS
-+    int ximGeneration;          /* Used to invalidate XIC */
-+#endif /* TK_USE_INPUT_METHODS */
-+#endif
- } TkDisplay;
- 
- #else
diff --git a/dev-tcltk/blt/files/blt-2.4z-ldflags.patch b/dev-tcltk/blt/files/blt-2.4z-ldflags.patch
deleted file mode 100644
index bc795d060de8..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-ldflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in
-index 5d93e82..db14156 100644
---- a/src/shared/Makefile.in
-+++ b/src/shared/Makefile.in
-@@ -18,7 +18,7 @@ SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ @LD_RUN_PATH@
- SHLIB_TCL_ONLY_LIB_SPECS = @SHLIB_TCL_ONLY_LIB_SPECS@ 
- SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@ 
- SHLIB_LD =	@SHLIB_LD@
--LDFLAGS =	@LDFLAGS@ @LD_RUN_PATH@
-+LDFLAGS +=	@LDFLAGS@
- 
- prefix =	@prefix@
- exec_prefix =	@exec_prefix@
-@@ -144,14 +144,14 @@ $(lib_so): $(OBJS)
- 	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
- 		$(srcdir)/bltInit.c
- 	$(RM) $@
--	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
-+	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
- 		$(SHLIB_LIB_SPECS)
- 
- $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
- 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
- 		$(srcdir)/bltInit.c
- 	$(RM) $@
--	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
-+	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
- 		$(SHLIB_TCL_ONLY_LIB_SPECS)
- 
- install: mkdirs install-lib install-demo
diff --git a/dev-tcltk/blt/files/blt-2.4z-linking.patch b/dev-tcltk/blt/files/blt-2.4z-linking.patch
deleted file mode 100644
index b5a5359171d3..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-linking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in
-index db14156..a06111f 100644
---- a/src/shared/Makefile.in
-+++ b/src/shared/Makefile.in
-@@ -145,14 +145,14 @@ $(lib_so): $(OBJS)
- 		$(srcdir)/bltInit.c
- 	$(RM) $@
- 	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
--		$(SHLIB_LIB_SPECS)
-+		$(SHLIB_LIB_SPECS) $(LIBS)
- 
- $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
- 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
- 		$(srcdir)/bltInit.c
- 	$(RM) $@
- 	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
--		$(SHLIB_TCL_ONLY_LIB_SPECS)
-+		$(SHLIB_TCL_ONLY_LIB_SPECS)  $(LIBS)
- 
- install: mkdirs install-lib install-demo
- 
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch
deleted file mode 100644
index 1ff4fed5f51b..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: mescalinum
-Upstream: N/A
-Reason: fix broken $DESTDIR support in Makefile
---- Makefile.in.orig	2008-10-26 14:36:22.000000000 +0100
-+++ Makefile.in	2008-10-26 14:37:04.000000000 +0100
-@@ -47,9 +47,9 @@ install-all:
- 	(cd library; $(MAKE) install)
- 	(cd man; $(MAKE) install)
- 	(cd demos; $(MAKE) install)
--	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
--	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
--	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
-+	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
-+	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
-+	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
- 
- mkdirs:
- 	@for i in $(instdirs) ; do \
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch
deleted file mode 100644
index c7065df39753..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: mescalinum
-Upstream: N/A
-Reason: fix broken $DESTDIR support in library/Makefile
---- library/Makefile.in.orig	2008-10-26 14:30:28.000000000 +0100
-+++ library/Makefile.in	2008-10-26 14:31:40.000000000 +0100
-@@ -58,7 +58,7 @@ install: mkdirs pkgIndex
- 	for i in $(miscFiles) ; do \
- 	    $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
- 	done 
--	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
-+	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
- 
- mkdirs:
- 	@for i in $(instdirs) ; do \
diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch
deleted file mode 100644
index c8637b9c7c45..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/bltInit.c.orig	2008-05-29 00:05:10.000000000 +0200
-+++ src/bltInit.c	2008-05-29 00:26:40.000000000 +0200
-@@ -413,7 +413,7 @@ Blt_Init(interp)
- 	 * Check that the versions of Tcl that have been loaded are
- 	 * the same ones that BLT was compiled against.
- 	 */
--	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) {
-+	if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
- 	    return TCL_ERROR;
- 	}
- 	/* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl
-@@ -458,16 +458,23 @@ Blt_Init(interp)
- 	register Tcl_AppInitProc **p;
- 	Tcl_Namespace *nsPtr;
- 
-+	if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) {
-+		return TCL_OK;
-+	}
-+
-+#if 0
- #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 
- 	if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) {
- 	    return TCL_OK;
--	} 
-+	}
- #else
- 	if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, EXACT) == NULL) {
- 	    Tcl_ResetResult(interp);
- 	    return TCL_OK;
- 	} 
- #endif
-+#endif
-+
- 	nsPtr = Tcl_CreateNamespace(interp, "blt::tile", NULL, 
- 			    (Tcl_NamespaceDeleteProc *) NULL);
- 	if (nsPtr == NULL) {
-@@ -507,7 +514,7 @@ Blt_Init(interp)
- 	 * Check that the versions of Tcl that have been loaded are
- 	 * the same ones that BLT was compiled against.
- 	 */
--	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) {
-+	if (Tcl_InitStubs(interp, TCL_VERSION, EXACT) == NULL) {
- 	    return TCL_ERROR;
- 	}
- 	/* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl
-@@ -543,6 +550,11 @@ Blt_Init(interp)
-     if (!tkLoaded) {
- 	register Tcl_AppInitProc **p;
- 
-+	if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) {
-+		return TCL_OK;
-+	}
-+
-+#if 0
- #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 
- 	if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) {
- 	    return TCL_OK;
-@@ -553,6 +565,8 @@ Blt_Init(interp)
- 	    return TCL_OK;
- 	} 
- #endif
-+#endif
-+
- 	/* Initialize the BLT commands that use Tk too. */
- 	for (p = tkCmds; *p != NULL; p++) {
- 	    if ((**p) (interp) != TCL_OK) {
diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch
deleted file mode 100644
index 8721940af2c3..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch
+++ /dev/null
@@ -1,86 +0,0 @@
- src/bltScrollbar.c | 2 +-
- src/bltTed.c       | 6 +++---
- src/bltVecMath.c   | 8 ++++----
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/bltScrollbar.c b/src/bltScrollbar.c
-index 69662de..731e37b 100644
---- a/src/bltScrollbar.c
-+++ b/src/bltScrollbar.c
-@@ -534,7 +534,7 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv)
- 	} else {
- 	    fraction = ((double)pixels / (double)barWidth);
- 	}
--	sprintf(interp->result, "%g", fraction);
-+	sprintf(Tcl_GetStringResult(interp), "%g", fraction);
-     } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
- 	int x, y, pos, barWidth;
- 	double fraction;
-diff --git a/src/bltTed.c b/src/bltTed.c
-index 64c43e8..832ef9c 100644
---- a/src/bltTed.c
-+++ b/src/bltTed.c
-@@ -1504,7 +1504,7 @@ EditOp(dataPtr, interp, argc, argv)
- 	tablePtr->flags |= ARRANGE_PENDING;
- 	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
-     }
--    interp->result = Tk_PathName(tedPtr->tkwin);
-+    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
-     tedPtr->flags |= LAYOUT_PENDING;
-     EventuallyRedraw(tedPtr);
-     return TCL_OK;
-@@ -1678,7 +1678,7 @@ SelectOp(dataPtr, interp, argc, argv)
- 	    tedPtr->activeRectArr[4].width = grip - 1;
- 	    tedPtr->activeRectArr[4].height = grip - 1;
- 
--	    interp->result = Tk_PathName(entryPtr->tkwin);
-+	    Tcl_SetResult(interp, (char*)Tk_PathName(entryPtr->tkwin), TCL_VOLATILE);
- 	    active = 1;
- 	    break;
- 	}
-@@ -1751,7 +1751,7 @@ RepOp(dataPtr, interp, argc, argv)
- 	tablePtr->flags |= ARRANGE_PENDING;
- 	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
-     }
--    interp->result = Tk_PathName(tedPtr->tkwin);
-+    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
-     tedPtr->flags |= LAYOUT_PENDING;
-     EventuallyRedraw(tedPtr);
-     return TCL_OK;
-diff --git a/src/bltVecMath.c b/src/bltVecMath.c
-index dc37af8..5117f63 100644
---- a/src/bltVecMath.c
-+++ b/src/bltVecMath.c
-@@ -764,20 +764,20 @@ MathError(interp, value)
-     if ((errno == EDOM) || (value != value)) {
- 	Tcl_AppendResult(interp, "domain error: argument not in valid range",
- 	    (char *)NULL);
--	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result,
-+	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp),
- 	    (char *)NULL);
-     } else if ((errno == ERANGE) || IS_INF(value)) {
- 	if (value == 0.0) {
- 	    Tcl_AppendResult(interp, 
- 			     "floating-point value too small to represent",
- 		(char *)NULL);
--	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result,
-+	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", Tcl_GetStringResult(interp),
- 		(char *)NULL);
- 	} else {
- 	    Tcl_AppendResult(interp, 
- 			     "floating-point value too large to represent",
- 		(char *)NULL);
--	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result,
-+	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", Tcl_GetStringResult(interp),
- 		(char *)NULL);
- 	}
-     } else {
-@@ -786,7 +786,7 @@ MathError(interp, value)
- 	sprintf(buf, "%d", errno);
- 	Tcl_AppendResult(interp, "unknown floating-point error, ",
- 	    "errno = ", buf, (char *)NULL);
--	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result,
-+	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", Tcl_GetStringResult(interp),
- 	    (char *)NULL);
-     }
- }
diff --git a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
deleted file mode 100644
index f956c098138e..000000000000
--- a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/tkButton.c.orig	2013-01-04 23:24:45.000000000 -0500
-+++ src/tkButton.c	2013-01-04 23:28:29.000000000 -0500
-@@ -526,8 +526,6 @@
- static Blt_TileChangedProc TileChangedProc;
- static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
- 
--EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
--
- #if (TK_MAJOR_VERSION > 4)
- EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, 
- 	int padX, int padY, int innerWidth, int innerHeight, int *xPtr, 
-@@ -1890,7 +1888,7 @@
- 	}
-     }
-     if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
--	return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
-+	return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
-     }
-     return TCL_OK;
- }
diff --git a/dev-tcltk/blt/files/blt2.4z-64bit.patch b/dev-tcltk/blt/files/blt2.4z-64bit.patch
deleted file mode 100644
index 9f1c3c975eef..000000000000
--- a/dev-tcltk/blt/files/blt2.4z-64bit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- blt2.4z/src/bltTree.c.64bit-fixes	2002-09-29 07:44:12.000000000 +0200
-+++ blt2.4z/src/bltTree.c	2003-07-31 12:22:53.000000000 +0200
-@@ -95,17 +95,16 @@ static Value *TreeNextValue _ANSI_ARGS_(
-  */
- 
- #define REBUILD_MULTIPLIER	3
-+#define START_LOGSIZE		5 /* Initial hash table size is 32. */
-+#define MAX_LIST_VALUES		20 /* Convert to hash table when node
-+				    * value list gets bigger than this
-+				    * many values. */
- 
- #if (SIZEOF_VOID_P == 8)
- #define RANDOM_INDEX(i)		HashOneWord(mask, downshift, i)
- #define BITSPERWORD		64
- #else 
- 
--#define START_LOGSIZE		5 /* Initial hash table size is 32. */
--#define MAX_LIST_VALUES		20 /* Convert to hash table when node
--				    * value list gets bigger than this
--				    * many values. */
--
- /*
-  * The following macro takes a preliminary integer hash value and
-  * produces an index into a hash tables bucket list.  The idea is
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index 0b0371fbf6d5..117ce4b66aaf 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 802 BLAKE2B ae27a0a6c7a6c944187f5e5cb02f34ffd21169fb8dda1d2fdb818277b93612104851892fcc7602157cdcd8c94a887793c132be5203e4ac56a2b352803afb8451 SHA512 8231d193aa5e98e26527332ad1bbc2f9e6050692ca252a0eeaf015f6afd3b2daf4850536125f997b222afbee89898449a242d2e9e1ec9ebbd825489b140c40cd
-EBUILD bwidget-1.9.14.ebuild 802 BLAKE2B d0e4569e9c0a6e83423a127793ffc4ff6f6e75b54bd8968e8bf658976d5ce5dc9cc5f18574c0fecc1b19dcd49828859620558cb44f10a3e83863030f40683cd3 SHA512 40693a5311414a33212469da49477ceb7f2c2f01c24ecfbd71d7a9f12236ab3a0b290e9295eab16bc5da05bce3a9eef00402ead0925dc1526d8ecddfab43ed49
+EBUILD bwidget-1.9.12.ebuild 795 BLAKE2B b50d38bb3d037bbff871ac08da17c5a9570d4dd30deac8e671caff27b0ec8792da79b7149d9c5c57c71be1d9dfc06fa749a41c2e0678701a0f4db97192c16428 SHA512 53fc1ecf17f22adae53c2cbeae59924f323ee593b68fee43ceb3408617c4f902d2df59845aeb4c70cee46778b1a26aae05ff912a82bc2f92ab9611a8ff7e8cc3
+EBUILD bwidget-1.9.14.ebuild 795 BLAKE2B c9428ce3253c70e6c74714c6bf2b2094c5b2b11c771628933bf5f72b9abd6d7644cd951936024230686f20cdeabf45f3f89cf0b7b01eef059a8644347c476e4a SHA512 3271d637e2bdd78b61f655263bca65b3185ae4c0242f53b21848fd68482a58d955c3b85f5e4b8945a07e2208f6c6df4b8bab899f7fc93451ef80d34c9e961453
 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 bd1ad504ad50..1516a543cda1 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils multilib virtualx
+inherit multilib virtualx
 
 MY_PN=${PN/bw/BW}
 MY_P=${MY_PN}-${PV}
diff --git a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild b/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
index 8b1813ea260e..0c19aba46b5e 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils multilib virtualx
+inherit multilib virtualx
 
 MY_PN=${PN/bw/BW}
 MY_P=${MY_PN}-${PV}
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 100e8639397a..285d3c2848c1 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 2296 BLAKE2B a41c0429fd4a3ca95e5880c3ebdb8369ed3dd19503845e247a694e3c8cfc39041c9f6be6e47530a030163c8cdae4b175644aafef272538c6102e952917ab262c SHA512 c51bec660db71450d509207463b1992d29bda835bc385253eb424ccd887ec5b52cca0de6feecc6eb0e8509649c0a10ca775359a4d50af48abbde2d6cc402acf5
+EBUILD expect-5.45.4.ebuild 2297 BLAKE2B 04a0490d261b03a7111fad9e6b966a7001b3b12f32c162ee34d46572837a9761b5595b793c9553f2a545676271ac49feb26c39a42c207268b463d40cffb4a7ea SHA512 4c5385876bd58e1361eeae690263958977a181f6559a896c2a6de4d4f97efb996ff3f8250755182b7e77a316a2ba050ed0f4588562b75a258d4fd1e24635a01c
 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 77ad3b8dd295..efb1f5f4cae6 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools epatch
 
 MY_P="${PN}${PV}"
 DESCRIPTION="tool for automating interactive applications"
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~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 ~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 66cc5c4b018c..29c1821f7063 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,9 +1,5 @@
-DIST itcl3.4.1.tar.gz 263316 BLAKE2B ba4a94d2dfe80b095e754d01036b189130918d7f29701f003873d59fa8e75074b1601dd907d94e5a9f680e05b18493d5782d6a4ddbb56d7df9ff85c8d5b17ecf SHA512 288c9b636f1814371bedd33d570a8d46055e136953685a111b76f3b89a6c7aaa1ee9223ceaae1c5ce43198195cb1adc2b178d7c4101d7fd14cb7e756c98bf2b0
-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 1019 BLAKE2B 13fc70ee7f749306875aeef5fe0d5b287acb08b2900b3f5a6fcb515037ddf1ce96ba0b155d6dea1dd6100777e10e38b9e51bbdf3246810381078d9af74529e41 SHA512 51a03c9563e614cfc4ae599d1695671fcea5a790e27f564bc6128aa5b1df84cd08b0fd20075a61e9c774e880294ab9472a9b2671db28cf61f627bf56e5226ad6
-EBUILD itcl-4.0.3.ebuild 1714 BLAKE2B a1cae04f9caf8891797c58c18b7b0ca748af29e2bc8bcb380a26ffcb6bceb184410c043bb098b3ff4677fe3de8ff9e11e1082c0f6f6e7f9e9d35fe2aeb6f58f7 SHA512 bc411d57e5cc2ad58f26fa29737fc7f04af85d524f3df2f07dd24c11e7bf3dc6ec70fd48f08c1a7e5a2a1b82ec0c3c571df7a3e309b10d799f4daa6591ca020f
-EBUILD itcl-4.1.1.ebuild 1473 BLAKE2B 5133c88d3780d09e17510aca3c0a436e6a96af920e5a73f3aa0033dceee54f7d962c906223bafaacf8bb56ad9347d5f4c5982ea7a0546a38d6221a9d93d58667 SHA512 3d682384f9040f833e721652b8616b3be0ecd0b6894a5e6ec5c67feb9d7694849d1e8c22e86857365347540181e485bee984f8d5f91b43c11501ff5138c69018
-EBUILD itcl-4.2.0.ebuild 1484 BLAKE2B 25e517edb794c4a83a1aec1d7348fc70e246e62a0da73e3ebbd7a699da95ef63e7e0f845364befafd937afe0fef9a8a876b9ade84aa4eff4850f9f22ed4af657 SHA512 f0c4b869369c34bd41b9b2b19469542303ff7b3e438d0b086094d91a9e6b8e5380c81554a575f95b9b3bdab610f799e5a5e06f4be5d8ca2efd353425334a73b3
+EBUILD itcl-4.1.1.ebuild 1466 BLAKE2B 45f0cc5e6df9f6d6a7d598ffda2bb2b0bf1696917fc663fe1ccba3048f5d06fb3382de1d48572ec65d14102fe90720c48888e8abecf4ebe0e8c40217837708da SHA512 8404b375b24c92cd9cf0437a3abab39ef5b3f2fe26a1f48fa0a79702d4773afaa43707fd67319e87ec41ad54e59297e6957abb3f77187bfd3ec430477bd173a8
+EBUILD itcl-4.2.0.ebuild 1477 BLAKE2B c0d9e3ae6a197d9b145dbd842504b7bce49ffd2da52c944ba2acb3cb64b4ef3d57f324b396981a8a1a2fcce9600f7257ecf71434e7a2825693474755c6ff8c10 SHA512 23dd9f86507b8856deec791f388ad26c682923efb2b1f5c4f321ab46a786618a28a7d0eeebdadf9f493ff49844a29a04b9d12d45de3626eb7c7e91b4ee02ee31
 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
deleted file mode 100644
index 76655429ee2f..000000000000
--- a/dev-tcltk/itcl/itcl-3.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="<dev-lang/tcl-8.6:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_compile() {
-	# adjust install_name on darwin
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i \
-			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
-			"${S}"/Makefile || die 'sed failed'
-	fi
-
-	sed 's:-pipe::g' -i Makefile || die
-
-	emake CFLAGS_DEFAULT="${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-2)/"
-	EOF
-	doenvd "${T}"/34${PN}
-}
diff --git a/dev-tcltk/itcl/itcl-4.0.3.ebuild b/dev-tcltk/itcl/itcl-4.0.3.ebuild
deleted file mode 100644
index c4a648a95f81..000000000000
--- a/dev-tcltk/itcl/itcl-4.0.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator
-
-MY_P="${PN}${PV}"
-TCL_VER="8.6.2"
-
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%20${PV}/${MY_P}.tar.gz"
-#SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.0.2/itcl4.0.2.tar.gz"
-#SRC_URI="mirror://sourceforge/project/tcl/Tcl/${TCL_VER}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/tcl-8.6:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-# somehow broken
-#RESTRICT=test
-
-src_configure() {
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclinclude="${EPREFIX}"/usr/include \
-		--disable-rpath
-}
-
-src_compile() {
-	# adjust install_name on darwin
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i \
-			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
-			"${S}"/Makefile || die 'sed failed'
-	fi
-
-	sed 's:-pipe::g' -i Makefile || die
-
-	emake CFLAGS_DEFAULT="${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	sed \
-		-e "/BUILD_LIB_SPEC/s:-L${S}::g" \
-		-e "/BUILD_STUB_LIB_SPEC/s:-L${S}::g" \
-		-e "/BUILD_STUB_LIB_PATH/s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
-		-e "/INCLUDE_SPEC/s:${S}/generic:${EPREFIX}/usr/include:g" \
-		-e "s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
-		-i "${ED}"/usr/$(get_libdir)/${MY_P}/itclConfig.sh || die
-
-	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-3)/"
-	EOF
-	doenvd "${T}"/34${PN}
-}
diff --git a/dev-tcltk/itcl/itcl-4.1.1.ebuild b/dev-tcltk/itcl/itcl-4.1.1.ebuild
index 4b2563cf3c04..50fd582e4ad2 100644
--- a/dev-tcltk/itcl/itcl-4.1.1.ebuild
+++ b/dev-tcltk/itcl/itcl-4.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils multilib
+inherit multilib
 
 MY_P="${PN}${PV}"
 
diff --git a/dev-tcltk/itcl/itcl-4.2.0.ebuild b/dev-tcltk/itcl/itcl-4.2.0.ebuild
index 2722c55ff398..31a1c519ce32 100644
--- a/dev-tcltk/itcl/itcl-4.2.0.ebuild
+++ b/dev-tcltk/itcl/itcl-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils multilib
+inherit multilib
 
 MY_P="${PN}${PV}"
 
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index 0d90980aa1a9..9f1051e87bbe 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,9 +1,3 @@
-DIST itk3.4.1.tar.gz 182311 BLAKE2B e1db1b9f7e6e8c5b93eec5bb29fc24af7e6cc5cb3f209df346f03553d3fe7248614c9bb10e2ababd93ea56c63963c1db4ee65bedbae8c279fbe84b6d0eaad3f9 SHA512 4680db81a0212e695cfe2c40cabe6dceb94520cf3ee06e2e332f12316838726da14c0b925b117ea351aa14fd2d695f361bcb4062743c66099ef783ae31ab37ef
-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 1349 BLAKE2B 8fd619ccc9384226a1351713e77191b328553846627ae63354698512bde66db568249753e608786ca3596ec8d49e28dcb6a08ee14fdcb5307813b73fb325406f SHA512 fe3368daff0f40baa1402bc5a0e08680833cf11796c27ad14b111b0499f01965db2d22db40912b3e009d369215477a605e0281963d9e84025ac81a429f77a49a
-EBUILD itk-4.0.0.ebuild 1457 BLAKE2B 9cf5cf4bdd6da9343c2972f0ec13210d1cec63641cc18b033780199db4eb89bb99c748edfabc41c7484c4c676a189f6addd3e31b24a870d53b1a36f3e988fd5e SHA512 edb07b8295a40a64ed11dd2a21c381a3cebd26c27ed6c63a9029c7adc46459f692f6648aa95b6edb7489cbe8e8d842ff0e08eefe58b26c0a56ef9ed640334b7f
-EBUILD itk-4.0.1.ebuild 1460 BLAKE2B 23cf0a831ffe5f37be1b1ce9626989975d601f7f146b8c56a2e87436fbbb858b6d0c253b4441dda0bf88223ef0a6e1f6273bd29de758c58b8060ddc25522548c SHA512 5b5a2d7d7774eb3ecf3100b4fca942c8f4e23bb87744c4521d26db49a2e941355e925a7b991d00dd2bc5587fcdcdd8d2e64195767e03ce8f8d4874cbc2ab2b77
 EBUILD itk-4.1.0.ebuild 1442 BLAKE2B 8ca995edae8c023ebafa03ad00ef931a7b6c895c394528813d401f03a509789e798fcf988ba92099ed9a13ff9027376f694e161ecb2933d2ddf0b542623983b7 SHA512 ed1571a4a7ef96a19f466fef236353e5bab703a57e63c741b67383e5ebbaa9fcb0b4d54c6146ad5b553d368cb65f96c4bccc78fc3195f7c56510d3236019bc8e
 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
deleted file mode 100644
index 98286e3171dd..000000000000
--- a/dev-tcltk/itk/itk-3.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib versionator virtualx
-
-MY_PV=${PV/_beta/b}
-ITCL_VERSION="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PV}/${PN}${PV}.tar.gz"
-
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	<dev-lang/tk-8.6:=
-	=dev-tcltk/itcl-3.4*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}$(get_version_component_range 1-2)"
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${P}-install_data.patch
-	mv configure.{in,ac} || die
-	AT_M4DIR=.. eautoconf
-	sed 's:-pipe::g' -i configure || die
-}
-
-src_configure() {
-	source "${EPREFIX}"/usr/$(get_libdir)/itclConfig.sh || die
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclinclude="${EPREFIX}"/usr/include \
-		--with-tkinclude="${EPREFIX}"/usr/include \
-		--with-x
-}
-
-src_compile() {
-	emake CFLAGS_DEFAULT="${CFLAGS}"
-}
-
-src_test() {
-	Xemake test
-}
-
-src_install() {
-	default
-
-	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
-	EOF
-	doenvd "${T}"/34${PN}
-}
diff --git a/dev-tcltk/itk/itk-4.0.0.ebuild b/dev-tcltk/itk/itk-4.0.0.ebuild
deleted file mode 100644
index 76db73b077f3..000000000000
--- a/dev-tcltk/itk/itk-4.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib versionator
-
-MY_PV=${PV/_beta/b}
-ITCL_VERSION="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%20${MY_PV}/${PN}${MY_PV}.tar.gz"
-#SRC_URI="mirror://sourceforge/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%20${MY_PV}/${PN}${MY_PV}.tar.gz"
-
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-lang/tk-8.6:=
-	=dev-tcltk/itcl-${ITCL_VERSION}*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${MY_PV}"
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}-install_data.patch
-	AT_M4DIR=.. eautoconf
-	sed 's:-pipe::g' -i configure || die
-}
-
-src_configure() {
-	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclinclude="${EPREFIX}"/usr/include \
-		--with-tkinclude="${EPREFIX}"/usr/include \
-		--with-itcl="${ITCL_SRC_DIR}" \
-		--with-x
-}
-
-src_compile() {
-	emake CFLAGS_DEFAULT="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc license.terms
-
-	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
-	EOF
-	doenvd "${T}"/34${PN}
-}
diff --git a/dev-tcltk/itk/itk-4.0.1.ebuild b/dev-tcltk/itk/itk-4.0.1.ebuild
deleted file mode 100644
index ba8702f902a4..000000000000
--- a/dev-tcltk/itk/itk-4.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib versionator
-
-MY_PV=${PV/_beta/b}
-ITCL_VERSION="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%20${MY_PV}/${PN}${MY_PV}.tar.gz"
-#SRC_URI="mirror://sourceforge/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%20${MY_PV}/${PN}${MY_PV}.tar.gz"
-
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-lang/tk-8.6:=
-	=dev-tcltk/itcl-${ITCL_VERSION}*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${MY_PV}"
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}-install_data.patch
-	mv configure.{in,ac} || die
-	AT_M4DIR=.. eautoconf
-	sed 's:-pipe::g' -i configure || die
-}
-
-src_configure() {
-	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclinclude="${EPREFIX}"/usr/include \
-		--with-tkinclude="${EPREFIX}"/usr/include \
-		--with-itcl="${ITCL_SRC_DIR}" \
-		--with-x
-}
-
-src_compile() {
-	emake CFLAGS_DEFAULT="${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	dodoc license.terms
-
-	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
-	EOF
-	doenvd "${T}"/34${PN}
-}
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 11f0f298b20c..1dc831f55674 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -6,5 +6,5 @@ AUX snack-2.2.10-test.patch 11984 BLAKE2B b3d3458aff3de62e3569f67af5c40c9f12311c
 AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ecea3eeb2984c050888aced8289e77f30692386bcc437679bb5cc7a46f1616cbb3f4f64de017c343bcce2241b016d0cd5 SHA512 3e472dc7603426d35b23714435b3a8bfb6d54326eb1eaa54d8b79b4710035b3fed4e1f6a85ebad632950222c5cd55ac917dcb8cf2e87d0baa36124f8a3361fa8
 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
-EBUILD snack-2.2.10-r9.ebuild 2496 BLAKE2B 903eb9a04a30acec064ff220c1447a51bd2838fb1d77eefc1ad459b9a46b549da587fbc2695455d7fea67b94c783d77f8f509465c5a27a89f00af4f4e702d912 SHA512 94b0638d58738738bf0f676338e390084e314613635c4b525c651df105b6a9875b150894d270c6d3667af1b80e34195877c85bc29db8a007f597c04607565cf1
+EBUILD snack-2.2.10-r9.ebuild 2500 BLAKE2B 983c05a23df4dd7371150f76351ded082cfb87bb541859ce82ccaa975e57941a93822a982ee8611d7921c2293f9e8d8bb972f653643181b302287a43ac36fed1 SHA512 314869b2d7d97fd0d3c03911f5c71eaff94e16a4c200028c3377a126fc8491fcbd59d933e0e589151613af48898ce5cca45ec20610cd2e36c562d88a61d90d5f
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index b4da7e9d7daa..1c89f67a187c 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_OPTIONAL=yes
 
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 2e07db095b88..842f3f912d29 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,4 +1,4 @@
 AUX tcllib-1.20-test.patch 6599 BLAKE2B ebbbb624b0d214d6e0f9aa61b968f4133abbe8e108098bdf6d7bb726f5c8d12fe4a6a2976d4d9b0a7ef97f9787df52114f55a654b8d10aa6cd076307caa766d0 SHA512 574fead7b1b48e95c8524ea47df9e3087c0c9858cf22c1b2300d8b405a639f2b9c3ed763b8849e2bf805868138a0f044553eab48613d0df018f44d914eaf096d
 DIST tcllib-1.20.tar.xz 6692664 BLAKE2B 3e70cf0d0f9e469a20e18f84238f56a53b5b8e36abcf418dc32f64c819728968d24e2999705d91d8341cb608a6bb674a063e86253cddfb51f2693a94d0e070e5 SHA512 d2c20642f91cdc7bf3b329025be80eb9288d0919fa439c2066349b52950cf3c343f39c7745b9b08ec28a884ff2f219fe0fb5f47023f1266b6a6de6ae54852412
-EBUILD tcllib-1.20.ebuild 974 BLAKE2B 977914da642c31d82a7f50f0248021eb6ae384b43e2eaf01edfda5afd9b6fbfef4f80629441871ff38d42d9c7247a7dc7aecd733bed7b38e6ef492fd9940e445 SHA512 daaafab54022af9fd26d6822fd1335ca1ddd6293400e5d0430697d872df35d6b9fb55ecccf8cb3d3a42b73c4fdda9a5399f2f0a19ffdcefba8718e9175ea32d7
+EBUILD tcllib-1.20.ebuild 975 BLAKE2B 900ef394274a29c4258acef629cbf7844ff16c706935502821ea6ae417109aa3cd880e84dd8cb70daaa3fcd48c40a5e147d8b1512df6faaa2ae58b3db893ba3e SHA512 1a54bed746b9c3891470594d7244580b9d4963fd188c1b37e52582082100f1a05ae6b7b811939cd624fa9979e3086c2e2204891742e0c05e6e5e354a0f82a7df
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index 45760d915524..f2eeb5a864fb 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ppc64 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/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index ff8eb58e3f06..b8ed365d60e7 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -1,4 +1,5 @@
 AUX tclpython-5.0-gentoo.patch 856 BLAKE2B cd2efc191b03a24ed9fc7ed69349a8503228de30b9f79d01d81a11b1b166819e202901a6a1f246d0c142ae55fd7589a3c2ad7e81a1cbc7ca5ef486b5424c7292 SHA512 2cf2a99979d7457e5b16c795c86883b81069ecb01b485d52990e1c69ef412dbced3a10dfcfb803b8e1aa0cb0a09221598d7317a19dd20576e4c9fe163d29811f
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
+EBUILD tclpython-5.0-r1.ebuild 1014 BLAKE2B 90d290610739127b7b4f69746b04941b08bf59a6b702a28a7454617370b5402e280c261c81223011e66f8c3c04457c43174a8a0e461c3ffd51395939f8f0d733 SHA512 f4cf9c3513d47a5e78cc6cb35a9b0b9911a860668a23590f203c4d7584da96586fc7a8d1c5779bb98ae5ccbc475fce9893ca3fdb91b46d9a3c95f176a5191566
 EBUILD tclpython-5.0.ebuild 983 BLAKE2B 4a4b24574c6b0d090cefc31c7a036c7a16e2f1a7019722809e6cbd0e95053088ee5a0c787e516016cf0967d7505c2f5962bfb8a3531d82e072c997c577089c65 SHA512 724d1ea9d23d1d8e88e22fa6165ef7ff19fa26a2953706bdfae76b99f56499f4b0df749b4524d13b65472afb7d5f58845b177072f10e4262ffce3e59962ce72f
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild b/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
new file mode 100644
index 000000000000..5ef932e91735
--- /dev/null
+++ b/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
+SRC_URI="https://github.com/amykyta3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	emake PKG_NAME=tclpython3 CC=$(tc-getCC) \
+		MYCFLAGS="${CFLAGS}" \
+		MYLDFLAGS="${LDFLAGS} $(python_get_library_path)"
+}
+
+src_test() {
+	emake PKG_NAME=tclpython3 CC=$(tc-getCC) test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+	doins -r build/tclpython3/tclpython3
+	fperms 775 /usr/$(get_libdir)/tclpython3/tclpython3.so.${PV}
+	dosym tclpython3.so.${PV} /usr/$(get_libdir)/tclpython3/tclpython3.so
+
+	dodoc README.md VERSION.md
+}
diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
index 788294e3ae87..1a73c7dacb13 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -7,6 +7,5 @@ DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b932
 DIST tclreadline-2.3.8.tar.gz 393167 BLAKE2B e6a8d35904a0ed22fac01d7f6b6ecc9eef99acea149253ec9a0f7a3463a163ef17daa052bd4801fb9e365b056ab58d69fe2ec9884a9279881638c7b99c12f6a7 SHA512 0c5ce53a8f4cc222de013932698e442c63b36e3f07d10b962d127444f75c28b2caf7f06b5958150748f7a1d535c577c825b9a0dd525e077a348c3ff899a74e61
 DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
 EBUILD tclreadline-2.1.0-r5.ebuild 1849 BLAKE2B b7fa4bf1db26f914acd559e6b30cfd8515f379d48dcc67b13f8be2e9a1ca8452fd802c59d5a31c34eb2e533c4996cb804fa75133cc309e87583dc3309e355199 SHA512 e07faa38e34fdab0c78673b3a824ae5f8fc9734e7477ae2a19aba437d0a90e1af0a8057a2d58f8dd7af6538ed6181336830402a0e3551c72046100b3fdbc1db6
-EBUILD tclreadline-2.3.8-r1.ebuild 835 BLAKE2B 690efb6618b5c23bda12962e85b8ca061b57c6d98eab5e1ecc2d23acb147520cddc058c890b34cda33fa8da17031f0ce02d7c5020b7fe3825e013d703b1d8940 SHA512 047cd2f415ce272b9ba4c1025531b1cd2c9fd99ba22552444aec19c98cc1fc00d9e7c6a654f0df42ea90ce44bff5172feaaff3747f74b3394f96596aadd7d9d5
-EBUILD tclreadline-2.3.8.ebuild 817 BLAKE2B 6b99b8590ae2a1d43a7c2b0c804886857978357dddf9730d2039bb9a4101e776325255dfbc6df91815709e960c45d44bff016c0cf360081bd7f04f892a5668ac SHA512 7e91620a657d3549e282d2924abc109338e8127e9857809e8142a05e2f674f6941ee096d7a9d3a05d0d17466ebc8e51d87038d25e13ce109f21f2eda2a67c0cb
+EBUILD tclreadline-2.3.8-r1.ebuild 832 BLAKE2B 277598921a3d320fa225b3b70f965313cc3a025bdc07ca55fda7a432e07ac65543a435105d6895a5f7880297bcffce306a1b99763fe1ae8498a9c7904d1ab073 SHA512 e30d220c7656972da47cbf7bedcbebe53bdb447bcd176dbd7e7dc3508deff68385c6ad0c064b8edab76d51ff628371ddf92c50038187ba4ab7436c7394365fe1
 MISC metadata.xml 334 BLAKE2B b04f2a6d45f622095b6c4a34a0752583e773c10a7df53c77f02d642dc8ca715a1ab9dbd2ad64122142fd93122b004cd456350774a082cd3f72d0b920eb54e03c SHA512 23517fbebe1eedf4558ec1c04e10774229762eb7279d0bda99f602fac526afd817968bbff0ba23a1ef433684afda85f830ed7f5643b7c9cca22e7d2f66f71691
diff --git a/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild b/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
index 8d94f9c47fb3..bf5c09d73760 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/flightaware/tclreadline/archive/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 DEPEND="dev-lang/tcl:0=
diff --git a/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild b/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild
deleted file mode 100644
index b162fd1c8670..000000000000
--- a/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Readline extension to TCL"
-HOMEPAGE="https://github.com/flightaware/tclreadline"
-SRC_URI="https://github.com/flightaware/tclreadline/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="tk"
-
-DEPEND="dev-lang/tcl:0=
-	sys-libs/readline:0=
-	tk? ( dev-lang/tk:0= )"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/TCLRL_LIBDIR/s|/usr/lib|/usr/$(get_libdir)|" \
-		configure || die
-}
-
-src_configure() {
-	local myConf=--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-	if ! use tk; then
-		myConf="$myConf --without-tk"
-	fi
-	econf $myConf
-}
-
-src_install() {
-	default
-	find "${D}" -name \*.la -delete
-}
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index 7fee742f1d23..4de617dabcc6 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,7 +1,5 @@
 AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c0dba904c4ea99cc97f5d360f1c1c4bd98a7bb5a9257c04f28d46ef7203731863b8a166f3878d0d7b4a024ee SHA512 a7fdd81a615222b805ab1dcb85a619b2621a187a39602f5d64dcf36027a1ee6e616328a7463f4cb9b6fe60169c887c925d133dc1df1cb20f9cb419ba13c870f1
 AUX tclx-8.4-varinit.patch 399 BLAKE2B 92173ca104c538655436b991914d421b32a7b09e2bb2b2c6205470653de405c413ebbd2ee5620f0067128f333033d8536f8bd93d05b7954ee36f39cdc07be864 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353
 DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
-DIST tclx8.4.1.tar.bz2 330073 BLAKE2B bc9cd45945b1c9b945bcd139bfc52d42fc9bf1bf4251a8bb599ca6ee2b3804bc692aee6038a3cb84de82d24173473a57a8396fa598558f83237f1586cbe59b11 SHA512 faad58f5d8e0e1e759da639800f354b583fb01418c94f2274924aa07beb0ee9559beb87b3386ed5ae3694700a71dfe5b8ac54ead0ec75c6963507e9d3ead7060
-EBUILD tclx-8.4.1.ebuild 1111 BLAKE2B b24b78469d73489a10cb7d5dcd9443383bc1b427b6b11d366e7b4e87084e6bd3ba40dd54d9fffda5f00cbe88265a04e27d78b2972f70469409e317269d381136 SHA512 35e1dc6386742852f11fdde9777c0798dde7de081e9897a30762d75bd48073ec0b66f681e74f7b0e8c15b930526e60d2d57c65ea81bb2997b118b6db622038ec
-EBUILD tclx-8.4.4.ebuild 1026 BLAKE2B 6c2c726e53ced27768cc89de4dfbbd496ad2d90193d618b85753fb4b51e7ff2d3659ece7ef2488a513d1dc573cfbcbf1204cb4618506d0811f1b22c81d8010a2 SHA512 c6e9dd20348fb99edde04afdfe220c87f1255298469a00fdf011c7a2ccf752d7423f5877c011b45191a2865ea6c96d3d0cb0b18561966531b2fcda3aa58861e4
+EBUILD tclx-8.4.4.ebuild 1024 BLAKE2B 1a95d1b579f66e9476eaf7148cd93f228ca8e16b72f181f63ebe84ae26e4b77e7ae611fc5b9fb82217d3faedc9b33e2d6ec18bb11057e8ba776af802c9d38924 SHA512 ba36c5baea727b218320e8b0501c686208fc6c3ff854ab583ea589373af2eb803a81aa24944c8e6fa49ac9f44ce647b0b75402446fa39adf906594262eb08d6f
 MISC metadata.xml 320 BLAKE2B e1ea46abd6276e332673b42325554390b6a84a93e2b64672bf1d23db1e092bb224fb84a6e4f2688e5a825db8893b36f3749dd322ad1c1e8d0f4e52bd4138b657 SHA512 46a66ef4a96a446d7e0f3fa50abccc6ad90ed089f31f6376417092caa636f890639cc65901df49c9d5161586d26f3b416487aa5adbd6db248cabcf39e8435e1a
diff --git a/dev-tcltk/tclx/tclx-8.4.1.ebuild b/dev-tcltk/tclx/tclx-8.4.1.ebuild
deleted file mode 100644
index 96b6c636264d..000000000000
--- a/dev-tcltk/tclx/tclx-8.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator
-
-DESCRIPTION="A set of extensions to TCL"
-HOMEPAGE="http://tclx.sourceforge.net"
-SRC_URI="mirror://sourceforge/tclx/${PN}${PV}.tar.bz2"
-
-LICENSE="BSD"
-IUSE="tk threads"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-lang/tcl:0=
-	tk? ( dev-lang/tk:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}$(get_version_component_range 1-2)
-
-# tests broken, bug #279283
-RESTRICT="test"
-
-src_prepare() {
-	sed \
-		-e '/CC=/s:-pipe::g' \
-		-i tclconfig/tcl.m4 configure || die
-	epatch \
-		"${FILESDIR}"/${PN}-8.4-varinit.patch \
-		"${FILESDIR}"/${PN}-8.4-ldflags.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable tk) \
-		$(use_enable threads) \
-		--enable-shared \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)/"
-
-	# adjust install_name on darwin
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i \
-			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
-				"${S}"/Makefile || die 'sed failed'
-	fi
-}
-
-src_install() {
-	default
-	doman doc/*.[n3]
-}
diff --git a/dev-tcltk/tclx/tclx-8.4.4.ebuild b/dev-tcltk/tclx/tclx-8.4.4.ebuild
index 7e7e1c5c56e0..37bbc76faed2 100644
--- a/dev-tcltk/tclx/tclx-8.4.4.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4.ebuild
@@ -11,9 +11,9 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="BSD"
-IUSE="threads"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="threads"
 
 DEPEND="dev-lang/tcl:0="
 RDEPEND="${DEPEND}"
@@ -22,8 +22,8 @@ RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 PATCHES=(
-		"${FILESDIR}"/${PN}-8.4-varinit.patch
-		"${FILESDIR}"/${PN}-8.4-ldflags.patch
+	"${FILESDIR}"/${PN}-8.4-varinit.patch
+	"${FILESDIR}"/${PN}-8.4-ldflags.patch
 )
 
 src_prepare() {
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 2c340eccbcac..2edf091fe7c4 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,8 +1,5 @@
 AUX tclxml-3.2-fix-implicit-declarations.patch 488 BLAKE2B 1feca37c6c6e87d8c04d884dc6cfcaaacf64eead99f48825cb6473a677161876b3c3be8db6dd04e30195379dbaff2647cfe3cbe8dde4ee3ee9b17d817390100b SHA512 9f8a0c55886c01324e318aec70c99b85f845567a486daddbb897900f242d8a9fec99026c8f6ec7d73e5dca8ee22bf851dc64eab2a83a3a2c959828a24e79e4ca
-AUX tclxml-3.2-format-security.patch 647 BLAKE2B b35232d7b553ee3e95b0a6c1998ad98b50be7198af8383bc5f3e00c6892bac29c257bdce9e04ec783098b878b06736c032b801684d9152b5d8ff1df5c4db771d SHA512 2b76363f015400642f00ce24ef67fd8f7607cd6ed0a63a5768aa343fbe9d6a8af50e15ccebecff813aa0c6d0714d65626c31e2edc860b6b826e52952bb47d435
 AUX tclxml-3.2.7-bool.patch 590 BLAKE2B d651d04e44b3021d8be4631a52a65ffcb498e7c27b7b69acc261d91d6e4a09c5066aee71c6f096b2ac599e1b8eaacbf87ffba5a2a46ff403ae2948caf43c4979 SHA512 1178bb6588c5c0632e5611f5c913748943304d9f9a68a7a45b58d254beaca38ceec21120fdf00e7938949ef21037e2d2504e60cd9418a316f8923cc30b72d3e8
 DIST tclxml-3.2.7.tar.gz 313751 BLAKE2B 43983d2d6c2f339fa320c4748f889db49fbe9cfff15219e898fdfe5a9a7d6526a2b40b7697fdca6f5272bdfb52cbe68af53ced711ad5d476dc2c5e31898c00ba SHA512 23cb17466f777538088998fa4cce55531708bba517d45cb8b4281401779c418f8532376e4aefcf4bb5f3674ee5bab2e0db25ab2a69c153d3e5820c509edf12ae
-DIST tclxml-3.2.tar.gz 757594 BLAKE2B 6ddadb6add6ccba0db55e704ddffafe1c0f22740d27a5c49bf9c8fd00e1592aed46fd1cef49155101ac1544de8559f0d808731c598cf2189ff84a681bbf870e6 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da
-EBUILD tclxml-3.2-r2.ebuild 1104 BLAKE2B c7fb3d0496a9fae3ee378d98705c47997a6a800f603a24ece4310a329c764255ba167d5b69765be4635bb313938e220e87a719a56e0ea5318e3e3c76c10dce9c SHA512 64f2f89b49e6c3a72e68daedcdbd6baa1b88f66b57396e55ffc2de0dd7100a9781635db83e1046677ba782f9627407709fa8eff7fc052b65bbfef56ac4602590
-EBUILD tclxml-3.2.7.ebuild 1062 BLAKE2B 1b430931363ac9ba46a1af8b373358b3fb8ac63502b3097b4536554abf07d22f8b02be1d52935c2bd94fcc948ab33f187b776ca4f8c9eff9c59454cd56468f6e SHA512 ac6cfad968dba6416c389c8209b82de52dadec85ddea80f631a19078a05426b5f4a1a71f785f830a45a0df8cd6e1aed616c0c017b7886ce19df7897529b4c371
+EBUILD tclxml-3.2.7.ebuild 1053 BLAKE2B 358aa94829fe6b1747c7167eb0016357a0f55df3666b42f1766aa8f2f2bb2d1feeb994807699ef9e114cf315264ce5e5fe25d35ac4b09d683c2a02a80cc354c3 SHA512 98c524e4249ccc6de08f72aced98796fb6f53959bb38d7e42945b582ea17e8e7c6591ed62567bfa7f809066f6d85c4d48c38b31c23f25d12d26e190619f13811
 MISC metadata.xml 329 BLAKE2B 6a79c9f1952fa24494921c92da92aaceae631ec090df7e08b39e8f037330cccff13a537c04340364552ad8a0f9c8aa41e642bf5ccc5ecac5264f4836a696fb06 SHA512 32f679fcef8e5ad247a7e566ccfe9098116d093ce83e7326e744dbfede0eeb47fbcc3de723e135a1dd3733d337de6648632ab1b5191ec2e9135d48a3b2988e5d
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
deleted file mode 100644
index 2d13c6575ea6..000000000000
--- a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tclxslt-libxslt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tclxslt-libxslt.c b/tclxslt-libxslt.c
-index d943bf7..d18f645 100644
---- a/tclxslt-libxslt.c
-+++ b/tclxslt-libxslt.c
-@@ -1506,7 +1506,7 @@ TclXSLTExtFunction(xpathCtxt, nargs)
-     obj = TclXSLT_ConvertTclObjToXPathObj(extinfo->interp, resultPtr);
-     valuePush(xpathCtxt, obj);
-   } else {
--    xmlGenericError(xmlGenericErrorContext,
-+    xmlGenericError(xmlGenericErrorContext, "%s",
- 		    Tcl_GetStringFromObj(resultPtr, NULL));
-     /* Need to define a new error code - this is the closest in meaning */
-     xpathCtxt->error = XPATH_UNKNOWN_FUNC_ERROR;
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
deleted file mode 100644
index 7c563c1ff350..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="Pure Tcl implementation of an XML parser"
-HOMEPAGE="http://tclxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
-
-IUSE="debug threads"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-
-DEPEND="
-	>=dev-lang/tcl-8.2:0
-	>=dev-libs/libxml2-2.6.9
-	dev-libs/libxslt
-	>=dev-tcltk/tcllib-1.2
-	dev-libs/expat"
-#	test? ( dev-tcltk/tclparser )
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fix-implicit-declarations.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-}
-
-src_configure() {
-	local myconf=""
-
-	use threads && myconf="${myconf} --enable-threads"
-
-	econf ${myconf} \
-		--with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
-		--with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
-		--with-tclinclude="${EPREFIX}"/usr/include \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable amd64 64bit) \
-		$(use_enable debug symbols)
-}
-
-src_install() {
-	default
-	dohtml doc/*.html
-}
diff --git a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
index 15aa26831c2b..d0971795ffb4 100644
--- a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
@@ -3,17 +3,17 @@
 
 EAPI=7
 
-inherit eutils multilib
+inherit multilib
 
 DESCRIPTION="Pure Tcl implementation of an XML parser"
 HOMEPAGE="http://tclxml.sourceforge.net/"
 SRC_URI="https://github.com/wjoye/${PN}/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
-IUSE="debug threads"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE="debug threads"
 
 DEPEND="
 	>=dev-lang/tcl-8.2:0
@@ -27,8 +27,8 @@ RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 PATCHES=(
-		"${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
-		"${FILESDIR}"/${P}-bool.patch
+	"${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
+	"${FILESDIR}"/${P}-bool.patch
 )
 
 src_configure() {
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 75bca601622d..ddd97f0a4afe 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,11 +1,4 @@
-AUX tdom-0.8.2-tnc.patch 2806 BLAKE2B 69e00242eba8096a8d28fe3218e1d0b441e567185ca5d208633a4d68deeb160d5d5d108749df0fd0c1d9ea6df9d054919d5d4bf6ecd4bf9c389e94f15c5323cc SHA512 b111a75abf35dd7acf813e05295e51633d30e12d20250f21905eec021ea64194d116a9869b2eac882da49f6a9037d3b1b6e23b30091b9bc92cd2bed91d7c8177
-AUX tdom-0.8.2.patch 2036 BLAKE2B d19a9a1f7b2095d5c0ce3684ecdacc0328ba82ddf6488d7fd3bbb2d1f0f777f6f7739ca0cca50a00825ea7ea3405415c61c738d49ed092bbbe17af165356dfee SHA512 f86d07835de0274072243ff347123edba075d46e0e3da246d75f378d9dfcff3cc4e338f6d26449f15610db4bf1256b5e3890ac9b5f2b3d3c5edd24dcfd8120b5
-AUX tdom-0.8.3-expat.patch 2512 BLAKE2B a97637e5e65ac2711cb4be392e2269fd17bfd2a2ca83a92d78b9dd064b94492de626264ea67715b315c5c2326f24833d1a57173bd36120ad989cb2985bf3b969 SHA512 110c07c55b2793152819c8da486a72440096876ff871b045d1a4b1d4a0a9e62bac4ccaf02bc83786f309b85f84e9311b6af31b6f4b5e8fb4f8294e6435f6be15
-AUX tdom-0.8.3-soname.patch 963 BLAKE2B 561fbd01681f2ecb5c55325591cc9e3f796dac14ecd1e7d567454df7ed56ea8f45208fd03c611a8816a38c63147dba7c9868493616103cb03014edf32842f3a4 SHA512 ea7f689f3b979fc565947a6b5e2ef6dfd422eee83c98749c4f9f0a213f0a44f3beba211e5c8e1b251e4bc2bbd77a5e4e75476661de5ffeb9d01e8f7bbba05990
-AUX tdom-0.8.3-tcl8.6.patch 764 BLAKE2B ae8abbe0b2b5db8b75f618048ba407bbd2ad97b55a15d61803c2840a2ade88d6c5201d6bb045898ce427b2d375d468a827f5e95e5de74b3768560e28a7a20730 SHA512 4af4a3d712a9f6b57a7a9c6641c7fbef9c1ffd278c2507c067dc43d15102dc2bcc8df8eafc205973c7d7db8f7f9914f98d881877c863b32184c68c6313a466b6
 AUX tdom-0.9.1-useCC.patch 868 BLAKE2B f4d3a7a0d79d7213ead1fb29dcaca2e33202901a33f0a2f4b97313f5e4db79cd92ec79db179a1ce4d2d93813c3616c6e32c82fd6c6abdc89dac43477fdab1043 SHA512 765ba2e77c48fcb13530e92c483a48e3f57921e4b721cc9149e054c4cbb4a022ac0036c23e88f7b3a8cd7820a056240ab6e2ec2d9cf83e6fe4d8bb1dd01b1b4f
-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 1938 BLAKE2B 2951dfd3bcd37acb93b495f0eb960063a5c8068a3b9ec21ba63f7f50426d50539adae80a7d53e8bebf85f6eda6f224f8813c10ee81067ad46bc7e47990fba604 SHA512 4a441e27820ad303f2cc435a40ab087093a5db6c0aa08865ec7767edf1089aaa2a136bed706b6a356a9bacb739159c2b2f0b5d717ad15b093848aba8f05dfc15
-EBUILD tdom-0.9.1.ebuild 1692 BLAKE2B 9c4613a3e5ba622bbe2f99e93e1672d9bef0d134af28c173951ad8f529c563f72b3055c6c62bf66cba97060eb2511a4af4218e5338038942e8f7da80b31230a1 SHA512 0251a7bbc43906d7bb643bc1c66d5b98dd546195368d6e0fedd5ea5bfb38edd6f52b5496487dec160bb2b1f5d047b6b9e1007f716e8752b3e15014d37287215c
+EBUILD tdom-0.9.1.ebuild 1677 BLAKE2B 6f714a5d97d220dafaa63d8751ef441afe148edd7fdd956d8a2b261cbf1a3518f853399a3694d244e2dbe7eb4391910dda32ddf432db1612f1790107333fc1f1 SHA512 3e055d595f07b66fdbe411a0c8abf84b8c9f3e1d37174ae8b450b468fdb6e70de579a7b45dcd9a62e3e7b4d38a28b2df58bc70760a57d00322340fb5d9adf635
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
deleted file mode 100644
index 7fa200b9ee33..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
---- extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -355,29 +355,30 @@
- #========================================================================
- 
- install-lib-binaries: binaries
--	@mkdir -p $(DESTDIR)$(pkglibdir)
-+	@mkdir -p $(DESTDIR)$(libdir)
- 	@list='$(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- 	    if test "x$$stub" = "xstub"; then \
--		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- 	    else \
--		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	    fi; \
- 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
- 	    if test "x$$ext" = "xdll"; then \
- 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- 		if test -f $$lib; then \
--		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
--	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- 		fi; \
- 	    fi; \
- 	  fi; \
- 	done
-+	@mkdir -p $(DESTDIR)$(pkglibdir)
- 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    destp=`basename $$p`; \
---- extensions/tnc/configure.in
-+++ extensions/tnc/configure.in
-@@ -89,7 +89,7 @@
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-     TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
- else
--    TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
-+    TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
- fi
- 
- #--------------------------------------------------------------------
---- extensions/tnc/pkgIndex.tcl.in
-+++ extensions/tnc/pkgIndex.tcl.in
-@@ -2,4 +2,4 @@
- 
- package ifneeded tnc @PACKAGE_VERSION@        \
-     "package require tdom; \
--     [list load [file join $dir @PKG_LIB_FILE@] tnc]"
-+     [list load @PKG_LIB_FILE@ tnc]"
---- extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -160,7 +160,7 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)
- CONFIG_CLEAN_FILES = Makefile
- 
- CPPFLAGS	= @CPPFLAGS@
--LIBS		= @PKG_LIBS@ @LIBS@
-+LIBS		= @PKG_LIBS@ @LIBS@ -L../../unix/
- AR		= @AR@
- CFLAGS		= @CFLAGS@
- COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2.patch b/dev-tcltk/tdom/files/tdom-0.8.2.patch
deleted file mode 100644
index 73af7c60e141..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
---- Makefile.in
-+++ Makefile.in
-@@ -307,7 +307,7 @@
- 
- pkgIndex.tcl-hand:
- 	@(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION)\
--	"load [list [file join $$dir $(PKG_LIB_FILE)]];\
-+	"load $(PKG_LIB_FILE);\
-          source [list [file join $$dir tdom.tcl]]"'\
- 	) > pkgIndex.tcl
- 
-@@ -385,29 +385,30 @@
- #========================================================================
- 
- install-lib-binaries: binaries
--	@mkdir -p $(DESTDIR)$(pkglibdir)
-+	@mkdir -p $(DESTDIR)$(libdir)
- 	@list='$(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- 	    if test "x$$stub" = "xstub"; then \
--		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- 	    else \
--		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	    fi; \
- 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
- 	    if test "x$$ext" = "xdll"; then \
- 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- 		if test -f $$lib; then \
--		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
--	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- 		fi; \
- 	    fi; \
- 	  fi; \
- 	done
-+	@mkdir -p $(DESTDIR)$(pkglibdir)
- 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    destp=`basename $$p`; \
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
deleted file mode 100644
index 818850bd8eee..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 8e634f2..d9999cf 100644
---- a/configure.in
-+++ b/configure.in
-@@ -72,6 +72,7 @@ AC_CHECK_FUNCS(memmove bcopy)
- #--------------------------------------------------------------------
- 
- TDOM_PATH_AOLSERVER
-+TDOM_PATH_EXPAT
- 
- #-----------------------------------------------------------------------
- # __CHANGE__
-@@ -83,10 +84,7 @@ TDOM_PATH_AOLSERVER
- # and PKG_TCL_SOURCES.
- #-----------------------------------------------------------------------
- 
--TEA_ADD_SOURCES([expat/xmlrole.c     \
--                 expat/xmltok.c      \
--                 expat/xmlparse.c    \
--                 generic/xmlsimple.c \
-+TEA_ADD_SOURCES([generic/xmlsimple.c \
-                  generic/utf8conv.c  \
-                  generic/dom.c       \
-                  generic/domhtml.c   \
-@@ -99,7 +97,7 @@ TEA_ADD_SOURCES([expat/xmlrole.c     \
-                  generic/tclexpat.c  \
-                  generic/tdomStubInit.c])
- TEA_ADD_HEADERS([generic/tdom.h])
--TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
-+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
- TEA_ADD_LIBS([${AOL_LIBS}])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
-diff --git a/tdom.m4 b/tdom.m4
-index f5ecd98..fcab883 100644
---- a/tdom.m4
-+++ b/tdom.m4
-@@ -216,6 +216,46 @@ AC_DEFUN(TDOM_PATH_AOLSERVER, [
-     fi
- ])
- 
-+
-+AC_DEFUN(TDOM_PATH_EXPAT, [
-+    AC_MSG_CHECKING([for expat])
-+    AC_ARG_WITH(expat, 
-+        AC_HELP_STRING([--with-expat],
-+            [directory with expat installation]), , [with_expat=no])
-+
-+    AC_CACHE_VAL(ac_cv_c_expat,[
-+    case $with_expat in
-+	no) ;;
-+	yes)
-+	    for f in /usr/local /usr; do
-+	        if test -f "$f/include/expat.h" ; then
-+		    ac_cv_c_expat=`(cd $f; pwd)`
-+		    break
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    if test -f "$with_expat/include/expat.h"; then
-+		ac_cv_c_expat=`(cd $with_expat; pwd)`
-+	    else
-+        	AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
-+	    fi
-+    esac
-+    ])
-+    if test x"${ac_cv_c_expat}" = x ; then
-+        AC_MSG_RESULT([using local copy])
-+	TEA_ADD_SOURCES([expat/xmlrole.c     \
-+                 	 expat/xmltok.c      \
-+	                 expat/xmlparse.c])
-+	TEA_ADD_INCLUDES([-I${srcdir}/expat])
-+    else
-+        AC_MSG_RESULT([${ac_cv_c_expat}])
-+	TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
-+	TEA_ADD_LIBS([-lexpat])
-+    fi
-+])
-+
-+
- #------------------------------------------------------------------------
- # TDOM_PATH_CONFIG --
- #
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
deleted file mode 100644
index f742f6e7f5a1..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d995328..5c17e11 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -108,7 +108,7 @@ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
- CFLAGS_WARNING	= @CFLAGS_WARNING@
- CLEANFILES	= @CLEANFILES@
- EXEEXT		= @EXEEXT@
--LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
-+LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname,libtdom$(PACKAGE_VERSION).so
- MAKE_LIB	= @MAKE_LIB@
- MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
- MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
-diff --git a/extensions/tnc/Makefile.in b/extensions/tnc/Makefile.in
-index f8a332c..01e0ef0 100644
---- a/extensions/tnc/Makefile.in
-+++ b/extensions/tnc/Makefile.in
-@@ -98,7 +98,7 @@ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
- CFLAGS_WARNING	= @CFLAGS_WARNING@
- CLEANFILES	= @CLEANFILES@
- EXEEXT		= @EXEEXT@
--LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
-+LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname,libtnc$(PACKAGE_VERSION).so
- MAKE_LIB	= @MAKE_LIB@
- MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
- MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
deleted file mode 100644
index 5a805931ca31..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
- generic/tcldom.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/generic/tcldom.c b/generic/tcldom.c
-index 91d98c9..0f024b3 100644
---- a/generic/tcldom.c
-+++ b/generic/tcldom.c
-@@ -5933,8 +5933,13 @@ int tcldom_EvalLocked (
-     ret = Tcl_EvalObj(interp, objv[2]);
-     if (ret == TCL_ERROR) {
-         char msg[64 + TCL_INTEGER_SPACE];
-+    #if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
-         sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
-                 Tcl_GetString(objv[1]), interp->errorLine);
-+    #else
-+        sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
-+                Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
-+    #endif
-         Tcl_AddErrorInfo(interp, msg);
-     }
- 
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
deleted file mode 100644
index ed89bad9d1e5..000000000000
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="tDOM-${PV}"
-
-DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
-HOMEPAGE="https://tdom.github.com/"
-#SRC_URI="https://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
-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-linux ~x86-linux"
-IUSE="static-libs threads"
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-libs/expat"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/"${PN}-0.8.2.patch
-	"${FILESDIR}/"${P}-soname.patch
-	"${FILESDIR}/"${P}-expat.patch
-	"${FILESDIR}/"${PN}-0.8.2-tnc.patch
-	"${FILESDIR}/"${P}-tcl8.6.patch
-	)
-
-src_prepare() {
-	tc-export AR
-	append-libs -lm
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-pipe::g' \
-		-e 's:-fomit-frame-pointer::g' \
-		-e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \
-		-i {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable threads)
-		--enable-shared
-		--disable-tdomalloc
-		--with-expat
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs}
-	cd "${S}"/extensions/tdomhtml &&	econf ${myeconfargs}
-	cd "${S}"/extensions/tnc && econf ${myeconfargs}
-}
-
-src_compile() {
-	local dir
-
-	for dir in "${S}"/unix "${S}"/extensions/tnc; do
-		pushd ${dir} > /dev/null
-			emake
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local dir
-
-	dodoc CHANGES ChangeLog README*
-
-	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
-		pushd ${dir} > /dev/null
-			emake DESTDIR="${D}" install
-		popd > /dev/null
-	done
-
-	if ! use static-libs; then
-		einfo "Removing static libs ..."
-		rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
-	fi
-}
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 2a2c41d9b9ff..d97f40d5074f 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P="tDOM-${PV}"
 
@@ -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 ppc64 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/tix/Manifest b/dev-tcltk/tix/Manifest
index 1bf79feb8bc0..b7080a7243fa 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 1331 BLAKE2B 4780edd771e608187f6e1c3d452e97b829fa5f145ec7cd8e7a929e2da431131e703a84ebf7e8278439bbb5ef009fa16996e08db9e30d0a1ad29c32c72228d1df SHA512 e82a9a530824a1b11e479c245118aa356fb729ad507688437817e23f3e56e9efd7da7dc55839db8962e6ca1acd41a682cbe67a88c7064be0a6d627a505adeb5b
+EBUILD tix-8.4.3-r1.ebuild 1336 BLAKE2B e50194d117bb86cf116ed4143a5a9fc959d86323c43c8776a566ef08abc9d68e55f804d7fc6934e5f2a7f69c5ed37ddf82dd63ea8acad7f4e308bc0e1d0174c6 SHA512 578c8ed31b8eeb6066951c9703015900d7c17231d9f18a70b053475f6a433fa952c1a4805fd751b1926e467d66006153eb556c47262b702d97240dd2632ba1c4
 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 f7b7e623a740..6eb65605d8f3 100644
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=5
 
-inherit eutils multilib
+inherit epatch multilib
 
 MY_P="Tix${PV}"
 DESCRIPTION="A widget library for Tcl/Tk"
 HOMEPAGE="http://tix.sourceforge.net/"
 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RESTRICT="test"
 
@@ -28,9 +27,11 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	[[ ${CHOST} == *-darwin* ]] || epatch "${FILESDIR}"/${P}-link.patch
+
 	sed \
 		-e 's:-Os::g' \
 		-i configure tclconfig/tcl.m4 || die
+
 	epatch \
 		"${FILESDIR}"/${P}-tcl8.5.patch \
 		"${FILESDIR}"/${P}-tcl8.6.patch
@@ -45,11 +46,12 @@ src_configure() {
 src_install() {
 	default
 
-	# Bug 168897
+	# Bug #168897
 	doheader generic/tix.h
-	# Bug 201138
+
+	# Bug #201138
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib
+		mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib || die
 		dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib
 	else
 		dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
index b09c2f151e92..84ad1c91ecb9 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1,5 +1,5 @@
 DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
 DIST tkcon-2.7.3.tar.gz 278421 BLAKE2B 67e4f2d441808f26f46a08423e278fbd219cd02ad63e05de2608521066e75a041cba055296628a5b800fec516e6f26994fec413a9baf10c34aa309e04a2a9477 SHA512 2cad55d861059bd615a2084a796e99c7654ad40e50bdb209b4e4bcb36a6051dc9ac101fbd09cc29f9582ef02254c1730297eefc8e8d426c25dd25f4590e6aa25
-EBUILD tkcon-2.5-r1.ebuild 741 BLAKE2B cb3a8805e2dc72aa954eb2dc8d05f5eabf34d2f1be21d7aa42d9c94bff74c7d4bcf7443346d5bca7a11069d05600c712af6f13e82c1f04ef94c6b3d4f8b85413 SHA512 9d335b762625038b0c21bf949ecb8d5c7566970639adde82f63bd6040cb9f11db5692f2b3e1bc04eab3f6eec98836930a0ce3af5e8823de02893f774c2640168
+EBUILD tkcon-2.5-r1.ebuild 734 BLAKE2B 34c5c6ef038793bb874a5780df88f6b06feef65a9b4bc72b4b3c75e4d7f20369dbcb634fac218cdc66f8bd97de2585842b928cfa8753a2135f732a52a68e00c6 SHA512 41fb471103494ae1c34bace7969d958179775b3b4534b85c6c7a10b70c5c96c6691bd5a46906ce64478328d71e767f927a6309b9caeadd68f6a1f10c743cd320
 EBUILD tkcon-2.7.3.ebuild 774 BLAKE2B 9c41e0bad397d7526e97a353db780b24a45c39920a89dbe0c13d22aeb3806c6618524116d5e369f17f0622f262c8f7ec1a57c7a6933061be4d6ce81c8de1a31f SHA512 9a9cd1e83f36e71e22294461e9b4f922cb6e5b18b6b52af2daaeb2e66da42e2fd216c8160bb0574d9f1ec5be6e882c3bd44613c15514a8df105103201c117cb4
 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
index cbc35d044200..130ce72a6962 100644
--- a/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild
+++ b/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils multilib
+inherit multilib
 
 DESCRIPTION="Tk GUI console"
 HOMEPAGE="http://tkcon.sourceforge.net/"
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index a00103335b09..848a26ca137b 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -7,8 +7,8 @@ DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439
 DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318 SHA512 013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-EBUILD tkimg-1.4.11.ebuild 2040 BLAKE2B 0aa72930dddd9f8bb41490f9e633e6d20ea4f655ca86930e1d1200c517c179e3a3fac1476a6ed069be8588a41d996c28e5957f94ddd442a74b37eca51332c7c9 SHA512 9d095f694a63b675813170fa41a5fd3f7392d4284a5d08863220656e85254782f7285029a2df4e458c6c1f566fb2141f2496ed8ff03f2b1a04c6ac41f5668e97
-EBUILD tkimg-1.4.12.ebuild 2075 BLAKE2B 902cd22755c6fc14c05bdc1ce01a509ea3185a31391a620016a96b8b23794dd3c08acadcc2958f53acba0d7f43448c8f736f670271e154a249d243c8a1bb81bb SHA512 a4336e504dfdc922aad81d305a8fa41c1eec82caf1733996f3be640cf1dbf90124437c5caedae1e23914d2bc906e4ca9328d917dbc94104f33e295ce70d95ee5
-EBUILD tkimg-1.4.13.ebuild 1941 BLAKE2B ef194efb017783ac70b19a18c9ef30f0ebde7c9f542ccb258acdd85a69c84c16944f0710201a55a88be0fab88f2c14a2cd7f0a764d45e0ec3068e9e74ee863dc SHA512 66a0fc6321572ace5f2f19da9a0491b5306220f77506c3f15ab2eaa0df5160078257282fbfd615c4bd81b3493227a4c2638eaef8b331b07f5f09cf1b55d09413
-EBUILD tkimg-1.4.9.ebuild 2284 BLAKE2B afb3a90524a9e655b0fc2f11bc484745a1cf6209e135895d46241d085b01ab60b36a6e5e754c57f65d203b3b7f70ab4bc7861aeb17428e8c1c31a7f8834450f2 SHA512 4ac3f4de5890a65af0cbec4271dec9a71055d2d61e645e36437b0b24de492dee32b53b2c279f83a1829f67b20e6d22b424482a301542444542b0693db34ef915
+EBUILD tkimg-1.4.11.ebuild 2055 BLAKE2B eea4923baabc82848104c8af84e4dbd80ac2d508be41a6dc9af78a0304de4a2736ad41d7c389c41f0f91b598782c5abaf8ee0e99c1a3f610e93a407c1419934f SHA512 55c051e56561503282d3a3f4c5a49c25be7ead727b937c55e31395b83ac5dc33f7bde64b4566b9effc9be793b017041c4a207a7dd49f2fa0a5dd5ac0c32e1aff
+EBUILD tkimg-1.4.12.ebuild 2095 BLAKE2B 64510985af5bb5e0977014f3dfb1e58c19a5a3b0971a5b03383a57c868c286e54d8e687e721d0bab82f66217a4f50e30f97d3451e79e7599378bb7192884d7a2 SHA512 a22bb599ca479c09e6fbc94ba4cec529bb04ade65092eb520b620ede9bf0e0ce690aa08aa0cff3c85e90c932bd4d4200823bf933a4828a8a42d03782aaf13e03
+EBUILD tkimg-1.4.13.ebuild 1949 BLAKE2B 2ca89bc7b69a914a8735b4fed3a8c59a9d48293f58f84fcbfe4e9f9f2f5373964b581681d179179ed0a533db6878723baa4a0230b909773504cd919f3767f3b2 SHA512 853b1400a07b66d2c1580ca865ac53f0da6ada6b5614e66f962b0bd4a7f14ba1a10e86ca6cdebd70599837cd094cb27d84b78344ffb0bf77b20e987d273e5776
+EBUILD tkimg-1.4.9.ebuild 2298 BLAKE2B acc3214510eab844afb5d23362ff5996aa97701473171b11d0eb8637f62d8a840b5dfa7235b03629d63bb69227acb4c4d4f0b3072dd88032345acbf7bf04dbd0 SHA512 5256febc7a24ac5f3246c1453f892d567520d9b878ef1802c8fca0591dbef85c00d515e537dc3c0b809228c62fbbc71fa33a62fc867d6c301400479964515ecb
 MISC metadata.xml 328 BLAKE2B 1c2b4dff486d257a50839ff54238b77348694269a1ddd0e24f80a83ea1bbb7661dba26981d24fa299c9252ae4544c438fab85f28f13fe98a66b97d70c784c1e0 SHA512 8c91b67342dfb72a4e464e51213b04064cac7862f9d78283985096aa1a83135ce50647813599591a46b5ea79eecc52238af0d5d7f223bc61bb58b94e0da54089
diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
index 674cef238a5d..8d8832a91336 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -51,15 +52,17 @@ src_prepare() {
 		libtiff/tifftclStubInit.c \
 		tiff/tiff.c \
 		jpeg/jpeg.c
+
 	default
-	find . -name configure -delete
 
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+	find . -name configure -delete || die
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
 
 	eautoreconf
+
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; eautoreconf)
+		(cd ${dir}; eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -80,7 +83,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
index 397231bc70a0..68c860a32fa1 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -50,15 +51,19 @@ src_prepare() {
 		libtiff/tifftclStubInit.c \
 		tiff/tiff.c \
 		jpeg/jpeg.c
+
 	default
-	find compat/libtiff/config -name ltmain.sh -delete
+
+	find compat/libtiff/config -name ltmain.sh -delete || die
 
 	#rm -r compat/{libjpeg,libpng,zlib} || die
 
 	eautoreconf
+
+	local dir
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
+		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -83,7 +88,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index 2ca0ab7549aa..feba8d5b635d 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -44,8 +45,10 @@ src_prepare() {
 		zlib/zlibtclDecls.h \
 		libpng/pngtclDecls.h \
 		libtiff/tifftclDecls.h
+
 	default
-	find compat/libtiff/config -name ltmain.sh -delete
+
+	find compat/libtiff/config -name ltmain.sh -delete || die
 	sed -i \
 		-e 's:"--with-CC=$TIFFCC"::' \
 		libtiff/configure.ac || die
@@ -53,7 +56,7 @@ src_prepare() {
 	eautoreconf
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
+		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -78,7 +81,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index 666a9ea98036..f4ada05bc3e3 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -59,15 +60,16 @@ src_prepare() {
 		libtiff/tifftclStubInit.c \
 		tiff/tiff.c \
 		jpeg/jpeg.c
+
 	default
-	find . -name configure -delete
 
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+	find . -name configure -delete || die
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
 
 	eautoreconf
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; eautoreconf)
+		(cd ${dir}; eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -88,7 +90,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tktray/Manifest b/dev-tcltk/tktray/Manifest
index 15eb2a9f43c2..c016ade5e594 100644
--- a/dev-tcltk/tktray/Manifest
+++ b/dev-tcltk/tktray/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1-ldflags.patch 371 BLAKE2B a18964ab4a2bcc1e7d3af98a76bb20a0a0993689d353a07b7c8f8296ee956755d3e51f9e7557a362a7bbc51604db3c7b73cb96ecc3c6ac350f313a51d53dbac5 SHA512 d29c06676607eca5fb7a0a0675382a80441117a5a070236329d8f4e8c046a5ade060d7e618740953f4c4c87f432fd661a19e201b737b4273805a48bd0165f553
 DIST tktray1.3.9.tar.gz 134484 BLAKE2B 9edeae9869dc318cd0f98c6585fdef5d903f84f8d32ad0a29fc456ab0eb38615684f7da8a8eb4022c9c40ec24a623c7a189f50d9e17bcbd0a204459e2030b546 SHA512 2c52a343e7f8ff5b7e7bb2e2f1de7766111ce6b47b8ace478a1f2aaa6c28a5b19ec854f2b22511136be1f1da2a87f506932a1d1b893deb3c44a7e47a28609518
-EBUILD tktray-1.3.9.ebuild 796 BLAKE2B 1f4ef837187d33a1aaf9238e776fd2cdb6b920c8e5c9af4cb72dd57fea4b5680795e9012f76c23596aac29f19dc0b45d19c64816138edd14765f2531882c1486 SHA512 467d2ac7acb5d536bbeeea1f515c3d4b16d007ab9ecb379a808ae79eca96de1c317103b2b8ec3450ae99ffb4c14c33cf3bbdfa85f8993f2b0dc2069c85a9fd4c
+EBUILD tktray-1.3.9.ebuild 768 BLAKE2B 7cd40b26ac07c5d8be2f9d639b536d2b02a1ad5b54e3f204cdca30967515aa7b68f8d95d79f0ae97214eac0b854d1f4bed2c501569aafe4c75ba22bf659e1d90 SHA512 8e675f664da1f60505141d3fa91b8ae86cdecff970d56ce8c6ab9fa1865a29bb51263e4cddddf3f0c2745d9e29147c3349e272cb603930075d1e6e8fc5058c1e
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tktray/tktray-1.3.9.ebuild b/dev-tcltk/tktray/tktray-1.3.9.ebuild
index 3cb9eb4b38ab..cdfa53b8e127 100644
--- a/dev-tcltk/tktray/tktray-1.3.9.ebuild
+++ b/dev-tcltk/tktray/tktray-1.3.9.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils virtualx
-
-MY_P="${PN}${PV}"
+EAPI=7
 
 DESCRIPTION="System Tray Icon Support for Tk on X11"
 HOMEPAGE="https://code.google.com/p/tktray/"
-SRC_URI="https://tktray.googlecode.com/files/${MY_P}.tar.gz"
+SRC_URI="https://tktray.googlecode.com/files/${PN}${PV}.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="tcltk"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="debug threads test"
-RESTRICT="!test? ( test )"
+IUSE="debug threads"
+
+# tests need actual X server with user interaction, bug #284919
+RESTRICT="test"
 
 DEPEND="
 	>=dev-lang/tcl-8.4:0=
@@ -23,11 +22,7 @@ DEPEND="
 	x11-libs/libXext"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.1-ldflags.patch
-}
+PATCHES=( "${FILESDIR}"/1.1-ldflags.patch )
 
 src_configure() {
 	source /usr/lib/tclConfig.sh
@@ -36,7 +31,3 @@ src_configure() {
 		$(use_enable debug symbols) \
 		$(use_enable threads)
 }
-
-src_test() {
-	Xemake
-}
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index b93d58265dd6..900b6430d57b 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -1,6 +1,6 @@
 AUX tls-1.7.22-ldflags.patch 363 BLAKE2B b0b7fab12ed59f37ae538190b1988badb3ea3eb81ec7ba39ea2ada2712e706e3959d289406790e10ebfb3b6ab605a576c55874002f713872f5770db157805fc6 SHA512 8324a79ab059bad1db960ba320e1bfdd6cfeea7f2a52fa596dcb7ced9aec72e7e7ff72ef26226e7f33595cad86b2838b85985711420804f6209bbccc6f0a3051
 DIST tcltls-1.7.16.tar.gz 166439 BLAKE2B 855b61bf21e7635fc9c53838037136586552261bb0c3b4c4a52638e99358f418a2c0d606b5fb130e32004e3a34c80afea25be16f068ffb499d6636309e4ae2a3 SHA512 f63b885dbfaec5d9ae811c126bd0ff253787effd7b053282b9ee566e9fae54df940bc058a6c3dd22e31fcb9ec6ae1b286aa40efd69c3f01f5a3014aada730ab1
 DIST tcltls-1.7.22.tar.gz 165206 BLAKE2B 351a5ee6a50174db8b13c9232a617aa90480550520771004c318c063b7c9703cdf969c7d12c56c54483bce5d08a9b48c04906d2be3ef9e3de0ab74c5dac68346 SHA512 28c76a6e7333b6ed1d83234691d61c9e71a59d0a6a28182fc0f50e97cae7b54da63ac76527e3b16087f3eab0b9cfe19bad02362e485d0cf378724de534805e99
-EBUILD tls-1.7.16.ebuild 905 BLAKE2B f17482d52136346978feba421b0fd6f9e51c8f9c287f8a4331cc702c79101d338a1786285addb5ad61eb0c662b6e225d9e165ab284676030dd6f54604ff56f65 SHA512 b75ae0792da1e72be4c1c9751299c694d8d7dc5f3f52474e65fce661a69fd75b4bd70113bbb397dc0c6a9e9340eb10d3d2ff40b462d01ee18421b78a5509fb56
-EBUILD tls-1.7.22.ebuild 1007 BLAKE2B 7c47f238663c983065440860139457b87f739573bd0c9602db4978710af5237b5836b726a0b79fbb1620ab95102491710932df6bcb10d4a4fea8e9325a715825 SHA512 ffc1ff0387fafac56756d67c5ab81b4b627a3e6dd0598949fcc234a616854f8f7798fc63696e21e43145d3fb03ce1c9f64273cf413d708c6ff7cb2dfd7869acd
+EBUILD tls-1.7.16.ebuild 889 BLAKE2B 251b09dfc5216f037ba9957a5c1d8037bca38b4fcdba102177393ae81eb078b2bc13e607930b51d99a15834ba9a13c0fc819eb6e6d7d95bbf93dd335c5af4e3c SHA512 fc32d9e16ed24fe6863ca97f24c5f6d95a77b1724e3be19f766779bb931fcf56cd80c93ed0bc749f1bc6fa22a85bcfb9cdd87e0600a803775175969c78c0c273
+EBUILD tls-1.7.22.ebuild 1006 BLAKE2B d9c7d0fa046fb9c1da05827d18d0c4fc52bd8ba51f97d62ab7120a811a9c81d4a1aa3dcb6f10105e4f4368a3f1cc45532fff628439c61d430eba9e17f7f21ded SHA512 daed179745072bbe8d930b3f64757bb1f033c14f57c5d44692e7c8bd0812829717b8b47155d2ee89117f64fbd2f0bc27b9ca5983506ff0da7a79e78b26dc81b0
 MISC metadata.xml 326 BLAKE2B bb3ebe3febf02967373d484b0685609602c2fe4c229c52d078035c4d8d4ab011a3d5a4e72b46a4d75a4ab01e5fdb6d338c679f1b1033bc6d986f3815696c61c2 SHA512 6e3856770636152cb4cb2d2429dfba4ccdd4f82433903aa828ca23b3dbbe878546f7327a510ecdee93001c1d81dbc9c343c217d09ab08774c697a4b6fb2a0f94
diff --git a/dev-tcltk/tls/tls-1.7.16.ebuild b/dev-tcltk/tls/tls-1.7.16.ebuild
index 4f7ed2334111..6147def93ffe 100644
--- a/dev-tcltk/tls/tls-1.7.16.ebuild
+++ b/dev-tcltk/tls/tls-1.7.16.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit eutils
-
 MY_P="tcl${P}"
 
 DESCRIPTION="TLS OpenSSL extension to Tcl"
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
index 0ee3814e2b83..a023369bfec3 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tk"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-tcltk
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)