gentoo resync : 08.01.2021

38 files changed, 526 insertions, 123 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index b0c095806ae1..7448f28723d0 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 96f1dfaba6cb..4a08594b01ff 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -9,8 +9,14 @@ AUX blt-2.4z-r4-fix-makefile3.patch 509 BLAKE2B 54470814577ac56e3ec576d1d07bcaf3
 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 3529 BLAKE2B 09d8552ae9221a5e20ee9d88acd20576ab74a4833c728141c39f6328b38f987aa7e503a3ca881f8dfbf1674bf7afe730d8bf804dcb0a8b0d0ddbea6931b642e7 SHA512 87d59826b727e5953ae62ab6d09eae7e1d3991a03b2835c47893973e9f0dfa1e8ae32454cf906707d682bef45ca0f4c99b8f22ff8b5e7fa8cf5ac4a3cb663913
-EBUILD blt-2.4z-r14.ebuild 3583 BLAKE2B e23961628c3b43d944b62f8b1bcd19adbbbf59d03a312d26ec4ddef0e4a58158beafa134957633dd4c2c6184c6f1b04feb80a1912701a7aebd6630c1773bbc1d SHA512 4b2b212b00bfd7aa66d8027024cbbdf268c25062b2d905c1eaf434086765b6ad08b99007bba2a61d9d80eb327c21cfae4a4d0dc281390b07fd9ce8eeee651c2d
+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
 MISC metadata.xml 336 BLAKE2B 42e123497016c3cffffc99cd56d04cf37bc81ad11487a39a97f1200df91edfb8d2c359ef76a3be83d4682cc6e2ba2695fd460af1de06d8f15b0932dd1f3ad211 SHA512 32593908c71225b7869b03d96dde6b7ed0d3db25f921257cf5027c80830cca794d0ed30b73c3189edd34553d6766ae57daf8caceb106bc49398fb519fd95d28c
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index 838b0f64ea7f..2e633acc10a5 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.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=5
@@ -18,7 +18,7 @@ SRC_URI="
 IUSE="jpeg static-libs X"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tcltk/blt/blt-2.4z-r14.ebuild b/dev-tcltk/blt/blt-2.4z-r14.ebuild
