gentoo resync : 20.03.2022

18 files changed, 143 insertions, 25 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 13e242e733b9..f3ab26ad8603 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index b47fad549d85..f64299e528b4 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -5,5 +5,6 @@ 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 2297 BLAKE2B 04a0490d261b03a7111fad9e6b966a7001b3b12f32c162ee34d46572837a9761b5595b793c9553f2a545676271ac49feb26c39a42c207268b463d40cffb4a7ea SHA512 4c5385876bd58e1361eeae690263958977a181f6559a896c2a6de4d4f97efb996ff3f8250755182b7e77a316a2ba050ed0f4588562b75a258d4fd1e24635a01c
+EBUILD expect-5.45.4-r1.ebuild 2298 BLAKE2B c5105d17c343b7c457939c73c28e1f7ddc8a0e9b838d3cba132a4a510cb33b7ac12fea546f41fa13fd9329a05c6fd81bf41a2f24d4e88dfc97bedb8c0340e439 SHA512 be596daf8f0ec9567ffb43544f7d1d21fc8686543be5228cbf66a83341b0e53369d3b9932ba3ae6ee6275888a58f200ed708ba1a99af925c80a8a662d068abea
+EBUILD expect-5.45.4.ebuild 2290 BLAKE2B 8b626bcfdec7e853d4cbcad97e201a09c06b2f17c004671df109f879aece4f6bd10d78570b53721b898b73d2e952945351138d571b40cc29c5c88d6edfb0c0d4 SHA512 112562260068e3c64ca47cfe6c1122f02d3aaf6454bc0b54e0d12330686eb6011e40c9ce4c0d1979f4b49e1681f87f82cac7f78b0dac90c280b744c933191e87
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r1.ebuild b/dev-tcltk/expect/expect-5.45.4-r1.ebuild
new file mode 100644
index 000000000000..fa02fd421cbb
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="https://core.tcl-lang.org/expect/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug doc threads"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+DEPEND=">=dev-lang/tcl-8.2:0[threads?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-examples.patch )
+
+src_prepare() {
+	default
+	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+
+	eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+}
+
+src_configure() {
+	# the 64bit flag is useless ... it only adds 64bit compiler flags
+	# (like -m64) which the target toolchain should already handle
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-64bit \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable debug symbols mem)
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	emake test
+}
+
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
+	rm -f pkgIndex.tcl-hand || die
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto examples
+		echo dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
+		dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
+	fi
+}
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index efb1f5f4cae6..6062b7449ecb 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools epatch
+inherit autotools
 
 MY_P="${PN}${PV}"
 DESCRIPTION="tool for automating interactive applications"
