Updating liguros repo21.1.2

43 files changed, 566 insertions, 116 deletions

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index d11722e53bae..accc3e52a747 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1 +1,3 @@
+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
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index 993c5d06c4d2..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/bwidget/bwidget-1.9.12.ebuild b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
index c1143b0ae89c..1aee60377198 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild b/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
index 5eaed71e0307..afcc12069cda 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index 160adb01533a..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 ~m68k-mint ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-tcltk/itcl/itcl-3.4.1.ebuild b/dev-tcltk/itcl/itcl-3.4.1.ebuild
index fa8b08c493b8..8ce9868d96ad 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 91c8b9a8acee..5bd1f1cba23a 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 0054e4b0c21e..11b7b1fcfc32 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 9077b608ce72..39a39b16db46 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/itk/itk-4.0.0.ebuild b/dev-tcltk/itk/itk-4.0.0.ebuild
index 11fd7fefdd3a..7b72f4398624 100644
--- a/dev-tcltk/itk/itk-4.0.0.ebuild
+++ b/dev-tcltk/itk/itk-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-tcltk/itk/itk-4.0.1.ebuild b/dev-tcltk/itk/itk-4.0.1.ebuild
index 5b4521ec0e9b..ed692834c948 100644
--- a/dev-tcltk/itk/itk-4.0.1.ebuild
+++ b/dev-tcltk/itk/itk-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 47dbbed432db..1dc006d4d2be 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="https://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/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 17ac7ef2e826..f3fc48fbf2f1 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -67,6 +67,8 @@ src_compile() {
 		CXX="$(tc-getCXX) -c" \
 		LD="$(tc-getLD)" \
 		LDOUT="${LDFLAGS} -o" \
+		SHLIB_LD="$(tc-getCC) -shared" \
+		SHLIB_LDXX="$(tc-getCXX) -shared" \
 		${CONFIG_PLUGIN}
 }
 
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 8a4030aab8bd..1e734139f5b7 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,2 +1 @@
-DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 DIST tcllib-1.20.tar.xz 6692664 BLAKE2B 3e70cf0d0f9e469a20e18f84238f56a53b5b8e36abcf418dc32f64c819728968d24e2999705d91d8341cb608a6bb674a063e86253cddfb51f2693a94d0e070e5 SHA512 d2c20642f91cdc7bf3b329025be80eb9288d0919fa439c2066349b52950cf3c343f39c7745b9b08ec28a884ff2f219fe0fb5f47023f1266b6a6de6ae54852412
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 65788cd56872..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="https://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/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index 9ab05694f9a5..590252596704 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc 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="
@@ -30,6 +30,11 @@ HTML_DOCS=( idoc/www )
 
 PATCHES=( "${FILESDIR}"/${P}-test.patch )
 
+src_prepare() {
+	default
+	rm modules/httpd/httpd.test || die
+}
+
 src_test() {
 	USER= virtx emake test_batch
 }