index 5fe84228912e..6e956a11ef6a 100644
--- a/dev-tcltk/blt/blt-2.4z-r14.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 IUSE="jpeg static-libs X"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tcltk/blt/blt-2.5.3-r1.ebuild b/dev-tcltk/blt/blt-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..0374098be13b
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.5.3-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYP=${PN}$(ver_cut 1-2)
+SHVER=$(ver_rs 1 '' $(ver_cut 1-2))
+
+inherit autotools flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+HOMEPAGE="https://sourceforge.net/projects/wize/"
+SRC_URI="mirror://sourceforge/wize/${PN}-src-${PV}.zip
+	https://dev.gentoo.org/~tupone/distfiles/${P}-debian-patches.tar.gz"
+
+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"
+
+DEPEND="
+	dev-lang/tk:0=
+	jpeg? ( virtual/jpeg:0= )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"/${MYP}
+
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+	"${WORKDIR}"/patches/02-debian-all.patch
+	"${WORKDIR}"/patches/03-fedora-patch-2.patch
+	"${WORKDIR}"/patches/04-fedora-tk8.5.6.patch
+	"${WORKDIR}"/patches/05-tk8.5-zoomstack.patch
+	"${WORKDIR}"/patches/doc-typos.patch
+	"${WORKDIR}"/patches/tcl8.6.patch
+	"${WORKDIR}"/patches/tk8.6.patch
+	"${WORKDIR}"/patches/install.patch
+	"${WORKDIR}"/patches/usetclint.patch
+	"${WORKDIR}"/patches/usetkint.patch
+	"${WORKDIR}"/patches/table.patch
+	"${WORKDIR}"/patches/ldflags.patch
+	"${WORKDIR}"/patches/pkgindex.patch
+	"${WORKDIR}"/patches/decls.patch
+	"${WORKDIR}"/patches/bltnsutil.patch
+	"${WORKDIR}"/patches/blthash.patch
+	"${WORKDIR}"/patches/const.patch
+	"${WORKDIR}"/patches/uninitialized.patch
+	"${WORKDIR}"/patches/unused.patch
+	"${WORKDIR}"/patches/pointertoint.patch
+	"${WORKDIR}"/patches/autoreconf.patch
+	"${WORKDIR}"/patches/switch.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/${P}-gbsd.patch
+)
+
+src_prepare() {
+	default
+	rm acconfig.h || die
+	# 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' \
+		-i configure.in || 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 generic/Makefile.in || die
+
+	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-cflags="${CFLAGS}" \
+		--with-gnu-ld \
+		$(use_enable jpeg) \
+		$(use_with X x) \
+		CC="$(tc-getCC)"
+}
+
+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)/${MYP}/demos/bitmaps \
+		/usr/share/man/mann \
+		/usr/include
+
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc NEWS PROBLEMS README
+	docinto html
+	dodoc 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 libBLT${SHVER}$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
+	dosym libBLTlite${SHVER}$(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/files/blt-2.5.3-darwin.patch b/dev-tcltk/blt/files/blt-2.5.3-darwin.patch
new file mode 100644
index 000000000000..11524c2e74dd
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.5.3-darwin.patch
@@ -0,0 +1,36 @@
+--- a/configure.in
++++ b/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"
diff --git a/dev-tcltk/blt/files/blt-2.5.3-gbsd.patch b/dev-tcltk/blt/files/blt-2.5.3-gbsd.patch
new file mode 100644
index 000000000000..4449ad374468
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.5.3-gbsd.patch
@@ -0,0 +1,24 @@
+--- a/configure.in	2012-05-06 18:11:47.000000000 -0400
++++ b/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.5.3-gentoo.patch b/dev-tcltk/blt/files/blt-2.5.3-gentoo.patch
new file mode 100644
index 000000000000..3372b83a733b
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.5.3-gentoo.patch
@@ -0,0 +1,45 @@
+--- a/configure.in	2021-01-03 20:59:43.337589407 +0100
++++ b/configure.in	2021-01-03 21:00:48.936539537 +0100
+@@ -56,10 +56,6 @@
+   blt_enable_jpeg=$enableval ])
+ AC_ARG_ENABLE(cygwin,	[  --enable-cygwin         Use cygwin Tcl/Tk libraries. Requires cygwin1.dll], [
+   blt_enable_cygwin=$enableval ])
+-AC_ARG_WITH(cc,		[  --with-cc=CC            Set C compiler to CC], [
+-  blt_with_cc=$with_cc 
+-  unset ac_cv_prog_CC
+-  unset ac_cv_prog_CPP ])
+ AC_ARG_WITH(cflags,	[  --with-cflags=FLAGS     Set compiler flags to FLAGS],
+   blt_with_cflags="$with_cflags")
+ AC_ARG_WITH(gnu_ld,	[  --with-gnu-ld           Use GNU linker],
+@@ -96,22 +92,7 @@
+ #
+ 
+ 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
+ 
+ case $target in
+   *-*-cygwin*|*-*-mingw*)
+@@ -125,7 +106,6 @@
+ 
+ unset blt_cv_prog_cc
+ AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
+-AC_SUBST(CC)
+ AC_PROG_CPP
+ AS_IF([test "x${GCC}" != "x"],[
+   blt_have_gcc="yes"
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 65465241ed2c..100e8639397a 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 2307 BLAKE2B ffe7842ef608d55bf017a7d18becf9e1f82b453d1eb3ebba1c807bdb965d59eb46e3f05176ee39d10555d1bba70c26292e4b97dc105fb408126b99f935e339cd SHA512 1263d3d432458efe89e140db9bf046e1740486f6e4dd5d33e1ee87189bae8a1de91400bff2470b44514cd4510072ad13618cc4e9ffe4299d314cd2b00ebd38a2
+EBUILD expect-5.45.4.ebuild 2296 BLAKE2B a41c0429fd4a3ca95e5880c3ebdb8369ed3dd19503845e247a694e3c8cfc39041c9f6be6e47530a030163c8cdae4b175644aafef272538c6102e952917ab262c SHA512 c51bec660db71450d509207463b1992d29bda835bc385253eb424ccd887ec5b52cca0de6feecc6eb0e8509649c0a10ca775359a4d50af48abbde2d6cc402acf5
 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 acfa37275e57..77ad3b8dd295 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.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=6
@@ -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 ~x86-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 bf62f11bf3c9..6f36b09a1baa 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -2,8 +2,8 @@ DIST itcl3.4.1.tar.gz 263316 BLAKE2B ba4a94d2dfe80b095e754d01036b189130918d7f297
 DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itcl4.2.0.tar.gz 428635 BLAKE2B 38898f3377583115eed3b4d5a8a610e0d0a515a1e4852fe3cea04eea68fe64f158bc79d7d5f3041831f97e5e28cee5a67721a187ed5cfbaa33c69e4668b55f31 SHA512 42d13d7f4f841bff49c508fe5d17c12e81b7e381db470d7db658c925b6e609a0821953aa8344764633a3b996eb5757aaae7014df13f4e38ade2dd7aa068ba385
-EBUILD itcl-3.4.1.ebuild 1030 BLAKE2B 57dcbd85085b50806e920c10cc5806504be27703da7f43ccbc880cd3147795f6841ab0012da4b6f5c019e0ecc30c63ba3f2522a721294c4815720db406f267cf SHA512 620f2069331b2aebb967fe12399261af6c57cc1781d5abb5e0007d6eb26709a45f4b3f1e675880acbc25c560ccff04ec79e634ff22b9a8ecc6fd02953b3ccd68
-EBUILD itcl-4.0.3.ebuild 1725 BLAKE2B b2162b15a131590009a6df79661c156a68ac4411b1c0d5013063d49a372b158481a549a8366735e96cb7f8be8b24ae8ebd735d57b2630cf9d1604ba49b00f32c SHA512 2bc931013921a8275a27355ee53c2439b9f13ee56ac41df62e62a7fe768f320286392ff8aba255d1e143434685cad50e3653eaf8e78e64d33a000db761e5efa3
-EBUILD itcl-4.1.1.ebuild 1484 BLAKE2B 2e53aed2ddc216b8a6c87a0416314f31fbf652f35195117230149967afc0b164138004bd5a386383c76794c26cdca74060b932d861440e499196c6f23ff7ebbd SHA512 c3c6c4ccaec9383df8c543b89fa001ff3280ec090e55d647223d96e3ececfbad28c8624f37848edad5daf4ac959a5b34754c54272df8e713b70afbe791226d55
-EBUILD itcl-4.2.0.ebuild 1488 BLAKE2B 56d84f91e6b5f5b79ec3dbfbb96160d4a800ada3828aef9c6a35a58cf1a16b8dac23a2e153b20808b159d3966aa1666fdc339ec6b9999e282e31e1e89936fe19 SHA512 7a5b97507b81075b4774b8a387f678338aa1db9759058ce5c537f86308c2b7e9d3c7ee4b2bab8ff0201bc6952329494e3c4f2512df06a684d9adb4169b976a21
+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 1477 BLAKE2B 922385debb5809abd6ab90e602d91f8eca2a86f5129f63e2f0946f2e12a6a4b3079b20d5d1180b505e41e87f219770af8a589dc12a0360ed1818737a22d5a381 SHA512 270449c8e4f5599a75c375e44ba260e32cbd8aae67fe061635b8474f1e1cfe1f3d19ec7dcbc66440086ecd812032bcc9eed4bd2655b187e5cf5632383779b2f9
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itcl/itcl-3.4.1.ebuild b/dev-tcltk/itcl/itcl-3.4.1.ebuild
index 1c4c9912741b..76655429ee2f 100644
--- a/dev-tcltk/itcl/itcl-3.4.1.ebuild
+++ b/dev-tcltk/itcl/itcl-3.4.1.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_c
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="<dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itcl/itcl-4.0.3.ebuild b/dev-tcltk/itcl/itcl-4.0.3.ebuild
index d2d6a458d42b..c4a648a95f81 100644
--- a/dev-tcltk/itcl/itcl-4.0.3.ebuild
+++ b/dev-tcltk/itcl/itcl-4.0.3.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=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itcl/itcl-4.1.1.ebuild b/dev-tcltk/itcl/itcl-4.1.1.ebuild
index 155a7a0da62a..4b2563cf3c04 100644
--- a/dev-tcltk/itcl/itcl-4.1.1.ebuild
+++ b/dev-tcltk/itcl/itcl-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itcl/itcl-4.2.0.ebuild b/dev-tcltk/itcl/itcl-4.2.0.ebuild
index 38092fa6313f..7f7b7147bf90 100644
--- a/dev-tcltk/itcl/itcl-4.2.0.ebuild
+++ b/dev-tcltk/itcl/itcl-4.2.0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 78e7f00909f3..11f0f298b20c 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 2507 BLAKE2B 48c33749e6bdb887362d82253fd877ffdcc8011799882f05a29befe622b1e34f0a361ac56b7df275c0df2937487735a299ac1fc5a4f20a0fda1b1aa2d1425f91 SHA512 19d63b64e71676c4d9aeccc39d1c91438461e9127f326343b18ec5bac0c376d0aa804b05877ed87f222c4853722c12f08c04dfac58b7f0698d233164164f7df0
+EBUILD snack-2.2.10-r9.ebuild 2496 BLAKE2B 903eb9a04a30acec064ff220c1447a51bd2838fb1d77eefc1ad459b9a46b549da587fbc2695455d7fea67b94c783d77f8f509465c5a27a89f00af4f4e702d912 SHA512 94b0638d58738738bf0f676338e390084e314613635c4b525c651df105b6a9875b150894d270c6d3667af1b80e34195877c85bc29db8a007f597c04607565cf1
 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 8297792447d7..b4da7e9d7daa 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.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
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index ee16b960c052..2e07db095b88 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,7 +1,4 @@
-AUX tcllib-1.19-test.patch 501 BLAKE2B 141beca1582b3fef5a632ff807b86a437883de236ed54b6cbfa38a85b7a5e84b520502689d7b7f04aa4f32fedc3bdb8148162f98a53ea4f15668a69c26658a4d SHA512 b0b10dfade925201a4ea67f1da0c14fb8fa9f7fbad852f38e8263dfd323d3125d807fec10d02d4fced4d07997463a1815475707259a19f32380c7cb31cbdc614
 AUX tcllib-1.20-test.patch 6599 BLAKE2B ebbbb624b0d214d6e0f9aa61b968f4133abbe8e108098bdf6d7bb726f5c8d12fe4a6a2976d4d9b0a7ef97f9787df52114f55a654b8d10aa6cd076307caa766d0 SHA512 574fead7b1b48e95c8524ea47df9e3087c0c9858cf22c1b2300d8b405a639f2b9c3ed763b8849e2bf805868138a0f044553eab48613d0df018f44d914eaf096d
-DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 DIST tcllib-1.20.tar.xz 6692664 BLAKE2B 3e70cf0d0f9e469a20e18f84238f56a53b5b8e36abcf418dc32f64c819728968d24e2999705d91d8341cb608a6bb674a063e86253cddfb51f2693a94d0e070e5 SHA512 d2c20642f91cdc7bf3b329025be80eb9288d0919fa439c2066349b52950cf3c343f39c7745b9b08ec28a884ff2f219fe0fb5f47023f1266b6a6de6ae54852412
-EBUILD tcllib-1.19.ebuild 1220 BLAKE2B 9625f34517d25d0165040c7ad5046a87ac3cb0e9004d45d4534416dd670007f2852e0bbdd671e71bb63e02c068f669e47321b39450f1cf9b4efd850caff9257c SHA512 dea46668664151b3994d2586e97d5004eb71e4d938e256368908b3004048166a3076f632f71d9b5e6471b497c0bcd140699ee80dc8c487380d5838d6d97f1513
 EBUILD tcllib-1.20.ebuild 974 BLAKE2B 977914da642c31d82a7f50f0248021eb6ae384b43e2eaf01edfda5afd9b6fbfef4f80629441871ff38d42d9c7247a7dc7aecd733bed7b38e6ef492fd9940e445 SHA512 daaafab54022af9fd26d6822fd1335ca1ddd6293400e5d0430697d872df35d6b9fb55ecccf8cb3d3a42b73c4fdda9a5399f2f0a19ffdcefba8718e9175ea32d7
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/files/tcllib-1.19-test.patch b/dev-tcltk/tcllib/files/tcllib-1.19-test.patch
deleted file mode 100644
index bdeec3fff197..000000000000
--- a/dev-tcltk/tcllib/files/tcllib-1.19-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/modules/httpd/httpd.test	2019-11-02 22:36:08.983215578 +0100
-+++ b/modules/httpd/httpd.test	2019-11-02 22:37:04.397309180 +0100
-@@ -448,15 +448,6 @@
- 
- [clock seconds]}]
- 
--test scgi-client-0005 {URL Different output with a different request} {
--set reply [::scgi::test::send 10001 {REQUEST_METHOD POST
--REQUEST_URI /time
--
--THIS ONE ALONE IS MINE}]
--
--::httpd::test::compare $reply $checkreply
--} {}
--
- set fin [open [file join $DEMOROOT pkgIndex.tcl] r]
- set checkfile [read $fin]
- close $fin
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
deleted file mode 100644
index c889ad4dbbe0..000000000000
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx
-
-DESCRIPTION="Tcl Standard Library"
-HOMEPAGE="http://www.tcl.tk/software/tcllib/"
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	dev-tcltk/tdom
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	ChangeLog DESCRIPTION.txt README-1.19.txt README.developer
-	devdoc/critcl-tcllib.txt devdoc/dirlayout_install.txt
-	devdoc/indexing.txt devdoc/installation.txt
-)
-HTML_DOCS=( devdoc/devguide.html devdoc/releaseguide.html )
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
-
-src_prepare() {
-	default
-	if has_version ">=dev-lang/tcl-8.6.9"; then
-		sed -i \
-			-e "s|::hook::call|call|" \
-			-e "s|::string::token::shell|shell|" \
-			"${S}"/modules/hook/hook.test \
-			"${S}"/modules/string/token_shell.test \
-			|| die
-	fi
-}
-
-src_test() {
-	USER= virtx emake test_batch
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		for f in $(find examples -type f); do
-			docinto $(dirname $f)
-			dodoc $f
-		done
-	fi
-}
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index 29cb22f23c65..e364e80da90d 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -2,6 +2,6 @@ AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c
 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 1125 BLAKE2B 9f9d2b64882cd603ff8c6d496f7cc58fe4c8da1f12b33edf53b5b53d3b2994b7676a68158079709719c4377a740d160aba79d2b711cd56585b62d5b0949e2795 SHA512 5877cc6fcfd3e24effcb33932bd404f29dc7061c3e2144b0f16ea2fb9172e4df040d890f0d72a81136df508ee7f24fcc425aa3a557335fd8a74f3ca147b13d79