@@ -28,15 +28,15 @@ src_prepare() {
 	default
 	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
 
-	epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
-	epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
-	epatch "${FILESDIR}"/${PN}-5.45-format-security.patch
+	eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
 	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
 
 	# fix install_name on darwin
 	[[ ${CHOST} == *-darwin* ]] && \
-		epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
 
 	mv configure.{in,ac} || die
 
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index 3e01f4b3d294..c880d495f11e 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -5,5 +5,5 @@ DIST itcl4.2.0.tar.gz 428635 BLAKE2B 38898f3377583115eed3b4d5a8a610e0d0a515a1e48
 EBUILD itcl-4.1.1.ebuild 1448 BLAKE2B c16ab644f52d6e284a5d802c0bdbd4afe7939c7ea37c615b6dde0cbe6989bc31862aeba37e60da576e42671f4a2b16d0539d5325e609c9c17e5c8ad0f55fabc5 SHA512 d79dc61dd9a398e92bd393c219b73dddde85383439bf1e2109b78ec1f01dc25e8b4256d8c44466424e93e74a7f7f7b8ae9cecdfc4f110690f74bcabf01765bc4
 EBUILD itcl-4.2.0.ebuild 1454 BLAKE2B 21aafc38fcacb2a504e7c42b9077dcf078521e96035d3e1355427e6d8c92d083fb3367af1332db30e490bcda6d64aeff31f844c2ac9f96dd710fb2b02f468159 SHA512 8c029cf6a22cc2ec108f6b2c9ee4f6de32d9a21de0a52b9299e4b578121e9a440e64aaffdba0cbaf0eb55f1f67a6ff65e1ea3214bff784f327ed192f42eec8f9
 EBUILD itcl-4.2.1.ebuild 1538 BLAKE2B ce708d738449847b3d40a189a4c357a1063de6de8c4e729aa92dd555209b99fdad360bf9fab33e19a270ece9b8249e52da9583652e3cc989524a815d2d761e2e SHA512 07fc92ad190f95c7fa9e42d6c8ddba17b8ef4ac7472e9287ee3ffc2c1208c7f722e9f1e0afa7e366bd6e7f49c91e6e90e98d3ec19b1c2733a89b29b9194351aa
-EBUILD itcl-4.2.2.ebuild 1538 BLAKE2B ce708d738449847b3d40a189a4c357a1063de6de8c4e729aa92dd555209b99fdad360bf9fab33e19a270ece9b8249e52da9583652e3cc989524a815d2d761e2e SHA512 07fc92ad190f95c7fa9e42d6c8ddba17b8ef4ac7472e9287ee3ffc2c1208c7f722e9f1e0afa7e366bd6e7f49c91e6e90e98d3ec19b1c2733a89b29b9194351aa
+EBUILD itcl-4.2.2.ebuild 1545 BLAKE2B 3b2d101773367c7c3584bd2b7bfa8e437b1a0364e696ae83f8b2c1343b3c947387de0894a1ab2c62c7a038bb060f564dfa7ffe10546dba21bbcaff2c4e306284 SHA512 b2b9662cf5a3e7815cdfe11979211dbfd3d3b5cb2f71fd1f23bcb62b60769e53c7447a75348adde3e688dc716161cace64921d8a5e2a0506c9372ece9b55fbd5
 MISC metadata.xml 381 BLAKE2B 10be715b2d7375efe50d58e9fa2ac732553271e077bdebed3a0422b0a3f0932aa6d2ccb15f4c1db1aca8d619b20efc593d417b5adbec6c1dfb41ddda409e98b5 SHA512 6343f2deffd5ac471db9b2ebfa6ed602a4ce2beed9aa47e58e3bf49c040f847d12f209549151ca4947f6690f001effa8e8ab60172e8b2a182c59b77938761417
diff --git a/dev-tcltk/itcl/itcl-4.2.2.ebuild b/dev-tcltk/itcl/itcl-4.2.2.ebuild
index f91441c20dc7..8271d86717d4 100644
--- a/dev-tcltk/itcl/itcl-4.2.2.ebuild
+++ b/dev-tcltk/itcl/itcl-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tcltk/${PN}/archive/refs/tags/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index 254b1fa2c4ad..d8f05b92fbb8 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,3 +1,3 @@
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
-EBUILD itk-4.1.0.ebuild 1433 BLAKE2B e75887dc1ad16647bbd8805d7f2a3881854f952f45c54a56796c52b684cc41471ef4a1842984cc86584c9a2e31d47d44ed4f0cee545ed200d939aec4b3303a2e SHA512 5fab2b3e7b2648a786d0c50b124e2892625f99a9cfd76ff5d2577f17a3016f934c510760fd57d5c82ded9add956441e4f62fc3a466adba44e2edc4c1ba0db0bc
+EBUILD itk-4.1.0.ebuild 1440 BLAKE2B 87923d23b106fd3e25e21d1e27d99fc6483160539c56adeeb339fc109f6cab15697d1cf0b512635e64ec6c5f8cdec5747da0972759017afeef753420e41bb15e SHA512 a27c2be1976762b276471377d40a33fbf41601272fe81653c2a296b5ca9701cf4e41d6522c9b39e5d7fddde4229ae5c931b7eb6f56c3e1480080099ef431392f
 MISC metadata.xml 331 BLAKE2B cbfdc70f22edb7232306f89415cbcc6fa3470bea62eafd86b3a6f9fe81c78a5623a3b88c44b2d30d9029fe0d8a551c607abd63abe012dbf2891101d1f2270ff6 SHA512 fc1787936c65143bf99af7adb3f83d4e4166c2584de2608bdc19e6ad2a749055df5337cb7417c34ca9adc112197d55ec7058acaf85695d1bd9215abdcc073ac4
diff --git a/dev-tcltk/itk/itk-4.1.0.ebuild b/dev-tcltk/itk/itk-4.1.0.ebuild
index 9ae9fb2b25f0..a7055bc977c7 100644
--- a/dev-tcltk/itk/itk-4.1.0.ebuild
+++ b/dev-tcltk/itk/itk-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%2
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 343e8852df8c..902e11b8a05f 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 2454 BLAKE2B 0fb20147c7172a0ff0452ad199341f57b58dd48251115975189e331b398fd1b43426211ad14d19128c0cf4577bb678e541fa12272495a1279732628d64015863 SHA512 49d74334364569cdc292e86eef8d8da5589b488be135488847cd88af39d30c242d956e63cdf71ca9326a9b232c69a0f46c90dc5a874cf812b649720859a6aee9
+EBUILD snack-2.2.10-r9.ebuild 2458 BLAKE2B e528c5bb29ca72c203f8476a83bb330e793d7fbb2f42551ee1683ca713b94bb09def3a4159a87878ba2fca4d93da847a2a6f5529aecdd87157039d14023fb784 SHA512 817748671341b244accd6263a8d019b2562fa87aea41b0e3a64c31b92b29c4cffb915b1773dc94fc3c384352b745b81a171288eec9b0a4990c370c6ae5d605a8
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 14313d7b98c7..4466b95ddb31 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_OPTIONAL=yes
 
 inherit distutils-r1 toolchain-funcs virtualx
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 3bf710eb9d8c..b04e7537ab25 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -1,4 +1,4 @@
-AUX tclpython-5.0-gentoo.patch 856 BLAKE2B cd2efc191b03a24ed9fc7ed69349a8503228de30b9f79d01d81a11b1b166819e202901a6a1f246d0c142ae55fd7589a3c2ad7e81a1cbc7ca5ef486b5424c7292 SHA512 2cf2a99979d7457e5b16c795c86883b81069ecb01b485d52990e1c69ef412dbced3a10dfcfb803b8e1aa0cb0a09221598d7317a19dd20576e4c9fe163d29811f
+AUX tclpython-5.0-gentoo.patch 1476 BLAKE2B 86b099a5a30506c4f3dfb4c382a34dbc211b8eceabe039e033d6ec45d80d03bf64a259673ac80f4478b49a55e4605c8387bf17f3c9e3f4467345ca66ba2d98c7 SHA512 abc41ffae87ad1dabbac1dbc747c7df199559aa4d9be9676282d55020d5f1c9bde444ceb59363ddbcb2e786749fa9e42a0192d300be0fd945a01021da2abe8a9
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
-EBUILD tclpython-5.0-r1.ebuild 1009 BLAKE2B 4a50f494553343273be173da0a2876d05908546d39ef72df017f690e334eac16728ab34d875702ada8a45eef828a8a8551aec8bc3c4638f2b9f5762cdde61d8f SHA512 87935c4964c2b786d4f2eea70a22bdbe99aa143d67bd6827a8712783481290d22139503d273e1d4bfbbb6382a2ae7e770a4e1e20c1ea03f06e135d787b46e057
+EBUILD tclpython-5.0-r1.ebuild 1011 BLAKE2B b4b43d8454b52f0362e223f629994e7a4fca7482d2ae81c3b9b219c0b026e07e5afe4fac1fba47230f1dff9e5b34bffa85e11b79aeca574fc3c00334805cc719 SHA512 54a05401712058687bf35962bb31966d393d55627dd2f99b6c5ea56951f3875edb783bef985891664a8e95c9711597f9a5de94b09bf2c285f6fb7cfbff654014
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
index c77339982fd6..39bdf20c095c 100644
--- a/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
+++ b/dev-tcltk/tclpython/files/tclpython-5.0-gentoo.patch
@@ -24,3 +24,23 @@
  
  ifneq ($(MAKECMDGOALS), clean)
    -include $(DEPEND)
+--- a/src/py.c	2022-02-06 10:20:03.352580186 +0100
++++ b/src/py.c	2022-02-06 11:16:49.504796684 +0100
+@@ -24,7 +24,6 @@
+             // First time initializing Python
+             Py_NoSiteFlag = 1;
+             Py_Initialize();
+-            PyEval_InitThreads();
+             GlobalThread = PyEval_SaveThread();
+         }
+         
+@@ -60,7 +59,8 @@
+     #ifdef WITH_THREAD
+         PyEval_RestoreThread(interp->thread_state);
+         Py_EndInterpreter(interp->thread_state);
+-        PyEval_ReleaseLock();
++        PyThreadState_Swap(GlobalThread);
++        PyEval_SaveThread();
+     #endif
+     
+     free(interp);
diff --git a/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild b/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
index 05156fc6ea87..92a9fda120d9 100644
--- a/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 toolchain-funcs
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index d2fe533b8e01..1bd178dd88d9 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,4 +1,5 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
+AUX tkimg-1.4.13-test.patch 313 BLAKE2B eee0540a659b4ec7af738281e14847228cb596344792f7b8e2c9c690ac37212226b2cc5979649626b9729abc75571ca42ab96f41deed71075970b75eec5ca1e1 SHA512 189920d66119f08c8330e501b681717d5737a2c2bbc907294367d75cefadce0354c876135d788d44de5bf90ba199953e9a0a1b41b3c1aec13d45f1e1d74de796
 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.12-Source.tar.gz 8363871 BLAKE2B ba33908be9d44979e6f97c9194dde6ba30fe15593d80fe47cfad22d1d9e81a9e2ca3f2f19adf2c851fb89ad543f28be7e519ed822d3497b073ec93525272e60b SHA512 40602443657c7c0c7196cfad73ca83e3e473c9d08a1f378a6371a61a8eb98dd90ad8cf9aaf4c54fe6388d4abd969b2643029453871dee6dbcf909fa85b039a1a
