gentoo resync : 29.12.2022

12 files changed, 126 insertions, 215 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 781205a033f6..288d560dd847 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 2251ccf96a3a..ab8b65b2c2c1 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -3,5 +3,5 @@ AUX blt-2.5.3-gbsd.patch 844 BLAKE2B 6459fdff29b2895b055a54111b5ee6f19249978943d
 AUX blt-2.5.3-gentoo.patch 1280 BLAKE2B 8c2107115f34b1acb384c490e893d0ef357149c13f29bcf31b18218c3f16c6e2cc0bef05678bb397a812137ccfcac91ec3f9e88339f23992bde0e0055148aaac SHA512 a87deacbb3dcf0be3b1ae96d920de9edc0c6bc223b88c76ccaa417aa23254d6716248b703ba855b97ec30dc1ae4e1931273e811ffae1f727ef5663ab505c83dd
 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
-EBUILD blt-2.5.3-r1.ebuild 3959 BLAKE2B 3e7f8193ab5315b28f482a94ac92884ef4f4b1ab803c282df256ef749bbd88a3d5efdb9bb914b77411d473231b37e9c086a171a78ae8c457398fa7c0643cbde8 SHA512 91ed877e5e3da0d283359e99657866ded4c0ce75dfc96440bd06b8afcc79aff2466e9bed6c8a1bdebddb729401fb13c90244ffdb6528682b965873b46e165617
+EBUILD blt-2.5.3-r1.ebuild 3915 BLAKE2B aa0091f687a2817d50ba8455e3d213a4228e0af803e6ec803a80aa5f8d6ed75d994ea6341fb369c399dfcd0d59dd6827aa38be9eeb0e9732b0e8e172a605a20a SHA512 24e8ed258821a931f378a798154c128dee9cb94bf1f27474d15dbf08e4b20fb96feeedb9fe402c37f730e50280539bce38428ac0575632be99cc53717c1dc85c
 MISC metadata.xml 337 BLAKE2B 516358308d0546bf002efb976c99fd297cdae8d4f9b7cc59b5eff5bb9ec530150ad0e0cf0b3cbb9a3285547683505f62d3ded7d55daba20c0935c55818155386 SHA512 1ea3c5a04ee8192793fbfb59d7532e4b8aca70c782378ad6f475445aa828680a09bb0e4f2ed0ec09df225582f545dcb32577dec58562fa307c775e9a7e10239c
diff --git a/dev-tcltk/blt/blt-2.5.3-r1.ebuild b/dev-tcltk/blt/blt-2.5.3-r1.ebuild
index eca6138d56f8..3332aa195afb 100644
--- a/dev-tcltk/blt/blt-2.5.3-r1.ebuild
+++ b/dev-tcltk/blt/blt-2.5.3-r1.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
@@ -122,9 +122,11 @@ src_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
+	pushd "${ED}"/usr/share/man/mann
+	for f in * ; do
+		mv ${f} ${f/.n/.nblt} || die
 	done
+	popd
 
 	# fix for linking against shared lib with -lBLT or -lBLTlite
 	dosym libBLT${SHVER}$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 7652d7d8a191..3e3257272502 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -3,8 +3,9 @@ AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311
 AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06
 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
+AUX expect-5.45.4-configure-in.patch 2408 BLAKE2B d198b599eeff18833e9532945aaf921779229ddecfbe478f985f2d742a39875e68cdca97fbca6aa5ca572f4c31c3a2491c8ddf473042952213232d3bfd070eee SHA512 7b60a268c6e4c0875978a619a451eb669a519f74623fbcecd90299b22e0ba73f6884177a16367e5ee94828c55636dba2f70c324576c1cc077d389912f4d7409d
 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-r2.ebuild 2290 BLAKE2B 246066fe262ed78dc68f688a7c2f387909b82c7475035f4eb9a9f4af1b9f1ee3460b338bdf5c121c5fff6fe2bb37941aa5163cca6268ae4e87085ac0c1310305 SHA512 216fec55a13569db6238145bef190c13e4e38759679c2088b6f148149f8620e10db8f4f100ab2308dd29c0b0ada3a6df7992c31f36ab1fc7ca2a91c7cd459dac