-EBUILD tclx-8.4.4.ebuild 1040 BLAKE2B 44f0522e3fe813827dd32da2b5a8198308265980faca1cc6974a0544c1b86844a1bd8cd4218990ad46c9e4bf251f0d4b2524aae71abcbe4c374d6b7c7e99abd7 SHA512 e7df5cc891301547e8b677b2682f1b137fe4a26f81184e421fd7dc948bf9953a81972cfe00ecdb2dae0f16eb89e6f779bf7337939f91969104eeb1d673562b82
+EBUILD tclx-8.4.1.ebuild 1111 BLAKE2B b24b78469d73489a10cb7d5dcd9443383bc1b427b6b11d366e7b4e87084e6bd3ba40dd54d9fffda5f00cbe88265a04e27d78b2972f70469409e317269d381136 SHA512 35e1dc6386742852f11fdde9777c0798dde7de081e9897a30762d75bd48073ec0b66f681e74f7b0e8c15b930526e60d2d57c65ea81bb2997b118b6db622038ec
+EBUILD tclx-8.4.4.ebuild 1029 BLAKE2B 6c121b1fdcf09d2e08faf7eed4f1662baadcf0cdcb0762c74bcbe0f525e0e2ae8c3d55906544a67fb11549acd715b2ba44ab3e1d8b39390772f42ecff9dc62d2 SHA512 b830b96691d2f5686f4afe59a286e3b8d4aacfd4f5c895020fbf9e788b14ad44ce6b56d65b5c8b7b7f9c08f7a577a280865193fd1162a5727480c572fc396d25
 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