@@ -9,6 +10,6 @@ DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a599131
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
 EBUILD tkimg-1.4.11.ebuild 2046 BLAKE2B 9d1356c00f9b4ce4aa5db2ee1d0fe2c58f6d18e172a6476bb2a0d30bf075f1180dbd236be8ab9015374acf7ff41d160d060ab8bd4222beb1560ba89c2806d83b SHA512 961f5470074a0b3f7556bff1935de87e162424816a051316acb7c4e053686ae6bfec6e70b433d40bb68d40d9a8081c457756f6d001dfe8ee8069cd939a34cdfa
 EBUILD tkimg-1.4.12.ebuild 2095 BLAKE2B 64510985af5bb5e0977014f3dfb1e58c19a5a3b0971a5b03383a57c868c286e54d8e687e721d0bab82f66217a4f50e30f97d3451e79e7599378bb7192884d7a2 SHA512 a22bb599ca479c09e6fbc94ba4cec529bb04ade65092eb520b620ede9bf0e0ce690aa08aa0cff3c85e90c932bd4d4200823bf933a4828a8a42d03782aaf13e03
-EBUILD tkimg-1.4.13.ebuild 1949 BLAKE2B 2ca89bc7b69a914a8735b4fed3a8c59a9d48293f58f84fcbfe4e9f9f2f5373964b581681d179179ed0a533db6878723baa4a0230b909773504cd919f3767f3b2 SHA512 853b1400a07b66d2c1580ca865ac53f0da6ada6b5614e66f962b0bd4a7f14ba1a10e86ca6cdebd70599837cd094cb27d84b78344ffb0bf77b20e987d273e5776
+EBUILD tkimg-1.4.13.ebuild 1980 BLAKE2B 81383edcc65bc3423fb192928f690ae206d4660b71565061648a3b7902bef0cf027611cec60c652ba02ef443db40172bda21956f2cd74b4c15650e0f2b3ac68f SHA512 85b6f66884227d9d0aeb1ee15a54d28e323c424c641e938f998045b1e8ff652e8675da2af073a4d5d331e0acf45775175ac477654ce2e701170c682618aae79e
 EBUILD tkimg-1.4.9.ebuild 2289 BLAKE2B 1a1dfcee3443ac6e22bf4bda087750bc4356a7d07d2cd95af4d501cdcc5c03d5b2523f4650caece002bbd18692cac6de954fc51801d282e009b2229d48b64fe7 SHA512 e8a89550f0564a32de16471d410b6d9601c67360b49b38dbe034a97115481be0101572996ebee3c0dc921909b923fc42b4e6d3beb7a46c5a48027fc57b3a72d6
 MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