diff --git a/dev-tcltk/tclx/tclx-8.4.1.ebuild b/dev-tcltk/tclx/tclx-8.4.1.ebuild
index e581d0c6ee9c..943101790822 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 1a1b0a5bfa7d..8b14ef17c3b0 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/tclxml/files/tclxml-3.2.7-bool.patch b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
new file mode 100644
index 000000000000..8d29180f0826
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
@@ -0,0 +1,26 @@
+--- a/tclxml.c	2020-12-24 16:58:20.051675497 +0100
++++ b/tclxml.c	2020-12-24 16:58:49.586185021 +0100
+@@ -20,6 +20,10 @@
+ #include <tclxslt/tclxslt.h>
+ #include <string.h>
+ 
++#ifdef bool
++#undef bool
++#endif
++
+ int Tcldom_libxml2_Init ( Tcl_Interp *interp );
+ 
+ #define TCL_DOES_STUBS \
+--- a/tclxslt-libxslt.c	2020-12-24 16:59:07.004895777 +0100
++++ b/tclxslt-libxslt.c	2020-12-24 16:59:46.280243657 +0100
+@@ -20,6 +20,10 @@
+ #include <libxslt/imports.h>
+ #include <libxslt/security.h>
+ 
++#ifdef bool
++#undef bool
++#endif
++
+ #undef TCL_STORAGE_CLASS
+ #define TCL_STORAGE_CLASS DLLEXPORT
+ 
diff --git a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
index 5dcd7ac49333..27250eb724af 100644
--- a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
@@ -28,6 +28,7 @@ RESTRICT="test"
 
 PATCHES=(
 		"${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
+		"${FILESDIR}"/${P}-bool.patch
 )
 
 src_configure() {
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
index 353d66a20f6a..ed89bad9d1e5 100644
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs threads"
 
 DEPEND="
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index c50815c49605..2a2c41d9b9ff 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://tdom.org/downloads/${P}-src.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc 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/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
index 46d6d8f9ad7e..dfb633b79870 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 158558d459e4..7f79c9a06a5b 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1 +1,2 @@
 DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
+DIST tkcon-2.7.3.tar.gz 278421 BLAKE2B 67e4f2d441808f26f46a08423e278fbd219cd02ad63e05de2608521066e75a041cba055296628a5b800fec516e6f26994fec413a9baf10c34aa309e04a2a9477 SHA512 2cad55d861059bd615a2084a796e99c7654ad40e50bdb209b4e4bcb36a6051dc9ac101fbd09cc29f9582ef02254c1730297eefc8e8d426c25dd25f4590e6aa25
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..0c6b93b075ca
--- /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="https://sourceforge.net/projects/tkcon/"
+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 83f12e9da114..0d13fffd72d4 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,3 +1,5 @@
+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
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..3348a874da1f
--- /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="https://sourceforge.net/projects/tkimg/"
+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 80ae24e94637..6f3e7fd5b4f0 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 0324259c6808..7ecc3e2a229e 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -1 +1,2 @@
 DIST tklib-0.6.tar.bz2 5637725 BLAKE2B 9a0be896803c5e78e578d7c0b0bb38a742f29055708081dc858ea732895521c37fec35cc21ae544225409dff16d7b2cae93ddd0aa02150a4d7a2bd06e301759b SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4
+DIST tklib-0.7.tar.bz2 5967953 BLAKE2B a7f6fa366045e78043652eea983f143cac78d847ce8b69575b1f0738b1da7e90cb3566b13412521edd62bf7beb3b92a582b2e3f0e71745bd95bd95232ff7d3ad SHA512 0322611c1dea8eebebe3f8f15ec33b695b074329ce9602aeb93d04985f486237f3ce89f1c42a5c148e12ae00b51be8c889c7db77977a0cc4204ac5eaad2cfec2
diff --git a/dev-tcltk/tklib/tklib-0.7.ebuild b/dev-tcltk/tklib/tklib-0.7.ebuild
new file mode 100644
index 000000000000..03ee4a769510
--- /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="https://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/files/tls-1.7.22-ldflags.patch b/dev-tcltk/tls/files/tls-1.7.22-ldflags.patch
new file mode 100644
index 000000000000..a5d8c083d315
--- /dev/null
+++ b/dev-tcltk/tls/files/tls-1.7.22-ldflags.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac	2020-12-25 11:05:31.312433864 +0100
++++ b/configure.ac	2020-12-25 11:05:42.692248123 +0100
+@@ -247,10 +247,8 @@
+ 
+ dnl Enable a stable ABI
+ DC_SETUP_STABLE_API([${srcdir}/tcltls.vers], tcltls.syms)
+-if test "$tcltls_debug" = 'true'; then
+ 	WEAKENSYMS=':'
+ 	REMOVESYMS=':'
+-fi
+ 
+ dnl Produce output
+ AC_OUTPUT(Makefile pkgIndex.tcl tcltls.syms)
diff --git a/dev-tcltk/tls/tls-1.7.16.ebuild b/dev-tcltk/tls/tls-1.7.16.ebuild
index ea6afaec521f..5c023dcedeeb 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 b12bd3f529b3..58ec26e05525 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.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 eutils
+inherit autotools
 
 MY_P="tcl${P}"
 
@@ -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="
@@ -26,6 +26,13 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--with-ssl-dir="${EPREFIX}/usr" \
diff --git a/dev-tcltk/togl/togl-2.0-r3.ebuild b/dev-tcltk/togl/togl-2.0-r3.ebuild
index b5d391f1f50a..a0baf5bf1159 100644
--- a/dev-tcltk/togl/togl-2.0-r3.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug +threads"
 
 RDEPEND="
diff --git a/dev-tcltk/vtcl/Manifest b/dev-tcltk/vtcl/Manifest
index b8d60283483f..3316ddb89973 100644
--- a/dev-tcltk/vtcl/Manifest
+++ b/dev-tcltk/vtcl/Manifest
@@ -1 +1,2 @@
 DIST vtcl-1.6.0.tar.gz 554727 BLAKE2B abf5e9a9fbc42e8c9ab1c216f0d103fcd88c9894a73185d50b56e0c87c88e82e6f368dd3acd7339f3a1875c9cda22123e4df82f6852343da10abac330896c899 SHA512 bfc2ed114af4bee375e820e4b1e47d394a800541eb9917204ef42481a4033927c432d7d2b005d13edd086c7c91bd594908965aae512cc4af9e5654a2bfd296de
+DIST vtcl-1.6.1a1.tar.gz 599864 BLAKE2B 59c3b503cad053de5110d4a46a92803c2e513ddee300ca525382bf76f523e09f01f2680b9ca7ad8b647350c609cedea691b0e40fe028da3ecb7475d95338d60a SHA512 8c7fa1a036d9e30aff322dff2a740ca473b4fe28689b3832304ab29832162967edaf7b6e67f641f2b298c24a9ed9cd911dc6d13277cc8e20fefcacd4268b71ad
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..ad9991529163
--- /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="https://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
+}