index 6ce5cc26795d..96b6c636264d 100644
--- a/dev-tcltk/tclx/tclx-8.4.1.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tclx/${PN}${PV}.tar.bz2"
 LICENSE="BSD"
 IUSE="tk threads"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-lang/tcl:0=
diff --git a/dev-tcltk/tclx/tclx-8.4.4.ebuild b/dev-tcltk/tclx/tclx-8.4.4.ebuild
index cbc91e94b9c4..3f064b644644 100644
--- a/dev-tcltk/tclx/tclx-8.4.4.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz
 LICENSE="BSD"
 IUSE="threads"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-lang/tcl:0="
 RDEPEND="${DEPEND}"
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 152de0c47700..1bf79feb8bc0 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 1349 BLAKE2B 17fe841ea665e64c7b777c3288fcedd6e1300e90eee651fb4a81fdd768bd70ab8655eb1797c489bdf4bbf2b14f0bf92c685341bbf4169b20aaf9f7324c87777c SHA512 ed64027dc91df177b385b8df974300f582925a82fd4727b99459c1f66946fcb173534448adee903bea8a4568370229a0acab6907dcceaf4f0b74bc6a14d5fffb
+EBUILD tix-8.4.3-r1.ebuild 1331 BLAKE2B 4780edd771e608187f6e1c3d452e97b829fa5f145ec7cd8e7a929e2da431131e703a84ebf7e8278439bbb5ef009fa16996e08db9e30d0a1ad29c32c72228d1df SHA512 e82a9a530824a1b11e479c245118aa356fb729ad507688437817e23f3e56e9efd7da7dc55839db8962e6ca1acd41a682cbe67a88c7064be0a6d627a505adeb5b
 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 3630468fc18e..f7b7e623a740 100644
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r1.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RESTRICT="test"
 
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	(use x86-macos || use x64-macos) || epatch "${FILESDIR}"/${P}-link.patch
+	[[ ${CHOST} == *-darwin* ]] || epatch "${FILESDIR}"/${P}-link.patch
 	sed \
 		-e 's:-Os::g' \
 		-i configure tclconfig/tcl.m4 || die