new file mode 100644
index 000000000000..840e013b6915
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2022-02-17 20:34:02.134144390 +0100
++++ b/Makefile.in	2022-02-17 20:32:31.957625786 +0100
+@@ -109,7 +109,7 @@
+ 	do	\
+ 		here=`pwd` && \
+ 		cd $$sub && \
+-		$(MAKE) top_builddir=$$here test || exit $$? && \
++		$(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \
+ 		cd $$here ; \
+ 	done
+ 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index feba8d5b635d..1c8ec49d4031 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,7 @@ S="${WORKDIR}/Img-${PV}"
 
 PATCHES=(
 	"${WORKDIR}"/patchset-1
+	"${FILESDIR}"/${P}-test.patch
 )
 
 src_prepare() {
diff --git a/dev-tcltk/togl/Manifest b/dev-tcltk/togl/Manifest
index e8cedd82c606..9b8841aafc90 100644
--- a/dev-tcltk/togl/Manifest
+++ b/dev-tcltk/togl/Manifest
@@ -1,3 +1,3 @@
 DIST Togl2.0-src.tar.gz 244968 BLAKE2B f094fb4bba7049470d7f61a2748d4a5baaf47c99c766d96ef8061e254673acf7f2a11555e202ec01f5d6b7a00ae7c275a33981fba5df7f1478f69da17f3180b8 SHA512 2be3062baada848d96b2802582bc5590b215f2ab4dc02c91761e72af2bf8c0ba768a71a2ffb8107bca83b63b7d1321ee83de19b97f83b1c2f0962f9288948b0a
-EBUILD togl-2.0-r3.ebuild 831 BLAKE2B c1aa9d154b4bc5cdc446a4961a91a5d04517a7c37c8b5e0a874e76951344afc98b6309bd9f5df30d8c4c7c5e4d6e0a9b21b1e8f532562b52a6edb9c9b3c7928c SHA512 78dbc393257bda78501104e7934b9d587fddb924561e91355e5c22f751a7aa701a2733ea48517f3c76c5bd0bd448b552256f89a6ae5e556df37dae9f7b997df8
+EBUILD togl-2.0-r3.ebuild 838 BLAKE2B d7f9503ea15c3f04de3c3deb7accd73b32e553ca7aba6bb557300366ce4b26658fb74d35c243c9735c483f7acd5aa60481a335b427612e6b1c4408833e9d3ace SHA512 b0bdbd42db6d8e70144a32b8921b1a67ee68d257c40ffd2e01ffc7922c8ce5022b533c1dd38b9e1c12c13c5cbdbe43e10dc3648da7eb60cab14b7e5c60ea7d92
 MISC metadata.xml 1192 BLAKE2B 273ab4364fa66c70b5604f351dc60a03c92c53ba77e3d65fd62e94c560fc5d72800b0ab4e0d59a9808571dac709842e057fbf1ee2de54de5032f7574de8541a8 SHA512 7dccf56baf36b7683a732c167244ea6b0403cf3841fc9d2586b8cab42e39b77f9ccfbd683a3883155a278f1d6392f78836491f824004c9b8ce55e6f1c82300df
diff --git a/dev-tcltk/togl/togl-2.0-r3.ebuild b/dev-tcltk/togl/togl-2.0-r3.ebuild
index 22ee83318cb4..017804394aa5 100644
--- a/dev-tcltk/togl/togl-2.0-r3.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug +threads"
 
 RDEPEND="