-EBUILD expect-5.45.4-r3.ebuild 2305 BLAKE2B 8bd815724313c8d85f46fb71261e225ba00ce2cb110b0dd19097c0f2ab64576d5438dd98fdf144d369a66d6ccf29e2f40babb6c441f186282d1847bc83afe9ea SHA512 fdd2191181077ede86be90963161f50ce6338a66b6fb038f6e17a94b9391dbee1e9f9acc00848558f308d2c3b147d3046b75f58df931475248f39ca349ea6052
+EBUILD expect-5.45.4-r3.ebuild 2359 BLAKE2B 76279453404a40144d5390034dd0a01534bec14d701f9fcec7e51083505d21808c920f1db7584c149ea95564f02690cb6df659c40510a8506242122e905247e5 SHA512 fb09dcea72b6f5412c09325eec86c7e433d2e02cf85c3a34b1592645a28c47df9176164c9416de8b38b98490e178753acf5939aa51cd9d795e78923411bfda68
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r3.ebuild b/dev-tcltk/expect/expect-5.45.4-r3.ebuild
index 4c7c6571cbd6..c374e9fb54e2 100644
--- a/dev-tcltk/expect/expect-5.45.4-r3.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4-r3.ebuild
@@ -32,6 +32,7 @@ src_prepare() {
 	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
+	eapply "${FILESDIR}"/${PN}-5.45.4-configure-in.patch
 	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
 
 	# fix install_name on darwin
diff --git a/dev-tcltk/expect/files/expect-5.45.4-configure-in.patch b/dev-tcltk/expect/files/expect-5.45.4-configure-in.patch
new file mode 100644
index 000000000000..8c05205bf5ae
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45.4-configure-in.patch
@@ -0,0 +1,113 @@
+Allow cross compiling.
+
+Signed-off-by: Anders Roxell <anders.roxell@enea.com>
+Upstream-Status: Pending
+
+Patch source:
+https://github.com/openembedded/openembedded-core/blob/bb87788832ad64079609e4f554e4d55a14f0aa94/meta/recipes-devtools/expect/expect/0001-configure.in.patch
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+---
+diff -uNr a/configure.in b/configure.in
+--- a/configure.in	2012-12-14 15:31:32.623180450 +0100
++++ b/configure.in	2012-12-14 15:53:34.518233519 +0100
+@@ -481,7 +481,7 @@
+ ,
+ 	AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++	AC_MSG_RESULT(no)
+ )
+ 
+ AC_MSG_CHECKING([if any value exists for WNOHANG])
+@@ -506,7 +506,9 @@
+ 	AC_MSG_RESULT(no)
+ 	AC_DEFINE(WNOHANG_BACKUP_VALUE, 1)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++	AC_MSG_RESULT(yes)
++	AC_DEFINE_UNQUOTED(WNOHANG_BACKUP_VALUE, `cat wnohang`)
++	rm -f wnohang
+ )
+ 
+ #
+@@ -574,7 +576,8 @@
+ 	AC_DEFINE(REARM_SIG)
+ ,
+ 	AC_MSG_RESULT(no)
+-, AC_MSG_WARN([Expect can't be cross compiled])
++,
++	AC_MSG_RESULT(no)
+ )
+ 
+ # HPUX7 has trouble with the big cat so split it
+@@ -725,7 +728,9 @@
+ ,
+         AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++        AC_MSG_RESULT(yes)
++        AC_DEFINE(HAVE_SGTTYB)
++        PTY_TYPE=sgttyb
+ )
+ 
+ # mach systems have include files for unimplemented features
+@@ -749,7 +754,9 @@
+ ,
+         AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++        AC_DEFINE(HAVE_TERMIO)
++        PTY_TYPE=termios
++        AC_MSG_RESULT(yes)
+ )
+ 
+   # now check for the new style ttys (not yet posix)
+@@ -771,7 +778,9 @@
+   ,
+         AC_MSG_RESULT(no)
+   ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++        AC_DEFINE(HAVE_TERMIOS)
++        PTY_TYPE=termios
++        AC_MSG_RESULT(yes)
+   )
+ fi
+ 
+@@ -794,7 +803,7 @@
+ ,
+ 	AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++	AC_MSG_RESULT(no)
+ )
+ 
+ AC_MSG_CHECKING([if TIOCGWINSZ in termios.h])
+@@ -816,7 +825,7 @@
+ ,
+ 	AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++	AC_MSG_RESULT(no)
+ )
+ 
+ # finally check for Cray style ttys
+@@ -837,7 +846,7 @@
+ ,
+ 	AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++	AC_MSG_RESULT(no)
+ )
+ 
+ #
+@@ -889,7 +898,8 @@
+ 	AC_MSG_RESULT(yes),
+ 	AC_MSG_RESULT(no)
+ ,
+-	AC_MSG_ERROR([Expect can't be cross compiled])
++	AC_DEFINE(HAVE_SV_TIMEZONE)
++	AC_MSG_RESULT(yes),
+ )
+ 
+ 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 1bd178dd88d9..c2c66f288c69 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,15 +1,10 @@
 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
 DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f SHA512 922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318 SHA512 013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-EBUILD tkimg-1.4.11.ebuild 2046 BLAKE2B 9d1356c00f9b4ce4aa5db2ee1d0fe2c58f6d18e172a6476bb2a0d30bf075f1180dbd236be8ab9015374acf7ff41d160d060ab8bd4222beb1560ba89c2806d83b SHA512 961f5470074a0b3f7556bff1935de87e162424816a051316acb7c4e053686ae6bfec6e70b433d40bb68d40d9a8081c457756f6d001dfe8ee8069cd939a34cdfa
-EBUILD tkimg-1.4.12.ebuild 2095 BLAKE2B 64510985af5bb5e0977014f3dfb1e58c19a5a3b0971a5b03383a57c868c286e54d8e687e721d0bab82f66217a4f50e30f97d3451e79e7599378bb7192884d7a2 SHA512 a22bb599ca479c09e6fbc94ba4cec529bb04ade65092eb520b620ede9bf0e0ce690aa08aa0cff3c85e90c932bd4d4200823bf933a4828a8a42d03782aaf13e03
-EBUILD tkimg-1.4.13.ebuild 1980 BLAKE2B 81383edcc65bc3423fb192928f690ae206d4660b71565061648a3b7902bef0cf027611cec60c652ba02ef443db40172bda21956f2cd74b4c15650e0f2b3ac68f SHA512 85b6f66884227d9d0aeb1ee15a54d28e323c424c641e938f998045b1e8ff652e8675da2af073a4d5d331e0acf45775175ac477654ce2e701170c682618aae79e
+EBUILD tkimg-1.4.13-r1.ebuild 1992 BLAKE2B d4631bb0d43bddea68dc4cdc452633a2ca803b36f6e1fc020b72119925bcb7a4e7d6c45a1778c12b4aeee03ba8562787e3a6d72aae5df2ec0d1e6dcd65cec8b2 SHA512 83736752c7349d2ff120651f86e94b31870440ca36bf85d5d43faab9256946666a524bb945bc2df3cc5c8c90fc93e60027cb8e9030d18293987c15f73c978f40
 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/tkimg-1.4.11.ebuild b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
deleted file mode 100644
index aeaed13849ef..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix prefix toolchain-funcs
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-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 || die
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
-
-	eautoreconf
-
-	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
-		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd ${dir}; eautoreconf)
-	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.12.ebuild b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
deleted file mode 100644
index 68c860a32fa1..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix 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"
-
-LICENSE="BSD"
-SLOT="0"
-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 )"
-
-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 compat/libtiff/config -name ltmain.sh -delete || die
-
-	#rm -r compat/{libjpeg,libpng,zlib} || die
-
-	eautoreconf
-
-	local dir
-	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
-		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
-	done
-
-	eprefixify */*.h
-	tc-export AR
-}
-
-src_test() {
-	virtx default
-}
-
-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.13.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index 1c8ec49d4031..1c0e9a4c3422 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	x11-libs/libX11
-	virtual/jpeg:="
+	media-libs/libjpeg-turbo:="
 DEPEND="${RDEPEND}
 	test? (
 		x11-apps/xhost
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index 3284613fb194..c2c64d15bbbe 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -2,5 +2,5 @@ AUX tls-1.7.22-ldflags.patch 363 BLAKE2B b0b7fab12ed59f37ae538190b1988badb3ea3eb
 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 889 BLAKE2B 251b09dfc5216f037ba9957a5c1d8037bca38b4fcdba102177393ae81eb078b2bc13e607930b51d99a15834ba9a13c0fc819eb6e6d7d95bbf93dd335c5af4e3c SHA512 fc32d9e16ed24fe6863ca97f24c5f6d95a77b1724e3be19f766779bb931fcf56cd80c93ed0bc749f1bc6fa22a85bcfb9cdd87e0600a803775175969c78c0c273
-EBUILD tls-1.7.22.ebuild 1018 BLAKE2B 3c6463211498c09585565e826be674305f8357ae9f6f14d3dc29282dd4cf1d360a786e1bfa07459d12193e3a1873f8b2eb854d8b4a2984037b1ff5e7f79cd3e7 SHA512 2375fac8fe84f7fe3801c9a7d832fad75721ddc927d2c8591aaad09d46903481e1a117f9ce477f69469ed14f83215b513fbcd4a080695a9c5438905fd2a6e8ab
+EBUILD tls-1.7.22.ebuild 1025 BLAKE2B 704281955f24f4c98d156995a3b6d2dcd2ea26ccac988bec69cd8779fc5f27e8a5aa0a2822997ca7944d361ea816429832ed4238984b3bac57600e0dda6fed78 SHA512 9c7a429ab293440fa0d5e6b5c8162aed6ec7ed5356b0fb535cbb4ed2c988ee17f1a97e843d00596cb8e44aa7fec409cb48ecbac0bb5170648704213997bb89a6
 MISC metadata.xml 327 BLAKE2B 993a22714fa6f672e3468a5248ce1a0ffbfeb8f1c4ceeae54f7a2e201a9f06c99bd2a3a3691cc73c1b3c9c8fede4bc5ec77eb35089483ce6b556cad3e7839c8a SHA512 131aa4f5ccd91f39bbb097ed6e6290bb4f0f1ac9273cde0a71b29a6956e38f27c8ea6d04357f630f518480beb61fab0c9592651522d82151ce5f97bf6b190033
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
index 371c1d927b6d..53f983e10292 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tk"
 
 DEPEND="