@@ -48,7 +48,7 @@ src_install() {
 	# Bug 168897
 	doheader generic/tix.h
 	# Bug 201138
-	if use x86-macos || use x64-macos; then
+	if [[ ${CHOST} == *-darwin* ]] ; then
 		mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib
 		dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib
 	else
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
index eb60e59da38b..b09c2f151e92 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1,3 +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.7.3.ebuild 774 BLAKE2B 9c41e0bad397d7526e97a353db780b24a45c39920a89dbe0c13d22aeb3806c6618524116d5e369f17f0622f262c8f7ec1a57c7a6933061be4d6ce81c8de1a31f SHA512 9a9cd1e83f36e71e22294461e9b4f922cb6e5b18b6b52af2daaeb2e66da42e2fd216c8160bb0574d9f1ec5be6e882c3bd44613c15514a8df105103201c117cb4
 MISC metadata.xml 695 BLAKE2B cb5dc622e2500fdac5984ac2e8578acc747b1f7904acddc4419658a767b9c55ce29fdaca7f56dea5496d68f815724bba106b56edaceaf422ef6ccfbc5326081e SHA512 f28fdbee5350ce1169b00081cfd326a2ed108b3f7347d5bef7365adbd6f098ea40cfb2088a3aa20d9cbd9c0bd650318119ef03db0a0a2e8bdf2aee6259544817
diff --git a/dev-tcltk/tkcon/tkcon-2.7.3.ebuild b/dev-tcltk/tkcon/tkcon-2.7.3.ebuild
new file mode 100644
index 000000000000..d0d15951af1d
--- /dev/null
+++ b/dev-tcltk/tkcon/tkcon-2.7.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tk GUI console"
+HOMEPAGE="http://tkcon.sourceforge.net/"
+SRC_URI="https://github.com/wjoye/${PN}/archive/v${PV}.tar.gz ->
+	${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:*"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	mv docs/changes.txt CHANGES
+}
+
+src_install() {
+	local tclver="$(echo 'puts $tcl_version' | tclsh)"
+	local instdir=/usr/$(get_libdir)/tcl${tclver}/${PN}$(ver_cut 1-2)
+	dodir ${instdir}
+	cp -pP pkgIndex.tcl tkcon.tcl "${D}"${instdir} || die
+	dodir /usr/bin
+	dosym ${instdir}/tkcon.tcl /usr/bin/tkcon
+	if use doc; then
+		HTML_DOCS=( docs/* )
+	fi
+	einstalldocs
+}
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index fbf8300c8756..618547838139 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,8 +1,11 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
 AUX tkimg-1.4.9-fno-common.patch 274 BLAKE2B b3b3ac5c7e849195fe7dbd6a86ad085825799144ddd05b445abe96577e41a52b50665aaf04fc08cf43a3b5d3d3b1a3a5494a59f8297f68036df4c7948d83dc90 SHA512 8599751f097914fa2757fed9599f3df08f6941c3693d4216f5dcb60a4be8bf603c4869b3f55cf12bea2752d77114c7c1cd2890de1b5635a0665a12053117712f
+DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142 SHA512 792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
+DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318 SHA512 013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 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.7.ebuild 1904 BLAKE2B faba72f6a1b921eb47c64bb6d630838a2a23e7c615ae6dd28860307382fa9dd91c65b580132765534d501a6ecee3b10975ba7a683c0eec62c73dc36b21635dbc SHA512 c6ca2c1dc26c7c986d4126521c52aa0ed8ec6129fb11ec723e6b2c982270c410e4e019ea313bcd7565d096acd97dbfcee93b27de2b8614048511811d5f78366d
-EBUILD tkimg-1.4.9.ebuild 2287 BLAKE2B 3995fe0c111a740a5cb48153b29ca4225373da502fa7276d077ccd949f9c8ed6a510c7ca576fea9399a26d79e4528f2dbea2fea014e347732a84f6dfa1c0a933 SHA512 14d0890aea67e8803cae59949366eaaeb2a48ead561bd5e66b3b2dbbeae034abfc139bc23d68a2c8cc7440ec4d62d75322c0421ae4957eef8e9defe20063dec7
+EBUILD tkimg-1.4.9.ebuild 2284 BLAKE2B afb3a90524a9e655b0fc2f11bc484745a1cf6209e135895d46241d085b01ab60b36a6e5e754c57f65d203b3b7f70ab4bc7861aeb17428e8c1c31a7f8834450f2 SHA512 4ac3f4de5890a65af0cbec4271dec9a71055d2d61e645e36437b0b24de492dee32b53b2c279f83a1829f67b20e6d22b424482a301542444542b0693db34ef915
 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
new file mode 100644
index 000000000000..674cef238a5d
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+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"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk:=
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0=
+	>=media-libs/libpng-1.6:0=
+	>=sys-libs/zlib-1.2.7:=
+	x11-libs/libX11
+	virtual/jpeg:="
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+# Fails tests
+RESTRICT="test"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=( "${WORKDIR}"/patchset-1 )
+
+src_prepare() {
+	edos2unix \
+		libjpeg/jpegtclDecls.h \
+		libjpeg/Makefile.in \
+		zlib/Makefile.in \
+		zlib/zlibtcl.decls \
+		zlib/zlibtclDecls.h \
+		libpng/Makefile.in \
+		libpng/pngtclDecls.h \
+		libtiff/Makefile.in \
+		libtiff/tifftclDecls.h \
+		libtiff/tifftclStubInit.c \
+		tiff/tiff.c \
+		jpeg/jpeg.c
+	default
+	find . -name configure -delete
+
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+	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)
+	done
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
+	fi
+
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+	if use doc; then
+		docompress -x usr/share/doc/${PF}/demo.tcl
+		dodoc demo.tcl
+		docinto html
+		dodoc -r doc/*
+	fi
+}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index e5bccdee84c1..666a9ea98036 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.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
@@ -13,7 +13,7 @@ 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"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="
diff --git a/dev-tcltk/tklib/Manifest b/dev-tcltk/tklib/Manifest
index 35cddeaa9fb8..f4f06d8b2931 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -1,5 +1,7 @@
 AUX tklib-0.6-doc.patch 447 BLAKE2B abd5a279a322ef7bbe44b8bcb0faf5729045e04903c2e152b79fbc05086dd7964bc7bc821cc527a9e39422229cb9f6b54fab2802cf32681dc7179d0aa291c664 SHA512 6848833a63898168d23b91a66052e8459b70e22dd5be9b6f938de5b3530473507ad2e65beee2258bbbf6d698d5162dd57af947fa112ccc9d2b678481679157a4
 DIST tklib-0.6.tar.bz2 5637725 BLAKE2B 9a0be896803c5e78e578d7c0b0bb38a742f29055708081dc858ea732895521c37fec35cc21ae544225409dff16d7b2cae93ddd0aa02150a4d7a2bd06e301759b SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4
+DIST tklib-0.7.tar.bz2 5967953 BLAKE2B a7f6fa366045e78043652eea983f143cac78d847ce8b69575b1f0738b1da7e90cb3566b13412521edd62bf7beb3b92a582b2e3f0e71745bd95bd95232ff7d3ad SHA512 0322611c1dea8eebebe3f8f15ec33b695b074329ce9602aeb93d04985f486237f3ce89f1c42a5c148e12ae00b51be8c889c7db77977a0cc4204ac5eaad2cfec2
 EBUILD tklib-0.6-r1.ebuild 840 BLAKE2B a04e2ad3d4343119f6f68dca41aa3051b607e65d90c7855312a0d59227fb01be0cdf815d44de6c1311b531df823ecf5c615523839bb73f1ca76b18e96d2daa9f SHA512 dcfe0a410584c73e3a5c38359ee10dc585e32802f37c4e54599131dcace206f5f0b214f0e0118a670cbeb71585e79b06f6059c7e75b419ad7fe995b06d88e461
 EBUILD tklib-0.6-r2.ebuild 912 BLAKE2B eb914913be71f2d8af5b2ff6e897023dd23a628a2e0f635d03f32bb5ac3a54151f4e8007667f8ce8fdd697f64bc3dd110260be7f6c46e91c6ad06b29eca90282 SHA512 bec22351d75c0ec70eec68bba344bb1f670ad801e1f365f9c2eb5be49deb2bc6b63f48fd1b91a636383a08b750170432302dff2f3262ea222111892887113723
+EBUILD tklib-0.7.ebuild 780 BLAKE2B a5eebeae382961e3ff10c57fbb2fc1aa4d77c988a2325879a619574e015343a4759fef673a806ba85d49646d6fbb0f92d9c7bee40dc680cd12aae30894c33658 SHA512 b81addb18ca29cb1e2a74ea14dd0654356dabab00cdee4a6acb05eed4c5b14a7db106e177b5a5523b474f89b1adc0e2ccf278fa94fac9a0cf735b2cbc9e62e99
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tklib/tklib-0.7.ebuild b/dev-tcltk/tklib/tklib-0.7.ebuild
new file mode 100644
index 000000000000..98ab8fe6a033
--- /dev/null
+++ b/dev-tcltk/tklib/tklib-0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CODE=7832035fb9249dce
+
+DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
+HOMEPAGE="http://www.tcl.tk/software/tklib"
+SRC_URI="http://core.tcl.tk/${PN}/raw/${P}.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+IUSE="doc"
+
+RDEPEND="
+	dev-lang/tk:0
+	dev-tcltk/tcllib"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	HTML_DOCS=
+	if use doc; then
+		HTML_DOCS=doc/html/*
+	fi
+	default
+	dodoc DESCRIPTION.txt
+	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
+
+	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
+	mv "${ED}"/usr/share/man/mann/menubar{,-${PN}}.n || die
+}
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index 8f43395be073..b60424d4d663 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 916 BLAKE2B 67c908e863c19264bc97eafbebfb606e3f0ea9544c1d0540b117feb229b28bd013418433ceb67fa6e1b9fbc0f2510103597e0f15b1b1246a587638c0ce835b49 SHA512 661e694d7f8cdbdeae9c3f2f53e54ba1457b96a56fbad7fee070cd134ab3102916418c9ed923ba8d404b9db3bbfd55fb471c84a23cde73e9cdf99aa7934f0b1b
-EBUILD tls-1.7.22.ebuild 1011 BLAKE2B 22e24513207851663170522108f68cbf0d1765cd1c431695c67fb328d37e93e5474b3e78db557ea6650099be9e37640892ba64c58ad61b01fc5d577b3538d5f0 SHA512 114832a9f1ee38483f11151b58f002af6c0d17d474dc09ce66d0402aaaa2c619c90a4f50fcd8c9db879f533a03cef676738950624915813763b9b1fd44555f59
+EBUILD tls-1.7.16.ebuild 905 BLAKE2B f17482d52136346978feba421b0fd6f9e51c8f9c287f8a4331cc702c79101d338a1786285addb5ad61eb0c662b6e225d9e165ab284676030dd6f54604ff56f65 SHA512 b75ae0792da1e72be4c1c9751299c694d8d7dc5f3f52474e65fce661a69fd75b4bd70113bbb397dc0c6a9e9340eb10d3d2ff40b462d01ee18421b78a5509fb56
+EBUILD tls-1.7.22.ebuild 1000 BLAKE2B fd86d1678e356dd84578f9426d7c0078f61b57c6d0ee9fae03c193f4dd59be93301f24fc5060f62006fd99473d95a81d9b67931a7370a8701fd8cbbb15c04068 SHA512 cf35d1a237cbd481b963b83e8c33150ef8f5259756cbdb69c5c9a826741d31c13d64c74fd58d773d8d583ac23896964d85183d650f4bdda567381e8623b1e991
 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 70d2a8ccae20..4f7ed2334111 100644
--- a/dev-tcltk/tls/tls-1.7.16.ebuild
+++ b/dev-tcltk/tls/tls-1.7.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tk"
 
 DEPEND="
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
index 3def4d43f9e3..cc7eacb17cb8 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.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=6
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tk"
 
 DEPEND="
diff --git a/dev-tcltk/vtcl/Manifest b/dev-tcltk/vtcl/Manifest
index b1a3c0697c78..88c89ef1e394 100644
--- a/dev-tcltk/vtcl/Manifest
+++ b/dev-tcltk/vtcl/Manifest
@@ -1,3 +1,6 @@
+AUX vtcl-1.6.1_alpha1-tk86.patch 201 BLAKE2B f9c77ee2db1cbcb5a1b1a08be906f90920f33b750aedc5d1d9ce75ebc2b3720773e8213f31995fa367a1ae7bf5bb42dacc9147ed7fb3501048f6c6c866c7a8e2 SHA512 e02be4d2d1ba3314bb476458ad6c7c82c8fe046fd27672b66234414fce08f8958a089e093e630ed5237757782dc1e7a78dc2b363856a41540c3d7ddb65739aa7
 DIST vtcl-1.6.0.tar.gz 554727 BLAKE2B abf5e9a9fbc42e8c9ab1c216f0d103fcd88c9894a73185d50b56e0c87c88e82e6f368dd3acd7339f3a1875c9cda22123e4df82f6852343da10abac330896c899 SHA512 bfc2ed114af4bee375e820e4b1e47d394a800541eb9917204ef42481a4033927c432d7d2b005d13edd086c7c91bd594908965aae512cc4af9e5654a2bfd296de
+DIST vtcl-1.6.1a1.tar.gz 599864 BLAKE2B 59c3b503cad053de5110d4a46a92803c2e513ddee300ca525382bf76f523e09f01f2680b9ca7ad8b647350c609cedea691b0e40fe028da3ecb7475d95338d60a SHA512 8c7fa1a036d9e30aff322dff2a740ca473b4fe28689b3832304ab29832162967edaf7b6e67f641f2b298c24a9ed9cd911dc6d13277cc8e20fefcacd4268b71ad
 EBUILD vtcl-1.6.0-r2.ebuild 868 BLAKE2B 58abb2091a03ac1735690cdcd03b3269079e86b0f78c00bb926bbd0af5a634b785b3a813c23ccb1bb9fc8abe693141732b632a128f19fc8fdae9d2aaf37b4b5f SHA512 c2734750d2648c7bc569d925632e5508c9f51bfa5d9e8162f7b6e7425f589155c21edb321de9405c8380aef9b19991034a8ec72455ca3db4fd3798647e65fd89
+EBUILD vtcl-1.6.1_alpha1.ebuild 1033 BLAKE2B 9452dbda999bbf59a1288c014079a2a2f146bfb8b729a1645fa87d1c822ae4a6d69dafd69c029c39c03a9704134ad157d955bee98be8d5ac88fad2b807b4beda SHA512 441bb967caf93ab0434605ddcc652c52b0caa4eac561480620ffdd2e9784b2ba2787b90b1a2bd2f9c1b80db599d7e089db0bb2017c4d9e90ea44f1ebef3048b7
 MISC metadata.xml 320 BLAKE2B fc4506f2388dd451c4b88073e6df61db8024feb95db4cd0641ab28e0264aacb2934980afa86da71304aeceaa0f5b3e7581f8351cd577efeb44718e381441334e SHA512 bc023971a766ee2e121d6f5d22bc0fe38437802957e021ef193770ba386169c344b238c79df9d5d7aa32c2bd1ac7b448c6d688580f8be4a67c1df95cc942b60c
diff --git a/dev-tcltk/vtcl/files/vtcl-1.6.1_alpha1-tk86.patch b/dev-tcltk/vtcl/files/vtcl-1.6.1_alpha1-tk86.patch
new file mode 100644
index 000000000000..ae09fe671408
--- /dev/null
+++ b/dev-tcltk/vtcl/files/vtcl-1.6.1_alpha1-tk86.patch
@@ -0,0 +1,10 @@
+--- a/configure	2021-01-06 17:35:58.921365193 +0100
++++ b/configure	2021-01-06 17:34:44.859618414 +0100
+@@ -11,6 +11,7 @@
+ ##
+ findwish( ) {
+ WISHES=" \
++	wish8.6 \
+ 	wish8.5 \
+ 	wish8.4 \
+ 	wish8.3 \
diff --git a/dev-tcltk/vtcl/vtcl-1.6.1_alpha1.ebuild b/dev-tcltk/vtcl/vtcl-1.6.1_alpha1.ebuild
new file mode 100644
index 000000000000..7d1e4a5eb8f8
--- /dev/null
+++ b/dev-tcltk/vtcl/vtcl-1.6.1_alpha1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edos2unix
+
+MYP=${PN}-${PV/_alpha/a}
+
+DESCRIPTION="Visual Tcl is a high-quality application development environment"
+HOMEPAGE="http://vtcl.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+DEPEND="dev-lang/tk:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+MY_DESTDIR=/usr/share/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-tk86.patch )
+
+src_prepare() {
+	edos2unix configure
+	default
+}
+
+src_compile() {
+	sed -i 's,^\(VTCL_HOME=\).*,\1'${MY_DESTDIR}',g' vtcl	|| die "Path fixing failed."
+	sed -i 's,package require -exact Tk ,package require Tk ,' lib/tkcon.tcl || die "Tcl8.5 patch failed"
+}
+
+src_install() {
+	dodir ${MY_DESTDIR}
+	dobin vtcl
+	cp -r ./{demo,images,lib,sample,vtcl.tcl} "${D}/${MY_DESTDIR}" || die "Data installation failed."
+	if use doc; then
+		DOCS=( ChangeLog README doc/tutorial.txt )
+		HTML_DOCS=( doc/*html )
+	fi
+	einstalldocs
+}