gentoo auto-resync : 04:10:2022 - 13:17:38

332 files changed, 3306 insertions, 1078 deletions

diff --git a/Manifest b/Manifest
index 0bcdfe04f47b..5df6b8125556 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29595 BLAKE2B 60a39b2aa2bbedcc008ed940cb6665bb8c871752e7ae6b51b11271fb643f435efc177effba718988ce5a40518d1131d5f912c78d45ab0b8cbd81634c9652e6db SHA512 203c1e7231c9c2fc05d3e5a92535b76b59673db066e22f69f8bed19cd474ba06de4f499fb9438c9f303dccd9be1c1846818f8e418b1a55a394485801cac5e56a
-TIMESTAMP 2022-10-04T05:39:56Z
+MANIFEST Manifest.files.gz 29619 BLAKE2B 17bf0229c13626828d8a258512fa83f2500da3f09d4cf877cfcc777a9a7943624830307df4154fbed853e1b75e3e88129ad410645ce519f935b4c1a214b6dd63 SHA512 000e9dae80aea6106d731be28820860736234edce18e6be9845813a791915b986e2688acd1a8c81240985d5679ef45a020173b746a061177edeac006dc9f6fd4
+TIMESTAMP 2022-10-04T11:39:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM7xyxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM8G4ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCw7w/9F8iF6qov5wSmYITLl7SQ4UWhdU+0BGZz6cJzMI9F2c3fzrkzfMdVNS+O
-3rgUBQYa3nR/iax+kTumfcw2ss3nQ8bc50KtzCDOnHe0o/zO06d8wOM3mcQjH3Mq
-QcFUTERoF9gOb75fhqdH2dY9pMMp5rRwzocGBhpX90x7tmLVYa5d379AUt55vTtq
-jw74jbp+9LwJOiVGfVgbKYaYgLI0BAaz8U/8W90ysRQKw0Ff4VOXK4EvSsvPK1dg
-kbJ09FZ7v5huNflP/vG7A6H/Wew3UpDWNOPbAvHNClBD6HGXF5XMPEMdOu7OpP/Q
-PrnslIOwbI027QydcEzV9FcjgD0RHcCWzZINb2/2jub62b4j3vYRP0GkbXablA3T
-PB+yb5fhIQhOF0JG3D/Hkr2GUK/DND4djJCDQ1ODy6JliXurHC+JY3PYT8OXNttd
-5+QcGKCemMBPhNhvLYoIFULaflNfCdfKBss6gqT/QdOAwZFmakbyPncQiAKcHfyK
-wYUvvjr1zUPbT6TAO83qhwcAg2FsodMo+zI6NgPqbrb+MUYQDTVgvhzVS9JYhOg2
-FTSjMCpRulkQw6JgJO1MwQ45xSevVrpsVH48V0CSTXuXgVn0pqi0nWXI3y/cpPaU
-iW1KmKBJ07uHznDSyFQwKAgjYkRHHl2lIekbu44K0h66DlTirXw=
-=t+Lz
+klC2axAAqUgcSxv+mjrmareIoZy/FVPdgEW6UzJFagpsvIR0rdknHHieBslb+mR9
+okDWQxwp8WZEuOGqHjawFOhy8XivauRlnzeNY2XkrzebALFsrKUZzsL2qwWbOh2/
+X15OyBtnmijAgWBDpOXo1oJARBU2VkO+eQMlbuuYtRac3lEW85YanlEYbIa1W9+l
+M2i7gku0RL5kI9akMNztNSgyjVowlux3KypCBJY7dvGjH9Q/KX+YzTqoTfW/Bv19
+YLoBVMogN2L6fW6sos8v07rK97hWdxwydf67xgATLuCkinjOS8FDhSmQSYvhhasf
+Rkmzr+zhCce4qFFHgj6/i+gs6Bh6aTiJKkU0QH6xXxzwJD4HJE8v1mbkqWnKwcSv
++ZHTbgEDNSx8ZaQmfWp1h1SyyGeXHwJeYAOdkn6JnKbQsv47wNZAU7upYUdfUVIO
+1qUNoRUVqSyV7mFJY+FA5Ny8RY9jtRz5rhwwDVNCWoKtHjIzDaWYnFcx/o5PL99g
+vcf/Voq/VziS7wlVSb5ac0y++QQHygGGMiGBm0+c7veIyL4lid9RBM28tuj5gXQr
+v8TusO2jGpi1kEWwWgU3HeKFc/OgE2oU+oAiywXUgSH828NUzjt/6XFzrnxG922i
+yiroj1etTj9GN9tvFW/xNwVKSwpWg18Nh/bNZkv+FMlLmq0K/fA=
+=LL4X
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 49c43a85022c..d9c6b0fe33fc 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 229699cdb97a..3956801c47ba 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index c83e74caf289..9dfb2cd41aad 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -3,6 +3,6 @@ AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498
 AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38
 AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9 SHA512 f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
-EBUILD johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 3471 BLAKE2B 156fa82b68ef34eec7f16302f3657817e041e2bbfbb0b6034bad4a336c0e7f519f1b45a61ab1227b62854ea0c989af38b86eb37e1cef86b48752a8e7fbe109f7 SHA512 3c8d3ca05cfde86bff53ea48b69fffbac80ab334f8e7a4a4b4c8337528da4661b46eb3944c451747ada09a072f1c7d0fce8bd18640c74c0630102bad4c1a4e07
+EBUILD johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 3478 BLAKE2B cbb40ff27f41bee7a80b613b105ef92df5dfe7c282ad8687eed46fe7c34b6d577f7a832b6f22a3a6d02d176c01fe181f20686ad6681bd73275b5a28f612013a0 SHA512 9b172be4c027afc215fc02040226c0eb03f55e4c4e938cb035e4ce69a0c97cb8a4d9f3e110b522296432e5f3053a405fe69ccf47fca6e36039cc240f11c7d834
 EBUILD johntheripper-jumbo-9999.ebuild 3420 BLAKE2B cb8f328e15f4e7d3ecf09bc00a8774ed2199e87398b0e7944013ea0bdaf8c731aeacc3aa5c1af2682173d0c284366b9f766dd0eb18deceb1d736e4939306804c SHA512 c19de9be866874b5ee7e4f1b4dc98ea0734fa5a3b08ac2399581b756c3eb16aa81580c7bacb1e7f716974ede404ba5e5680cde3a3b03d8e3eb74da6412b646e8
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
index 37c73b4c41d9..eb2beb0f704b 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index c300fcdfe358..bc73a862be0a 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,5 +1,5 @@
 AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
 DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
-DIST pinentry-1.2.1.tar.bz2.sig 119 BLAKE2B 6a9fc12a09b5122bf531e875977f63fa7caa75d39afcb4e9a9a957df87ba0a6f6156ad9799cdde8625debe0b7c3cb9482616b0ab57c133ffd2f9120ddf47815f SHA512 b14525f6ace3d1fc3dc9e1173de8821fa2a960b870876beb10b98f41222378c1e3f4f79481f3f3854c1753e8dc9a7eb92862ffa583c7be0788ec25045a4e1176
+DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b
 EBUILD pinentry-1.2.1-r1.ebuild 2326 BLAKE2B a80f098eb330b21d7b6e9b1ac2fe00cf12eba8cc7d4fd047f2edcbe4fdb2c3d54ff74af1693370239a815cb24cde45ed90ef1425c94d2c2db731e8768e444a14 SHA512 95b3b22f54810ffbcf7401f30e08e7642f127cfd04c7c80a45f075b81c2916c5ed3865615e67c80c05931a15a41ad42627b3b34234d806f7eb21bd26b318c0e9
 MISC metadata.xml 452 BLAKE2B a2aef88d14b75ddb8f8cced6ee2dc1d0d66ac52ac5c686bd8d230bd9291146fa3fc0411682488e0a45c05b20640cf8b4093ee71a0ec60e02fe507dda2910c5fa SHA512 0517e56cd5cb905f4951205f4f7db6d01a14d28e1578612f91bfaee5dfc93a56eff4896201cf3c02f9ca02329b8597d6469187f60f429f7c5f6995fa0023aaf7
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 9158a24072cb..4bf9b5ce8325 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index c3d218afc0f6..e8f1bac3e71f 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -3,6 +3,6 @@ AUX nkf-2.1.5-python-ssize_t.patch 2102 BLAKE2B 4032c12fc124efe3c44c4fbf81c6b72b
 AUX nkf-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
 DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
-EBUILD nkf-2.1.5-r1.ebuild 2428 BLAKE2B 76a3ae5c85cad694f21f174b6c182dd6bd2b160f0243f14dc6d8cb0231d325f974fe4f9f68e76847188b472239ba5d2b3f95dc7928bcd7781ffa7caea160a2f0 SHA512 fc40cb311a1f0042a72aa2991bb1efe2c32e06487ef92d9f3877a5dee2c84df44b3a0f284ad42ecb0beef1b443e48a401e623f5a8ced80a8c4262267b48d1d77
+EBUILD nkf-2.1.5-r1.ebuild 2432 BLAKE2B aaa22659da89f8465dcfcd5ab08b65fb221a6663c4ee90b0feb2497f0f544d265c460e817bb743b74043b56548eecf94d1d4e00e0c140ed3021939f36ab68c18 SHA512 deeaf15b8322cc52c431b400626ee3424ea3acfc22e06cdf594638bc6ab22dc88cf87301b8ada5748b97a2c71e3088458e3ff29bf0d89b005e89ac7b62233a01
 EBUILD nkf-2.1.5.ebuild 2316 BLAKE2B b8e984fd5e3e58825a3cb3e7bb85b108c6b1b9c6065f1a708de96d9cd4298ee1384be2ea9a3b90910f4b15221b7805f7ca40cf460c3e2b49d818de4825ead53b SHA512 1e01b532207ad235645d573d052dc9d3f3a556c9d5f68822aa8ee37d6da314a55868c0d52907933a15652156562fa69fd66f947eb1d79b0f0a92e65a4d1c853e
 MISC metadata.xml 408 BLAKE2B b84991c18d84658969ef2b7ed339f908b4bc9e2c1e03167950bac4950a18a1aefdbd7f603f82e1858ac62b6c07fc6711fc1cf7b8a1a859c2e6c510833cc589a6 SHA512 3783846f3ebf23b12c22d23e213c3ee38cb92e39921165fc108ec8d0973d1c2d093d4119733dcc1f459409b7323a8b6b368e1642e98146524bee572078add284
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 095d49cf0515..eefdc0f710d5 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -29,11 +29,6 @@ BDEPEND="python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-python-ssize_t.patch
-	"${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch
-)
-
 src_unpack() {
 	use python && vcs-snapshot_src_unpack || default
 }
@@ -46,6 +41,9 @@ src_prepare() {
 	if use python; then
 		mv "${WORKDIR}"/${PY_P} NKF.python || die
 		eapply "${FILESDIR}"/${PN}-python.patch
+		eapply "${FILESDIR}"/${P}-python-ssize_t.patch
+		eapply "${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch
+
 		cd NKF.python || die
 		distutils-r1_src_prepare
 		cd - >/dev/null || die
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 5d3a539d7553..8246a67efeb2 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,7 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
 AUX uim-1.8.8-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX uim-Wconversion.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab068bf3f1b225ab5ff597008c017c6da54817bc4db18578c8654031b56afd149936f2825f803db959dad28636 SHA512 b193a7e689b955b966cb5f402336de0b96f23a9d9f831907863ddc4cbaf63080509f514ddc35a67f75d19c65bbfadbf4883b65ae83faa7c741cf7ec80ddf3f50
+AUX uim-clang-16-configure.patch 1229 BLAKE2B a1486cc71ae374646771f86a418c82ede7ac0d8143cdacb1982e264d7905bb7f3d467475308a2d75a78adeb338da2c4bd42f2010fab49b2167429e815b6dbcc2 SHA512 0475dc1d62234cf5fd539bcc331f0456ad11c904ce1444bbb47e5b0e5e37fae30a7a6d7abbebfbee1a4b433e3af419f878d23cb33df96190f0830161d1acaee1
 AUX uim-gentoo.patch 1310 BLAKE2B e0f4b85a210f8e041a98e8fddc55ea6e3a06d568ad357a1110b6191ee8ac2d0bcbda191c5702f8f24d82f1b878228bd046ee01c07e6211cc3ccb6dec3c21d7b5 SHA512 88f24a9d816f5e610412200dcabd5a9c51a74d5d3139c0afe9f8d3cddc8815d3dcaad0147acf76536c9180f0041fb1b288e391e17389a31c6b3eabaea6c0f314
 AUX uim-kde.patch 2507 BLAKE2B 81287532295af0e5f1235cc3fcea9b4b06c07d1c4377155f19a6e71622da6e398c133fdfb0a6fc3817bfbb9b61b047eabbea6fed8f01a68115a1050d81c9bc7b SHA512 562a09eb15617133dc9fb4ca8b6a855dd28af04f4c27de8c292a32849360f898de5252ef52ad9f1363e238d811346a9c3d19750b33d243bfb48f0c7dd606434d
 AUX uim-slibtool.patch 587 BLAKE2B b596fc54798b5366fa6b84370bf614551b82c74cac8adce7c5d5bbd755e83dd3d2e4f9b9ce5824811240946268467e7698acd04cdb7a2df078d617740766f880 SHA512 c02fde5c30a3f11a24cce1bc00f855b8a3ae3dcd09d2c6738ddf0f32795938cf359c04f275809d00f4439a96499a32d7c026b1c531df3656cbabad9a990529c5
@@ -11,6 +12,7 @@ AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663
 DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
 DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19 SHA512 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
 DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
+EBUILD uim-1.8.9-r1.ebuild 5914 BLAKE2B db3de815279e93d8229444bceb275f573e3c80e188dc08cd183cf7b7744672d0d11a6efac90c017c87dd4b5d4f7fb5e4c2c701a4bfc9a695389941bb7659d546 SHA512 912f29ce92f412664e99658f3d3e6bf870f7aa75e3b859a27f2946c62120fdb21305d18f14dcf5569c59aaee4a1f7784af4cbb0e6da9e97d2a9aa1fb08f7570f
 EBUILD uim-1.8.9.ebuild 5743 BLAKE2B 5e30bdb0715225944b347c7b352d8e811c9f4f78d8adae88ed279626780878853ad2a4d407981b0410e3f1848167c1a39d2241fff60b1ff3bfa4aa2ca337c0ea SHA512 d01fac3d2005461410d349e9c907e84dd775c15692a37426409351746bf834640db9bb16693da0365cb6bf5a2cf486de5a6e120b5a17b67f104133386ccae0f5
 EBUILD uim-1.8.9_pre20210103-r1.ebuild 6032 BLAKE2B f91321fe42c453c628b48212545e05c63ebf0a96c9dcdb42c1cab630a66d0bdb0d22b7e88775c0a7a327135245ddb7b360ae4058b5fea6c2878ff570b431a1a9 SHA512 73f950c16d9d399ed6fb3c205102feb0b01c768c54e4519d3daabfab1d1c1246d580316c217375b65dbfae35bf6cc2eec3d1fa18709c9630c5c2e9f05a43ddf9
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch b/app-i18n/uim/files/uim-clang-16-configure.patch
new file mode 100644
index 000000000000..46e3bac01534
--- /dev/null
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -0,0 +1,41 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
+ 	AC_RUN_IFELSE(
+ 		[AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
+ 		]])],
+ 		[AC_MSG_RESULT(yes)],
+--- a/m4/openssl.m4
++++ b/m4/openssl.m4
+@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version])
+ AC_RUN_IFELSE(
+ 	[AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <openssl/opensslv.h>
+ #define DATA "conftest.sslincver"
+@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check,
+ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+ AC_RUN_IFELSE(
+ 	[AC_LANG_SOURCE([[
++#include <stdlib.h>
+ #include <string.h>
++#include <openssl/crypto.h>
+ #include <openssl/opensslv.h>
+ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+ 	]])],
+@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); }
+ AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+ AC_LINK_IFELSE(
+ 	[AC_LANG_SOURCE([[
+-#include <openssl/evp.h>
+-int main(void) { SSLeay_add_all_algorithms(); }
++#include <openssl/crypto.h>
++int main(void) { OpenSSL_version_num(); }
+ 	]])],
+ 	[
+ 		AC_MSG_RESULT(yes)
diff --git a/app-i18n/uim/uim-1.8.9-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild
new file mode 100644
index 000000000000..5bc58c158713
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
+
+EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt5? ( X )
+	xft? ( X )"
+
+CDEPEND="X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+	anthy? ( app-i18n/anthy )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	expat? ( dev-libs/expat )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	kde? ( kde-frameworks/plasma:5 )
+	libedit? ( dev-libs/libedit )
+	libffi? ( dev-libs/libffi:= )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt5? (
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+	)
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+	!dev-scheme/sigscheme
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)"
+BDEPEND="gnome-base/librsvg
+	sys-devel/gettext
+	virtual/pkgconfig
+	kde? ( dev-util/cmake )
+	nls? ( dev-util/intltool )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kde.patch
+	"${FILESDIR}"/${PN}-slibtool.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-Wconversion.patch
+	"${FILESDIR}"/${PN}-xkb.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${PN}-clang-16-configure.patch
+)
+
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+	use nls || sed -i "/^if .*USE_NLS/,/^fi/d" configure.ac
+	# fix build with "-march=pentium4 -O2", bug #661806
+	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
+
+	# Fix build w/ Clang 16+ and >= openssl 1.1.x, tries to use
+	# SSLv2_method otherwise.
+	append-cppflags -DOPENSSL_NO_SSL2
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_enable kde kde5-applet)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt5)
+		$(use_with qt5 qt5-immodule)
+		_QMAKE5=$(qt5_get_bindir)/qmake
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--without-canna
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--enable-maintainer-mode
+		--without-prime
+		--disable-qt4-qt3support
+	)
+
+	if (use gtk || use gtk2) && use anthy; then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt5; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs || die
+		elisp-compile *.el || die
+		cd - >/dev/null || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	rm -f doc/Makefile*
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use X; then
+		docinto xim
+		dodoc xim/README*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+		docinto emacs
+		dodoc emacs/README*
+	fi
+
+	if use ncurses; then
+		docinto fep
+		dodoc fep/README*
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+	if use emacs; then
+		elisp-site-regen
+		elog
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b393c38691f0..46196ec9b59c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 7605aef94e09..fd5da3e4ad9b 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -5,7 +5,7 @@ DIST ghostscript-9.56.1.tar.xz 62589232 BLAKE2B c0457c98e3f13047d9015d9d1415e293
 DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
 DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
 DIST ghostscript-gpl-9.56.1-patchset-01.tar.xz 2960 BLAKE2B c43f00dce6d1aada40c8e628a1032afe1bf9789b3ad69d9dac2ae94ba040a380c01884173f0ec05ba59240421dc5a53cae45adbbb13dccc9c366b1a6dea7794f SHA512 a444c687ab0f2c3f945f6854991799c2aeca3c410eba4bc53ad7bcc68b0ba8d187c09baebabb6581144781d35b4f2d4e29ff625ca55b0f640a033ba27e993f30
-EBUILD ghostscript-gpl-10.0.0.ebuild 5059 BLAKE2B 5defd15d00d94ec533c971c6e44fe2fa48ca0d8f2b6787cd15420222ee313283ada5c04a896251cafe325877415d89a3335f843d6ac3772b58dc603118ef088a SHA512 e1745848d00a19d6b5bc53f7c399e062a85d7d238658112b65764f0f958d57f39b463337669f05a41f72c79c02fe6188f530931273ded429771e6072e8652559
+EBUILD ghostscript-gpl-10.0.0-r1.ebuild 5291 BLAKE2B 3c04a081dd3dae4ef35d8e0969f6f49f0a407f15a7866ab555fbab056934d29c6c8412ed617085d4838891f43b5445a48470e3b81363e833013d4f3cb17b3bc2 SHA512 2de0aef161c002cfbed4066c780ba32fdc0bdcc727d96e89dd7b78dd5c2f192967feabaaa5dfd4ef005ae9ca6225c016f07ad2bb8e007a7e2a893c95894691cc
 EBUILD ghostscript-gpl-9.55.0-r2.ebuild 5160 BLAKE2B 3a0c5c1e5652b34ce81b381532fc10116ac320f4ba83607f25ba4935f4de72e98a4bc038bd89189da8a59c913775fc1c6377afd0523332c0642a26d40db652cb SHA512 b7318f81333290182e3f1d190c62580eee1c2552ba97433c3caace56565a06d9a0782cf984f940d58f47981c5ed3ddddcfeaf69ec1c456f93ed9171a7ab63445
 EBUILD ghostscript-gpl-9.56.1-r3.ebuild 5138 BLAKE2B e7f0bb55c6d8d5e653e120cff13720c26e3aab25af387e2b8c7b2b4d75af4bf40e390f62a5d1c6a437a63f16a7defb23693a18ea9907979fa6e7d33cb26c6ffd SHA512 41e3e03cb6f0d9ef90d0785c9add1125615effb883a7361e4f9fb1aba51a150ef86d47ec5c510a1b70e4ee3e61dc2f36a1b9e9cb8d71a2ff0412ea4c9a2b89f7
 MISC metadata.xml 767 BLAKE2B ff690e8acf31dc71da9c563b45316398d4dd74c2c7690df1a2ad0148ac459aead548ac0ed8e203fe8f6d1a375a91807d08d5c053c702f1551a2f32b66444ae74 SHA512 3edb3742706b1cb89ea09428ddcab3959d6dd435e92957cd2982e074acd449560e5abf41af29029593fff280ca02ad909ec05fd83e0d9fc690f5a9227804f3b9
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r1.ebuild
index 131bd53e91c0..6a6286bd995e 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r1.ebuild
@@ -169,8 +169,13 @@ src_install() {
 	cd "${S}/ijs" || die
 	emake DESTDIR="${D}" install
 
+	# Sometimes the upstream versioning deviates from the tarball(!)
+	# bug #844115#c32
+	local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die)
+	my_gs_version=${my_gs_version##*/}
+
 	# Install the CMaps from poppler-data properly, bug #409361
-	dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${PV}/Resource/CMap
+	dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap
 
 	if ! use static-libs; then
 		find "${ED}" -name '*.la' -delete || die
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index b8a9c575285b..39a05cc959e1 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index a3a9d513be5a..9048f93be58f 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -4,5 +4,5 @@ AUX gtkada-2021-uninstall.patch 398 BLAKE2B 2f5becba847173f5e780ca712d3fa3a8180f
 DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
 DIST gtkada-22.0.0.tar.gz 6070022 BLAKE2B ff5d13831acf839290923871a80a5edfff7d39c689175d528e50bfcae4f120381d8cc74a58f2d843e0aba6fd7c23bb43a34db279b0af9d7c9cc4f4bc9615b179 SHA512 abcc6152b0dac66b29ef791527bf6e8f0e1359e5a374732824561ca47d9b1951c168b9b27dbc1f24e496ef5afe6c68020edc9d374faf0495118630ef08a5c448
 EBUILD gtkada-2021.ebuild 1404 BLAKE2B cbfae8b43653108baca7d0d7dcf91311687531d73065bfce0c9b0d7902358e75b85c5c8dd08e88034bcb5f2e422954d3864f1315784befedbefe048e029832fe SHA512 e31622e064b4252a591160a5b0756fcec0701bcc02990d901216634fc8c6cf142cbf9be11e6bae1ed57b4f69a4cdd19073dcf0e9286405fef64606274a152c8f
-EBUILD gtkada-22.0.0.ebuild 1190 BLAKE2B d1aac875a41602b4524a9e1cad26e95dcf2d03305509304cd714aa4634539f72fb00de5e5b1b78df7f9ce542d0a9c5f08436b9881a5c5c68c40fa86956fcfede SHA512 b8855baaced7dce5f721c09bc8d712f0c867765c84706f32c1a7df3df4c62ca08ad6ae994bd6795c1b0826277186b98831f787637ae2e3ddfaf3c67cb537f6dc
+EBUILD gtkada-22.0.0.ebuild 1201 BLAKE2B 2b8dd609aaf0e9b79a6b3cb9c923bfe1ea87f174cc78d5beb7719890c88609769983c22ca72ae9908fb4dc06e863d3b448e49abce7e1c178cb36026ada39297d SHA512 5226a672082a90102264faf1ce07bb0b9121e2bf1452c6b2742fc318ac313d75341cc8f30e4e2d72db4030a3ce67fc23084a8398a4a5994e22ad3c1bc7e3b7a9
 MISC metadata.xml 609 BLAKE2B 999aae7c908ca80ba44e4183221ef3acd23d29dae2e4c13a5a930ecbae5cff34f8dbd3705953aced2a03a378d41465294d3960fcdb65384cd5b9a19a729e017e SHA512 5ea2cef4aec361935f1b3cf27572e2c062e56ff76aebf952fcc550176755b899615a5b19cc20b8c4548d47bf09f41b168f9ac985c40799e68982acd1354cb817
diff --git a/dev-ada/gtkada/gtkada-22.0.0.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
index 6cb33f81492e..22db03d950c3 100644
--- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.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
 
-ADA_COMPAT=( gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} gcc_12_2_0 )
 inherit ada autotools multiprocessing
 
 DESCRIPTION="A complete Ada graphical toolkit"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3bdfc2912631..4ab9c189e7be 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/animal-sniffer-annotations/Manifest b/dev-java/animal-sniffer-annotations/Manifest
index f0f1c0a0920a..350daa388b32 100644
--- a/dev-java/animal-sniffer-annotations/Manifest
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST animal-sniffer-parent-1.15.tar.gz 77766 BLAKE2B 6d99959c457d032e69f5a5109dc9ae80660db0a3fa34e2ebfdd7e3941a33e19f0078a05f3c6d561760a89584b2826bca6ef40dd7f5ea943b32ae43a4f2ed403b SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1
-EBUILD animal-sniffer-annotations-1.15-r1.ebuild 654 BLAKE2B 89caf59ab9ea56307ef9894ba5d3e297466a5baf6251d1f16bb56659d8eba8ca58189204ada14137e015358a0332fb2616c877f6d68950ddda9a71ce8223816e SHA512 e3388314a81b0e13c35c2ac338d2a1dbe8df6f243209a63c73a6b7fcb9a4f607b160debbe51f6f73e7ec004c4a0adf10126c47c2a4b50753c1a8955b460d8d7a
+EBUILD animal-sniffer-annotations-1.15-r1.ebuild 715 BLAKE2B 4e7d2adc63c32ba495f0f1fbae3fde8da81dba83b9e1169665f0d926ee499202f2ed41eee1fe4c35b0ff79afa20205d42be31a531cb3d6545547b1d719faf58b SHA512 bc9673afd0faf77510ccb8e569d9dbf7ffde62840bf18a7be442b35bbc549f1856edc35299af8fd263c0e66bd03ea4d4d200d3a69bea6e20340b05c716a2e0af
 MISC metadata.xml 325 BLAKE2B 96e92a307063c6d997316abf0b9395c65445907c3141313f07aa336eed839cb909f624bce9b67d6960c7703b79537e136beaf01025d7cf39dcbbe6262a0093f8 SHA512 032db77bc61e5e86c039cb49faa6d50363e4b94c0b14b2ef5192e8ee6fdba3592616e1970ad6f87d662ad01b187627e7b6fb6774664839fa549e76aa3e9bbe7b
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
index 12973df6f557..265decdfdc6f 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 MY_PN="${PN%-annotations}"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.codehaus.mojo:animal-sniffer-annotations:1.15"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index ed3c6749043b..b25108c47ed1 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,4 +1,6 @@
 AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
 DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
+DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
+EBUILD commons-compress-1.21-r1.ebuild 4317 BLAKE2B 61a9348d45a6c8c6f7822079aa5f8185b46924d29ef15c014491d63a5aa1a2a5e4b822f9c410161196c71873072b5455ce8f9b6f3529656e04c1490cff82016b SHA512 496391fdcc5f31dee2769babf43ce6d00d81d15b5bcfa477ea30893dea3ca8bef03822fdf0df4185fbfbbb9a0b7e2528752ebfa3a540d9bb2ab86a1a23563fab
 EBUILD commons-compress-1.21.ebuild 2369 BLAKE2B 64f03ba92636ab8f747552423d4745232649e7a13486c98737b80d330c8bf3e7473794262b50deca2c182ac09241a60c9ba1418fd1c1dbfdfd20f1eb413e8dd7 SHA512 650f15362bfcc8ff7376d39264d54c5bee8a16faa4052f06323faff97e4df5c3464af9f69c95bc8f172613cd75e2c0a733858f69a6963d7698e72fb39af3bd47
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
new file mode 100644
index 000000000000..a5870641d1c2
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-compress:1.21"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API for working with archive files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# asm:asm:3.2 -> !!!groupId-not-found!!!
+# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.5:0
+# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0
+# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+
+CP_DEPEND="
+	dev-java/asm:9
+	dev-java/brotli-dec:0
+	dev-java/xz-java:0
+	dev-java/zstd-jni:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.osgi:osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? com.github.marschall:memoryfilesystem:2.1.0 -> >=dev-java/memoryfilesystem-2.3.0:0
+# test? javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> >=dev-java/felix-framework-7.0.5:0
+# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
+# test? org.mockito:mockito-core:3.11.1 -> >=dev-java/mockito-4.6.1:4
+# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!!
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	dev-java/osgi-core:0
+	test? (
+		dev-java/felix-framework:0
+		dev-java/hamcrest:0
+		dev-java/javax-inject:0
+		dev-java/memoryfilesystem:0
+		dev-java/mockito:4
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asm7+.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
+JAVA_CLASSPATH_EXTRA="osgi-core"
+JAVA_ENCODING="iso-8859-1"
+JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="memoryfilesystem,javax-inject,junit-4,felix-framework,hamcrest,mockito-4,slf4j-api"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	# error: package org.ops4j.pax.exam does not exist
+	# removing it costs 2 tests
+	rm src/test/java/org/apache/commons/compress/OsgiITest.java || die
+
+	# java.io.FileNotFoundException: couldn't find zstandard.testdata.zst
+	# pom.xml lines 420-422
+	tar xf src/test/resources/zstd-tests.tar \
+		-C src/test/resources || die "cannot unpack zstd-tests.tar"
+
+	# pom.xml lines 518-520
+	tar xjf src/test/resources/zip64support.tar.bz2 \
+		-C src/test/resources || die "cannot unpack zip64support.tar.bz2"
+
+	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/zstd-jni/" )
+}
+
+JAVA_TEST_EXCLUDES=(
+	# No runnable methods
+	org.apache.commons.compress.archivers.TestArchiveStreamProvider
+	org.apache.commons.compress.compressors.TestCompressorStreamProvider
+
+	# fails without useful message
+	org.apache.commons.compress.compressors.DetectCompressorTestCase # has 8 tests
+
+	# These tests pass but they prevent printing test messages::
+#	org.apache.commons.compress.compressors.pack200.Pack200UtilsTest # has 2 tests
+#	org.apache.commons.compress.compressors.FramedSnappyTestCase # has 5 tests
+#	org.apache.commons.compress.compressors.XZTestCase # has 4 tests
+#	org.apache.commons.compress.compressors.Pack200TestCase # has 15 tests
+#	org.apache.commons.compress.harmony.pack200.tests.PackingOptionsTest # has 12 tests
+#	org.apache.commons.compress.harmony.pack200.tests.ArchiveTest # has 9 tests
+#	org.apache.commons.compress.harmony.unpack200.tests.ArchiveTest # has 13 tests
+)
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 72b23f7ace0b..c5db826e39e9 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,4 +1,8 @@
 AUX 3.3.1-r1-no-android.patch 590 BLAKE2B 1fd2493bc0208516421c31adead309adfaad4b30a137739a082588f38b8d85933258718aca277f8f863f468c2775ec1c4ce107948b7d10cc8a4fc8b07cb47383 SHA512 ba9fcb6c5922869511f421b9f1c005c7656840762fac0d9aecf87b5db615dd181bae24d9ce491191c2a7ee8a863ebf14aaf42f94e40d40d8f2192ad4296ece7f
+AUX easymock-2.5.5-nameClash.patch 7264 BLAKE2B 9f94d1f3d87fbe5ee90695370140ab59c92ce2e917e23c442455c02021f6d51fa565b4d7abee575a75918e630b59709588d0982530c3193d3301636f4dee113b SHA512 a4d64a9680a8b55da9b444fc6255b5d5179268b95cb050ee22a1307b0d2e531288d531914aa7cb79ed4afb35a274b21bb6814f9dfa9de1643219b398c4adaed3
+AUX easymock-2.5.5-tests2nameClash.patch 16138 BLAKE2B 8d93149e3415c315a98a82cab7d1d212ea39090b9558bd8b92d55b5e8f3e2777908a53a0f61c9db54ecfa5a683cb38f59bc1bd30045a128c3ae88c57f7c9d4d5 SHA512 fe58f8373757b539ef7be9f5907a448b5e8fb21546215ec3c978a658f283c5aa4f06ebc15c5d6518a37beb480ea12620654023bfa8614c2f797418dbfad8d1d0
+DIST easymock-2.5.2.tar.gz 100112 BLAKE2B 2952aad1a88b169413152e8fa63eaba85767d93ccd8535e309cb647b90ad86695da59c394d1199abfb6f1c624913b2546f326ae5a68092261968d734d2018c5c SHA512 0343815f74258739ac60e1ef2fe72a0e9ce0e1b6ecd4f14d657d7da2a10523e24df5160533b0d75e87ffa0322a3477ec6823b257fe5968929d55dee9dfa68267
 DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
-EBUILD easymock-3.3.1-r1.ebuild 1979 BLAKE2B 2ab812d03cb65011e77c86e61b40ee8bd08f2a13b509befef1c7fd5a84eb874e00561a947aafbde1659e0f263a58d0e5ad79761257237e9f7ff529921bcbedad SHA512 c4015af4854cd0543d1b0a178a0ceb983e26ca6479a5a902b03aa52d485651c98f582f3d2f653b4adf7db10155925a3116f94e5962dd593c26c421103d3ed935
+EBUILD easymock-2.5.2.ebuild 1839 BLAKE2B 59a411692b6107d12e0dce4507a587064683ab55c5c935ab968ec2ae3f9341513f1ade4b4b4505ee0e264937aa8c36d9fc90b2c5285c2aa88d2a69d661f7be2a SHA512 78cba8008bb6c95a4d81871471ff7d320ad1689edc6eb2d32331c1155788f571be2d82baddc9fd6b1a987d7f2e129996a9e338b3c4f9dcbd00e205639fcb294c
+EBUILD easymock-3.3.1-r1.ebuild 1979 BLAKE2B c7a45a9824b47b5de1eccfcee1f9c1e7b44a0383a48d31358381b22084348b23005d88f040624b378d445fc37932cf4ab44f0be72202ded34d246dcc7939c8e3 SHA512 fe6d6076f6cd4957274cccf802cc2f67cd47d5b2e46e2a6defd17d18cb39a9f0d7b344571ca0173e222cba0a08f5ae74fa165bd91e53a39d404f2988eff56f31
 MISC metadata.xml 487 BLAKE2B a24b4adf994d9fe7aa7db824ee499c476d971c7d4265a6a502644d0dd498e87bbecf1b50fa3a0b53a27e1b7d9e91a1c67bafaa783d173435228f0c36a740df12 SHA512 dba708a8b66d470df4378efc4e0ceba8bd896132f3d086f7751ca9409a47e04a24fc5f98255264b44711efd960810bf491c657975acec72bfb863ba603bc64ee
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild
new file mode 100644
index 000000000000..44d36338c51a
--- /dev/null
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz --slot 2.5 --keywords "~amd64" --ebuild easymock-2.5.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.easymock:easymock:2.5.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="https://easymock.org"
+SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/easymock-2.5.5-nameClash.patch"
+	"${FILESDIR}/easymock-2.5.5-tests2nameClash.patch"
+)
+
+S="${WORKDIR}/easymock-easymock-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default # https://bugs.gentoo.org/780585
+	# 1) testGetInstance(org.easymock.tests2.EasyMockPropertiesTest)
+	# java.lang.AssertionError: expected:<1> but was:<null>
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testGetInstance()/i @Ignore' \
+		-i src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java || die
+
+	# 2) testPrimitiveDeprecated(org.easymock.tests2.CaptureTest)
+	# java.lang.AssertionError:
+	# 3) testPrimitiveVsObject(org.easymock.tests2.CaptureTest)
+	# java.lang.AssertionError:
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testPrimitiveDeprecated()/i @Ignore' \
+		-e '/testPrimitiveVsObject()/i @Ignore' \
+		-i src/test/java/org/easymock/tests2/CaptureTest.java || die
+}
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 8a7db3b2235f..0193c3bb5f12 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.easymock:easymock:3.3.1"
diff --git a/dev-java/easymock/files/easymock-2.5.5-nameClash.patch b/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
new file mode 100644
index 000000000000..7a4f0d92ab64
--- /dev/null
+++ b/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
@@ -0,0 +1,230 @@
+--- a/src/main/java/org/easymock/EasyMock.java	Thu Feb 23 10:32:43 2012 +0100
++++ b/src/main/java/org/easymock/EasyMock.java	Thu Feb 23 11:25:46 2012 +0100
+@@ -1452,81 +1452,200 @@
+     
+     /**
+      * Expect any object but captures it for later use.
+-     *  
+-     * @param <T> Type of the captured object
+-     * @param captured Where the parameter is captured
++     *
++     * @param <T>
++     *            Type of the captured object
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>null</code>
+      */
+-    public static <T> T capture(Capture<T> captured) {
++    public static <T> T capture(final Capture<T> captured) {
+         reportMatcher(new Captures<T>(captured));
+         return null;
+     }
+-    
++
++    /**
++     * Expect any boolean but captures it for later use.
++     *
++     * @param captured
++     *            Where the parameter is captured
++     * @return <code>false</code>
++     */
++    public static boolean captureBoolean(final Capture<Boolean> captured) {
++        reportMatcher(new Captures<Boolean>(captured));
++        return false;
++    }
++
++//    /**
++//     * Expect any boolean but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static boolean capture(final Capture<Boolean> captured) {
++//        return captureBoolean(captured);
++//    }
++
+     /**
+      * Expect any int but captures it for later use.
+-     *  
+-     * @param captured Where the parameter is captured
++     *
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>0</code>
+      */
+-    public static int capture(Capture<Integer> captured) {
++    public static int captureInt(final Capture<Integer> captured) {
+         reportMatcher(new Captures<Integer>(captured));
+         return 0;
+     }
+-    
++//    /**
++//     * Expect any int but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static int capture(final Capture<Integer> captured) {
++//        return captureInt(captured);
++//    }
++
+     /**
+      * Expect any long but captures it for later use.
+-     *  
+-     * @param captured Where the parameter is captured
++     *
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>0</code>
+      */
+-    public static long capture(Capture<Long> captured) {
++    public static long captureLong(final Capture<Long> captured) {
+         reportMatcher(new Captures<Long>(captured));
+         return 0;
+     }
+-    
++//    /**
++//     * Expect any long but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static long capture(final Capture<Long> captured) {
++//        return captureLong(captured);
++//    }
++
+     /**
+      * Expect any float but captures it for later use.
+-     *  
+-     * @param captured Where the parameter is captured
++     *
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>0</code>
+      */
+-    public static float capture(Capture<Float> captured) {
++    public static float captureFloat(final Capture<Float> captured) {
+         reportMatcher(new Captures<Float>(captured));
+         return 0;
+     }
+-    
++//    /**
++//     * Expect any float but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static float capture(final Capture<Float> captured) {
++//        return captureFloat(captured);
++//    }
++
+     /**
+      * Expect any double but captures it for later use.
+-     *  
+-     * @param captured Where the parameter is captured
++     *
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>0</code>
+      */
+-    public static double capture(Capture<Double> captured) {
++    public static double captureDouble(final Capture<Double> captured) {
+         reportMatcher(new Captures<Double>(captured));
+         return 0;
+     }
++//    /**
++//     * Expect any double but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static double capture(final Capture<Double> captured) {
++//        return captureDouble(captured);
++//    }
+ 
+     /**
+      * Expect any byte but captures it for later use.
+-     *  
+-     * @param captured Where the parameter is captured
++     *
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>0</code>
+      */
+-    public static byte capture(Capture<Byte> captured) {
++    public static byte captureByte(final Capture<Byte> captured) {
+         reportMatcher(new Captures<Byte>(captured));
+         return 0;
+     }
+-    
++//    /**
++//     * Expect any byte but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static byte capture(final Capture<Byte> captured) {
++//        return captureByte(captured);
++//    }
++
+     /**
+      * Expect any char but captures it for later use.
+-     *  
+-     * @param captured Where the parameter is captured
++     *
++     * @param captured
++     *            Where the parameter is captured
+      * @return <code>0</code>
+      */
+-    public static char capture(Capture<Character> captured) {
++    public static char captureChar(final Capture<Character> captured) {
+         reportMatcher(new Captures<Character>(captured));
+         return 0;
+     }
++//    /**
++//     * Expect any char but captures it for later use.
++//     *
++//     * @param captured
++//     *            Where the parameter is captured
++//     * @return <code>0</code>
++//     *
++//     * @deprecated Because of harder erasure enforcement, doesn't compile in
++//     *             Java 7
++//     */
++//    @Deprecated
++//    public static char capture(final Capture<Character> captured) {
++//        return captureChar(captured);
++//    }
+     
+     /**
+      * Switches the given mock objects (more exactly: the controls of the mock
diff --git a/dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch b/dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch
new file mode 100644
index 000000000000..23ed754e3854
--- /dev/null
+++ b/dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch
@@ -0,0 +1,420 @@
+--- a/src/test/java/org/easymock/tests2/CaptureTest.java	Thu Feb 23 10:32:43 2012 +0100
++++ b/src/test/java/org/easymock/tests2/CaptureTest.java	Thu Feb 23 11:25:46 2012 +0100
+@@ -1,12 +1,12 @@
+-/*
+- * Copyright 2003-2009 OFFIS, Henri Tremblay
+- * 
++/**
++ * Copyright 2001-2011 the original author or authors.
++ *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+- * 
++ *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+- * 
++ *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@@ -27,10 +27,13 @@
+ import org.junit.Before;
+ import org.junit.Test;
+ 
++/**
++ * @author Henri Tremblay
++ */
+ public class CaptureTest {
+ 
+     public static class A {
+-        public String foo(IMethods methods) {
++        public String foo(final IMethods methods) {
+             return methods.oneArg(2);
+         }
+     }
+@@ -42,16 +45,16 @@
+     @After
+     public void tearDown() throws Exception {
+     }
+-    
+-    private Capture<Integer> testCaptureType(CaptureType type) {
+-        IMethods mock = createMock(IMethods.class);
+-        Capture<Integer> captured = new Capture<Integer>(type);
+-                
+-        expect(mock.oneArg(capture(captured))).andReturn("1");
++
++    private Capture<Integer> testCaptureType(final CaptureType type) {
++        final IMethods mock = createMock(IMethods.class);
++        final Capture<Integer> captured = new Capture<Integer>(type);
++
++        expect(mock.oneArg(captureInt(captured))).andReturn("1");
+         expect(mock.oneArg(anyInt())).andReturn("1");
+-        expect(mock.oneArg(capture(captured))).andReturn("2").times(2);
+-        mock.twoArgumentMethod(capture(captured), eq(5));
+-        mock.twoArgumentMethod(capture(captured), capture(captured));
++        expect(mock.oneArg(captureInt(captured))).andReturn("2").times(2);
++        mock.twoArgumentMethod(captureInt(captured), eq(5));
++        mock.twoArgumentMethod(captureInt(captured), captureInt(captured));
+ 
+         replay(mock);
+ 
+@@ -66,28 +69,28 @@
+ 
+         return captured;
+     }
+-    
++
+     @Test
+     public void testCaptureFirst() {
+-        Capture<Integer> captured = testCaptureType(CaptureType.FIRST);
++        final Capture<Integer> captured = testCaptureType(CaptureType.FIRST);
+         assertEquals(0, (int) captured.getValue());
+     }
+ 
+     @Test
+     public void testCaptureLast() {
+-        Capture<Integer> captured = testCaptureType(CaptureType.LAST);
++        final Capture<Integer> captured = testCaptureType(CaptureType.LAST);
+         assertEquals(7, (int) captured.getValue());
+     }
+ 
+     @Test
+     public void testCaptureAll() {
+-        Capture<Integer> captured = testCaptureType(CaptureType.ALL);
++        final Capture<Integer> captured = testCaptureType(CaptureType.ALL);
+         assertEquals(Arrays.asList(0, 2, 3, 4, 6, 7), captured.getValues());
+     }
+ 
+     @Test
+     public void testCaptureNone() {
+-        Capture<Integer> captured = testCaptureType(CaptureType.NONE);
++        final Capture<Integer> captured = testCaptureType(CaptureType.NONE);
+         assertFalse(captured.hasCaptured());
+     }
+ 
+@@ -96,11 +99,10 @@
+ 
+     @Test
+     public void testCaptureRightOne() {
+-        Capture<String> captured = new Capture<String>();
+-        IMethods mock = createMock(IMethods.class);
++        final Capture<String> captured = new Capture<String>();
++        final IMethods mock = createMock(IMethods.class);
+ 
+-        expect(mock.oneArg(and(eq("test"), capture(captured)))).andReturn(
+-                "answer1");
++        expect(mock.oneArg(and(eq("test"), capture(captured)))).andReturn("answer1");
+         expect(mock.oneArg("a")).andReturn("answer2");
+ 
+         replay(mock);
+@@ -114,10 +116,11 @@
+         verify(mock);
+     }
+ 
++    @SuppressWarnings("deprecation")
+     @Test
+     public void testPrimitiveVsObject() {
+-        Capture<Integer> capture = new Capture<Integer>();
+-        IMethods mock = createMock(IMethods.class);
++        final Capture<Integer> capture = new Capture<Integer>();
++        final IMethods mock = createMock(IMethods.class);
+ 
+         expect(mock.oneArg(capture(capture))).andReturn("answer");
+         expect(mock.oneArg((Integer) capture(capture))).andReturn("answer");
+@@ -135,11 +138,10 @@
+ 
+     @Test
+     public void testAnd() {
+-        Capture<String> captured = new Capture<String>();
+-        IMethods mock = createMock(IMethods.class);
++        final Capture<String> captured = new Capture<String>();
++        final IMethods mock = createMock(IMethods.class);
+ 
+-        expect(mock.oneArg(and(capture(captured), eq("test")))).andReturn(
+-                "answer");
++        expect(mock.oneArg(and(capture(captured), eq("test")))).andReturn("answer");
+ 
+         replay(mock);
+ 
+@@ -148,17 +150,19 @@
+ 
+         verify(mock);
+     }
+-    
++
++    @SuppressWarnings("deprecation")
+     @Test
+-    public void testPrimitive() {
+-        Capture<Integer> captureI = new Capture<Integer>();
+-        Capture<Long> captureL = new Capture<Long>();
+-        Capture<Float> captureF = new Capture<Float>();
+-        Capture<Double> captureD = new Capture<Double>();
+-        Capture<Byte> captureB = new Capture<Byte>();
+-        Capture<Character> captureC = new Capture<Character>();
++    public void testPrimitiveDeprecated() {
++        final Capture<Integer> captureI = new Capture<Integer>();
++        final Capture<Long> captureL = new Capture<Long>();
++        final Capture<Float> captureF = new Capture<Float>();
++        final Capture<Double> captureD = new Capture<Double>();
++        final Capture<Byte> captureB = new Capture<Byte>();
++        final Capture<Character> captureC = new Capture<Character>();
++        final Capture<Boolean> captureBool = new Capture<Boolean>();
+ 
+-        IMethods mock = createMock(IMethods.class);
++        final IMethods mock = createMock(IMethods.class);
+ 
+         expect(mock.oneArg(capture(captureI))).andReturn("answerI");
+         expect(mock.oneArg(capture(captureL))).andReturn("answerL");
+@@ -166,6 +170,7 @@
+         expect(mock.oneArg(capture(captureD))).andReturn("answerD");
+         expect(mock.oneArg(capture(captureB))).andReturn("answerB");
+         expect(mock.oneArg(capture(captureC))).andReturn("answerC");
++        expect(mock.oneArg(capture(captureBool))).andReturn("answerZ");
+ 
+         replay(mock);
+ 
+@@ -175,6 +180,7 @@
+         assertEquals("answerD", mock.oneArg(4.0));
+         assertEquals("answerB", mock.oneArg((byte) 5));
+         assertEquals("answerC", mock.oneArg((char) 6));
++        assertEquals("answerZ", mock.oneArg(true));
+ 
+         assertEquals(1, captureI.getValue().intValue());
+         assertEquals(2l, captureL.getValue().longValue());
+@@ -182,19 +188,60 @@
+         assertEquals(4.0, captureD.getValue().doubleValue(), 0.0);
+         assertEquals((byte) 5, captureB.getValue().byteValue());
+         assertEquals((char) 6, captureC.getValue().charValue());
+-        
++        assertEquals(true, captureBool.getValue().booleanValue());
++
+         verify(mock);
+     }
+-    
++
++    @Test
++    public void testPrimitive() {
++        final Capture<Integer> captureI = new Capture<Integer>();
++        final Capture<Long> captureL = new Capture<Long>();
++        final Capture<Float> captureF = new Capture<Float>();
++        final Capture<Double> captureD = new Capture<Double>();
++        final Capture<Byte> captureB = new Capture<Byte>();
++        final Capture<Character> captureC = new Capture<Character>();
++        final Capture<Boolean> captureBool = new Capture<Boolean>();
++
++        final IMethods mock = createMock(IMethods.class);
++
++        expect(mock.oneArg(captureInt(captureI))).andReturn("answerI");
++        expect(mock.oneArg(captureLong(captureL))).andReturn("answerL");
++        expect(mock.oneArg(captureFloat(captureF))).andReturn("answerF");
++        expect(mock.oneArg(captureDouble(captureD))).andReturn("answerD");
++        expect(mock.oneArg(captureByte(captureB))).andReturn("answerB");
++        expect(mock.oneArg(captureChar(captureC))).andReturn("answerC");
++        expect(mock.oneArg(captureBoolean(captureBool))).andReturn("answerZ");
++
++        replay(mock);
++
++        assertEquals("answerI", mock.oneArg(1));
++        assertEquals("answerL", mock.oneArg(2l));
++        assertEquals("answerF", mock.oneArg(3.0f));
++        assertEquals("answerD", mock.oneArg(4.0));
++        assertEquals("answerB", mock.oneArg((byte) 5));
++        assertEquals("answerC", mock.oneArg((char) 6));
++        assertEquals("answerZ", mock.oneArg(true));
++
++        assertEquals(1, captureI.getValue().intValue());
++        assertEquals(2l, captureL.getValue().longValue());
++        assertEquals(3.0f, captureF.getValue().floatValue(), 0.0);
++        assertEquals(4.0, captureD.getValue().doubleValue(), 0.0);
++        assertEquals((byte) 5, captureB.getValue().byteValue());
++        assertEquals((char) 6, captureC.getValue().charValue());
++        assertEquals(true, captureBool.getValue().booleanValue());
++
++        verify(mock);
++    }
++
+     @Test
+     public void testCapture() {
+-        Capture<String> capture = new Capture<String>();
++        final Capture<String> capture = new Capture<String>();
+         assertFalse(capture.hasCaptured());
+         try {
+             capture.getValue();
+             fail("Should not be allowed");
+-        }
+-        catch(AssertionError e) {
++        } catch (final AssertionError e) {
+             assertEquals("Nothing captured yet", e.getMessage());
+         }
+         assertEquals("Nothing captured yet", capture.toString());
+@@ -207,29 +254,26 @@
+         try {
+             capture.getValue();
+             fail();
+-        }
+-        catch(AssertionError e) {
++        } catch (final AssertionError e) {
+             assertEquals("Nothing captured yet", e.getMessage());
+         }
+-        
++
+         capture.setValue(null);
+         assertTrue(capture.hasCaptured());
+         assertNull(capture.getValue());
+         assertEquals("null", capture.toString());
+     }
+-    
++
+     @Test
+     public void testCaptureMultiple() {
+-        Capture<String> capture = new Capture<String>(CaptureType.ALL);
++        final Capture<String> capture = new Capture<String>(CaptureType.ALL);
+         capture.setValue("a");
+         capture.setValue("b");
+         try {
+             capture.getValue();
+             fail();
+-        } catch (AssertionError e) {
+-            assertEquals(
+-                    "More than one value captured: " + capture.getValues(), e
+-                            .getMessage());
++        } catch (final AssertionError e) {
++            assertEquals("More than one value captured: " + capture.getValues(), e.getMessage());
+         }
+         assertEquals(Arrays.asList("a", "b"), capture.getValues());
+     }
+@@ -237,30 +281,26 @@
+     @Test
+     public void testCapture_2617107() {
+ 
+-        IMethods mock = createMock(IMethods.class);
++        final IMethods mock = createMock(IMethods.class);
+ 
+-        Capture<String> cap1 = new Capture<String>();
+-        Capture<String> cap2 = new Capture<String>();
+-        Capture<String> cap3 = new Capture<String>();
+-        Capture<String> cap4 = new Capture<String>();
++        final Capture<String> cap1 = new Capture<String>();
++        final Capture<String> cap2 = new Capture<String>();
++        final Capture<String> cap3 = new Capture<String>();
++        final Capture<String> cap4 = new Capture<String>();
+ 
+-        mock.simpleMethodWithArgument(and(isA(String.class),
+-                capture(cap1)));
+-        mock.simpleMethodWithArgument(and(isA(String.class),
+-                capture(cap2)));
+-        mock.simpleMethodWithArgument(and(isA(String.class),
+-                capture(cap3)));
+-        mock.simpleMethodWithArgument(and(isA(String.class),
+-                capture(cap4)));
++        mock.simpleMethodWithArgument(and(isA(String.class), capture(cap1)));
++        mock.simpleMethodWithArgument(and(isA(String.class), capture(cap2)));
++        mock.simpleMethodWithArgument(and(isA(String.class), capture(cap3)));
++        mock.simpleMethodWithArgument(and(isA(String.class), capture(cap4)));
+ 
+         replay(mock);
+ 
+         final String[] s = { "one", "two", "three", "four" };
+ 
+-        for (int i = 0; i < s.length; i++) {
+-            mock.simpleMethodWithArgument(s[i]);
++        for (final String element : s) {
++            mock.simpleMethodWithArgument(element);
+         }
+-        
++
+         assertEquals("one", cap1.getValue());
+         assertEquals("two", cap2.getValue());
+         assertEquals("three", cap3.getValue());
+@@ -268,7 +308,7 @@
+ 
+         verify(mock);
+     }
+-    
++
+     @Test
+     public void testCaptureNonStrictControl_2133741() {
+         testCaptureHelper(createMock(IMethods.class));
+@@ -279,9 +319,9 @@
+         testCaptureHelper(createStrictMock(IMethods.class));
+     }
+ 
+-    protected void testCaptureHelper(IMethods mock) {
+-        Capture<String> capture1 = new Capture<String>();
+-        Capture<String> capture2 = new Capture<String>();
++    protected void testCaptureHelper(final IMethods mock) {
++        final Capture<String> capture1 = new Capture<String>();
++        final Capture<String> capture2 = new Capture<String>();
+ 
+         mock.simpleMethodWithArgument(capture(capture1));
+         mock.simpleMethodWithArgument(capture(capture2));
+@@ -294,25 +334,25 @@
+         assertTrue(capture1.hasCaptured());
+         assertTrue(capture2.hasCaptured());
+         assertFalse(capture1.getValue() == capture2.getValue());
+-    } 
+-    
++    }
++
+     @Test
+     public void testCapture1_2446744() {
+-        Capture<String> capture1 = new Capture<String>();
+-        Capture<String> capture2 = new Capture<String>();
+-        Capture<String> capture3 = new Capture<String>();
+-        IMethods mock = createMock(IMethods.class);
++        final Capture<String> capture1 = new Capture<String>();
++        final Capture<String> capture2 = new Capture<String>();
++        final Capture<String> capture3 = new Capture<String>();
++        final IMethods mock = createMock(IMethods.class);
+         expect(mock.oneArg(capture(capture1))).andReturn("1").once();
+         expect(mock.oneArg(capture(capture2))).andReturn("2").once();
+         expect(mock.oneArg(capture(capture3))).andReturn("3").once();
+-        
++
+         replay(mock);
+-        
++
+         for (int i = 0; i < 3; i++) {
+-            String string = "Run" + (i + 1);
++            final String string = "Run" + (i + 1);
+             mock.oneArg(string);
+         }
+-        
++
+         assertEquals("Run3", capture3.getValue());
+         assertEquals("Run2", capture2.getValue());
+         assertEquals("Run1", capture1.getValue());
+@@ -320,16 +360,16 @@
+ 
+     @Test
+     public void testCapture2_2446744() {
+-        Capture<String> capture = new Capture<String>(CaptureType.ALL);
+-        IMethods mock = createMock(IMethods.class);
++        final Capture<String> capture = new Capture<String>(CaptureType.ALL);
++        final IMethods mock = createMock(IMethods.class);
+         expect(mock.oneArg(capture(capture))).andReturn("1").once();
+         expect(mock.oneArg(capture(capture))).andReturn("2").once();
+         expect(mock.oneArg(capture(capture))).andReturn("3").once();
+-        
++
+         replay(mock);
+-        
++
+         for (int i = 0; i < 3; i++) {
+-            String string = "Run" + (i + 1);
++            final String string = "Run" + (i + 1);
+             mock.oneArg(string);
+         }
+ 
+@@ -338,8 +378,8 @@
+ 
+     @Test
+     public void testCaptureFromStub() {
+-        Capture<String> capture = new Capture<String>(CaptureType.ALL);
+-        IMethods mock = createMock(IMethods.class);
++        final Capture<String> capture = new Capture<String>(CaptureType.ALL);
++        final IMethods mock = createMock(IMethods.class);
+         expect(mock.oneArg(capture(capture))).andStubReturn("1");
+ 
+         replay(mock);
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
new file mode 100644
index 000000000000..a7565f2c8be3
--- /dev/null
+++ b/dev-java/felix-framework/Manifest
@@ -0,0 +1,3 @@
+DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
+EBUILD felix-framework-7.0.5.ebuild 3563 BLAKE2B 08b2fe7c8b729cf8d6e27432868a4e8e2be6482f424d3e512cb63d2f1ad3854d7f44c936cb8452d57ec11a32f4593cdf1e08dc5e8c0ffc04c0de79b1ae2737a8 SHA512 3487caf78e9ec47aa5a8ce63d84ba4c6c034c8370f4f7d479d155a7b64043baee50755a50fb9096a996b91512605b8c22edf298a76626803760c0227d38d05ed
+MISC metadata.xml 455 BLAKE2B 69e2d92cd05dd44530363b6920e0673ac8f6d87cebf7ca931d4699378062348b83391fdfeaa4dc95d470a718d363fa7e6578f949b6f8f3510317f6d63bc7c514 SHA512 585dc4c8a3fb5c6c01940c887207346065ca9c7499abdb79ab6f6554a05fe6b27734e48101cb0dab61b8e0e32417bf28e722947864bd0ea3d48296198a3f3264
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
new file mode 100644
index 000000000000..a8a67fa28876
--- /dev/null
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.framework:7.0.5"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the OSGi R8 core framework specification"
+HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# org.codehaus.mojo:animal-sniffer-annotations:1.9 -> >=dev-java/animal-sniffer-annotations-1.15:0
+
+CP_DEPEND="dev-java/animal-sniffer-annotations:0"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.felix:org.apache.felix.resolver:2.0.4 -> >=dev-java/felix-resolver-2.0.4:0
+# org.osgi:org.osgi.annotation:6.0.0 -> !!!artifactId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.easymock:easymock:2.5.2 -> >=dev-java/easymock-2.5.2:2.5
+# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
+# test? org.ow2.asm:asm-all:5.2 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	dev-java/osgi-annotation:0
+	dev-java/felix-resolver:0
+	test? (
+		dev-java/asm:4
+		dev-java/easymock:2.5
+		dev-java/mockito:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
+
+JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	# 58,91 pom.xml
+	cat > src/main/java/module-info.java <<-EOF
+		$( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \
+			| grep -v moduleInfoSource )
+	EOF
+
+	sed -e 's/{dollar}//g' -i src/main/resources/default.properties || die
+
+	sed -e "s:\${pom.version}:${PV}:" \
+		-i src/main/resources/org/apache/felix/framework/Felix.properties || die
+
+	# bundling some classes from felix-resolver according to 99,132 pom.xml
+	# if we don't bundle compilation would fail with:
+	# src/main/java/module-info.java:23: error: package is empty or does not exist: org.osgi.service.resolver
+	cd src/main/resources || die
+	jar xvf "$(java-pkg_getjar --build-only felix-resolver felix-resolver.jar)" \
+		org/{apache/felix,osgi/service}/resolver/ || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# according to pom.xml, line 129
+	# grep the line between <Add-opens> and </Add-opens> from pom.xml
+	local add_opens="$(sed -n '/<Add-opens>/,/<\/Add-opens/p' pom.xml \
+		| grep -v Add-opens | tr -s '[:space:]')" || die
+	echo "Add-opens:${add_opens}" > "${T}/Add-opens-to-MANIFEST.MF" \
+		|| die "Add-opens-to-MANIFEST.MF failed"
+	jar ufmv ${JAVA_JAR_FILENAME} "${T}/Add-opens-to-MANIFEST.MF" \
+		|| die "updating MANIFEST.MF failed"
+}
+
+src_test() {
+	# java.base does not "opens java.lang" to unnamed module
+	# adding it to MANIFEST.MF would not fix the test failures.
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/felix-framework/metadata.xml b/dev-java/felix-framework/metadata.xml
new file mode 100644
index 000000000000..e6816da2d497
--- /dev/null
+++ b/dev-java/felix-framework/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to>
+		<doc>https://felix.apache.org/documentation/subprojects/apache-felix-framework.html</doc>
+		<remote-id type="github">apache/felix-dev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/felix-resolver/Manifest b/dev-java/felix-resolver/Manifest
new file mode 100644
index 000000000000..bee400afe3be
--- /dev/null
+++ b/dev-java/felix-resolver/Manifest
@@ -0,0 +1,3 @@
+DIST felix-resolver-2.0.4.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61
+EBUILD felix-resolver-2.0.4.ebuild 2113 BLAKE2B de38ac614ff7582d7bd3562b4c9da22d2260aed2ce0e6f93c735388929da2cece65b50386e7232ebb8d226d0c413ac7f4d27d6a7d8addcca70f29455a0f7ea62 SHA512 465592736caaa84f1dbdd62caea8e0292434c87bac725382bedd89dbb333a47f607b014375631ece15754d1cc10c60ccbd52e7fab481b7c11b082c0d02ca9e0f
+MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
new file mode 100644
index 000000000000..771b23571b6f
--- /dev/null
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-resolver-2.0.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.resolver:2.0.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provide OSGi resolver service."
+HOMEPAGE="https://felix.apache.org/documentation/index.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# org.osgi:org.osgi.core:5.0.0 -> >=dev-java/osgi-core-api-5.0.0:0
+# org.osgi:osgi.annotation:6.0.1 -> >=dev-java/osgi-annotation-8.1.0:0
+
+CP_DEPEND="
+	dev-java/osgi-annotation:0
+	dev-java/osgi-core:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.utils:1.8.0 -> >=dev-java/felix-utils-1.11.8:0
+# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/felix-utils:0
+		dev-java/mockito:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( DEPENDENCIES NOTICE doc/changelog.txt )
+
+S="${WORKDIR}/org.apache.felix.resolver-${PV}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="felix-utils,junit-4,mockito"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @73ec6027
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/felix-resolver/metadata.xml b/dev-java/felix-resolver/metadata.xml
new file mode 100644
index 000000000000..4af2d5d52d45
--- /dev/null
+++ b/dev-java/felix-resolver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<doc>https://felix.apache.org/documentation/documentation.html</doc>
+		<remote-id type="github">apache/felix-dev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
new file mode 100644
index 000000000000..afa2e5d3bb9e
--- /dev/null
+++ b/dev-java/felix-utils/Manifest
@@ -0,0 +1,4 @@
+AUX felix-utils-1.11.8-Port-to-osgi-cmpn.patch 4717 BLAKE2B 012aa489c1f063bfa5d3f8e9504bc72176493d4bd345e1aa9027d73d560c6852589a448cd96927410220286a247e2d14f4ab0a08a2ed70f9dba34b86e6be7e0d SHA512 267b3bd025fe71992b3cc3872cabbd0d13407e1aec013c671754d3ed94bd104ffb52bb22255acb0bfc4be6428f16073e37d3e79fa4b7a45bca34f3e4a1d82637
+DIST felix-utils-1.11.8.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd
+EBUILD felix-utils-1.11.8.ebuild 1619 BLAKE2B dc5d8f51b54056c0e975446f7299f3db026f4ebe67f6422787d27e5eeacf687ac4b62a94929e048ba932525bf22b6d889b83c83d42158bfd367892a71f201fe4 SHA512 6f0847156d16928de2f314f5e10a39384e7c7b597c7fd890665f3a0559380bc20c504be1211e3fa635bce921bf5514aaf7891c087e707f91ac99fce226c8d397
+MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791
diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
new file mode 100644
index 000000000000..170d165ff6d8
--- /dev/null
+++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-utils-1.11.8.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.utils:1.11.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utility classes for OSGi"
+HOMEPAGE="https://felix.apache.org/documentation/index.html"
+SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Compile dependencies
+# POM: pom.xml
+# org.osgi:osgi.cmpn:5.0.0 -> >=dev-java/osgi-cmpn-8.0.0:8
+# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.7.0:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	test? (
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/felix-utils-1.11.8-Port-to-osgi-cmpn.patch"
+)
+
+DOCS=( DEPENDENCIES NOTICE doc/changelog.txt )
+
+S="${WORKDIR}/org.apache.felix.utils-${PV}"
+
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default # https://bugs.gentoo.org/780585
+}
diff --git a/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch b/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch
new file mode 100644
index 000000000000..22b0222af68b
--- /dev/null
+++ b/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch
@@ -0,0 +1,123 @@
+From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Mon, 5 Nov 2018 09:59:04 +0100
+Subject: [PATCH] Port to osgi-cmpn
+
+---
+ .../utils/repository/AggregateRepository.java | 20 +++++++++++++++++++
+ .../utils/repository/BaseRepository.java      | 19 ++++++++++++++++++
+ .../utils/properties/MockBundleContext.java   | 10 ++++++++++
+ 3 files changed, 49 insertions(+)
+
+diff --git a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
+index 50dceaf..4da3141 100644
+--- a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
++++ b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
+@@ -25,7 +25,12 @@ import java.util.Map;
+ 
+ import org.osgi.resource.Capability;
+ import org.osgi.resource.Requirement;
++import org.osgi.resource.Resource;
++import org.osgi.service.repository.ExpressionCombiner;
+ import org.osgi.service.repository.Repository;
++import org.osgi.service.repository.RequirementBuilder;
++import org.osgi.service.repository.RequirementExpression;
++import org.osgi.util.promise.Promise;
+ 
+ public class AggregateRepository implements Repository {
+ 
+@@ -52,4 +57,19 @@ public class AggregateRepository implements Repository {
+         }
+         return result;
+     }
++
++	@Override
++	public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
++		throw new UnsupportedOperationException();
++	}
++
++	@Override
++	public ExpressionCombiner getExpressionCombiner() {
++		throw new UnsupportedOperationException();
++	}
++
++	@Override
++	public RequirementBuilder newRequirementBuilder(String namespace) {
++		throw new UnsupportedOperationException();
++	}
+ }
+diff --git a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
+index 95adadd..0998ab0 100644
+--- a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
++++ b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
+@@ -30,7 +30,11 @@ import org.osgi.framework.Constants;
+ import org.osgi.resource.Capability;
+ import org.osgi.resource.Requirement;
+ import org.osgi.resource.Resource;
++import org.osgi.service.repository.ExpressionCombiner;
+ import org.osgi.service.repository.Repository;
++import org.osgi.service.repository.RequirementBuilder;
++import org.osgi.service.repository.RequirementExpression;
++import org.osgi.util.promise.Promise;
+ 
+ /**
+  */
+@@ -90,4 +94,19 @@ public class BaseRepository implements Repository {
+         }
+         return result;
+     }
++
++	@Override
++	public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
++		throw new UnsupportedOperationException();
++	}
++
++	@Override
++	public ExpressionCombiner getExpressionCombiner() {
++		throw new UnsupportedOperationException();
++	}
++
++	@Override
++	public RequirementBuilder newRequirementBuilder(String namespace) {
++		throw new UnsupportedOperationException();
++	}
+ }
+diff --git a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
+index 3eab444..df94a6c 100644
+--- a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
++++ b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
+@@ -25,7 +25,9 @@ import org.osgi.framework.BundleListener;
+ import org.osgi.framework.Filter;
+ import org.osgi.framework.FrameworkListener;
+ import org.osgi.framework.InvalidSyntaxException;
++import org.osgi.framework.ServiceFactory;
+ import org.osgi.framework.ServiceListener;
++import org.osgi.framework.ServiceObjects;
+ import org.osgi.framework.ServiceReference;
+ import org.osgi.framework.ServiceRegistration;
+ 
+@@ -105,6 +107,10 @@ public class MockBundleContext implements BundleContext {
+         throw new UnsupportedOperationException();
+     }
+ 
++    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
++        throw new UnsupportedOperationException();
++    }
++
+     public ServiceReference[] getServiceReferences(String s, String s1) throws InvalidSyntaxException {
+         throw new UnsupportedOperationException();
+     }
+@@ -125,6 +131,10 @@ public class MockBundleContext implements BundleContext {
+         throw new UnsupportedOperationException();
+     }
+ 
++	public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
++	    throw new UnsupportedOperationException();
++	}
++
+     public File getDataFile(String s) {
+         throw new UnsupportedOperationException();
+     }
+-- 
+2.17.2
+
diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml
new file mode 100644
index 000000000000..4af2d5d52d45
--- /dev/null
+++ b/dev-java/felix-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<doc>https://felix.apache.org/documentation/documentation.html</doc>
+		<remote-id type="github">apache/felix-dev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index d102c4cdd998..7cea03e459ee 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
-EBUILD jakarta-servlet-api-4.0.4.ebuild 939 BLAKE2B 1fe921708f4607a19425174f0c89e32854d8d5aae19b61ad7792d2aa258aec6d43451ed8d5f1da20766bcf0fe85e44d5380fbfb28861f17bff2b02929a78b05b SHA512 d2560d62f14496380384fdec3797f875505eb1ae021d97401987a35afea59dad91e988b3e4317f9f56e809e2ab534872e14228101b44c44b33639351e2000609
+EBUILD jakarta-servlet-api-4.0.4.ebuild 935 BLAKE2B 5007e96b0617853577ea6159caa7e587e9316568f5ea620c8366d27c9dbe74b280b646d8b60c2ad9dd37b1ff37556d9c2a5c49f74d918d0d0ec58ad243e2f3ff SHA512 cab6ebbea0966a0be1f785efd65e2af6ff8b80a602101877f8551be26ea945f20208d820743a8be59fc83aff4c84e12d03516cf2dea79b2de9d8e207b0ddf03c
 EBUILD jakarta-servlet-api-6.0.0.ebuild 1278 BLAKE2B 6fa04052e4998180cbf2b91d2ad3ef2d8fdaa2eb3287d516458a93a4fba8b429f14817218ac276ba81816c9b5a3a3da51ec52860d8bda33bdb6bb9f8bd4ea06e SHA512 fc36764e2ed54b3e2818dc3d85f3f09adc8b0ae3e122b658ffdad48d546906793dff340c6c4308c47eb3a19eda2bf416101062f99db41ccff589b23ea8541467
 MISC metadata.xml 332 BLAKE2B b9a06fe2a5573bde0da5b4f0d11a4cdf8c26738b67ac575014c01ed7fadfbc057a63fe2de907942a83d12afe8335933edbf671460b33939969bbb8d2657ffd81 SHA512 4c044f785c3a41116e24cc56b46b8e74327e4fbe29b11a25e1004e18d815023d073465658bb9467afbf80f8490e29815e1e52ce3d5ccde250ae48f0edbf0d380
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
index 0ed4e93cbabd..063b338f3af5 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/junitparams/Manifest b/dev-java/junitparams/Manifest
index 4bae1d07288e..1494709004f4 100644
--- a/dev-java/junitparams/Manifest
+++ b/dev-java/junitparams/Manifest
@@ -1,5 +1,5 @@
 AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
 DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
-EBUILD junitparams-1.1.1-r1.ebuild 1615 BLAKE2B 6d3e241be8b1ffc2232703271183b5fed3413a479952737b54951706149d9bf15284f9e9820e3d339c6dbea8157616c494d0310973ac5676e241119ce0004d96 SHA512 d633981bea36043a7ccf0143d880c47e343811061ecfef504679069c40e7d50bf5e878e26be26c16279169d4fbbf8ee73724b11247d0d6f0cce75317eda003e1
+EBUILD junitparams-1.1.1-r1.ebuild 1611 BLAKE2B 0f3207254c58bde652ce5dcae54c757f150553101e0de07ea4ce01f650afd1e153f1edf7832cf5816fa530f36e3411dac3adf723b51d523753d791eae5440455 SHA512 92ec1912bcd09cd8e890ec3c37c9adccbec3ad0e58ecadc78c705f3407950bef196e992880f4a0f902d16fde2fc23faa29538c9d51bceab2b31ff21fd0efe400
 EBUILD junitparams-1.1.1.ebuild 1655 BLAKE2B 37bd6c3c987ed19e92df2df16e4d60b1e54eeac60a2344672a8baf93c414e1e877f38a4f9a42a43b5b91b0f50340ee5d138c94b0bad8186dcfc8a43cebc61371 SHA512 6b4f66f8203a55aa81fd033e56df032dd985394cbd9774f4f9067f9b05fa868ff5ef4bfd8a9f65f56e4e6b891badf25ab98c5c44e0d693c3f72ce7261ac61a2d
 MISC metadata.xml 437 BLAKE2B 67db2ff59007450448d4de713df69f7999909a2070c093bd65f994d98fedcb92aa7b262d1da757e19c401fd8380acd234469a3b8abc9a70d412aaf1059699efa SHA512 02fcfa155548a74dbf633c5ac5fd69a3bf6303b202e16dd96948c58d22bd05cc2575cd8a82b51b961b20c4f0b65ba41cda63d5981ff652c1000c5d6912de5f31
diff --git a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild b/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
index d0326740ce29..db8ec80d207d 100644
--- a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParam
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index b4053e5ccc52..7c1612bbdd97 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,4 +1,6 @@
 AUX zstd-jni-1.5.0.4-filter-flags.patch 369 BLAKE2B d79c3f5bee1e8faafb96a6d87c03c1cf5d1f292697fef1d7724394b9a415a30d9912946a612003e93a278648e4e5b1cc532e28d2c296c90b683eb7e0e769ac9c SHA512 fb56c386c6db387aa2c27a722d3c417813c427425d0dc6fb350ca02bee3f261efbb639eefbcc5dd58107f33c0211dba1b5bc696680e111a6338d0a67381ab533
 DIST zstd-jni-1.5.0.5.tar.gz 9297542 BLAKE2B 96b2aa09d62c7a45c352d52358aa47a66c95c1b122bfc61b7e2b3aaa829e011a8ed6f71373130700ecdb7d8541ca6971c2cd7fda01be396053532c4aeeca3cb1 SHA512 b63858d58c7d1b2c9d120f49d1289caa7e5b429d0f8c3c95b7f58a5d432f09d41504c5f5b0934f53be8eadf3c1ab02a1a872e292bac465907fffe2a67108267e
+DIST zstd-jni-1.5.2.4.tar.gz 9343792 BLAKE2B 8a446b229d49671b3f38d630ecf2c2688210176af95b66c788027de89986ad1f23615582d670f1d7a0b3866572b05c722ad6c71783d208401844287e8149f65c SHA512 bf67fc6573f2b1e45bd4985186814a54fb948a1b7280b5cf2f6d2577626c1f70626a58994291ffb228f097c91d60e3ed52d56ad92830c8f386b96b11fb6cf4a2
 EBUILD zstd-jni-1.5.0.5.ebuild 1649 BLAKE2B 1a8b753c98faf7e6c0c98bfa9d10c1c09cd4049ecbf4cc403a039e3fb9fc8636c6bdb8d59dcf99c2aa097f079bbff382c35891129393aee040e4b41b81b0d51c SHA512 af839745dc4e62c244e0dc5cc5e7d0acbf27434819967919004664f37c5d96ed7385459f729c21cd3a75d7e1b1c51f5f247604b64be115c00acf8b4f415a8420
+EBUILD zstd-jni-1.5.2.4.ebuild 1697 BLAKE2B 562c35fadde964224058c841db3433e16d79ddb2e8c448eea885265dcfcced5cd2071ff60e8060b55f6fd70fde3bc1ce7849be70c0871c22ccd78712927c25e4 SHA512 dad743a085b7bba1451cf92b6c6f4fd400285698e9ac20e56eebd18a079876cd0763c6b6a17d7c95c4c079c805fe59f8cac8b032ba1be4ea0fd7155004456f92
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
new file mode 100644
index 000000000000..b613a58dbeee
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.luben:zstd-jni:1.5.2-4"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="JNI bindings for Zstd native library"
+HOMEPAGE="https://github.com/luben/zstd-jni"
+# Snapshop needed because this version is not tagged.
+MY_COMMIT="37faee49643b2739457716e3752f44fcaa09005f"
+SRC_URI="https://github.com/luben/zstd-jni/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/zstd-jni-${MY_COMMIT}"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.luben.zstd_jni"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/luben/zstd-jni/blob/v1.5.2-3/build.gradle#L66
+	cat > src/main/java/com/github/luben/zstd/util/ZstdVersion.java <<-EOF || die
+		package com.github.luben.zstd.util;
+
+		public class ZstdVersion
+		{
+			public static final String VERSION = "$(ver_rs 3 -)";
+		}
+	EOF
+
+	mkdir -p  resources/META-INF || die
+	cat > resources/META-INF/MANIFEST.MF <<-EOF || die
+		Implementation-Version: $(ver_rs 3 -)
+		Bundle-NativeCode: libzstd-jni.so;osname=Linux"
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg_doso "${BUILD_DIR}/libzstd-jni-$(ver_rs 3 -).so"
+	java-pkg-simple_src_install
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4b8baecd355a..85b78aaee326 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 02974b541946..3794cacba2df 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -4,5 +4,5 @@ AUX grantlee-5.3.0-slot.patch 2262 BLAKE2B 8a876c6e19f426c3eaa6117672def327b57fa
 DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
 DIST grantlee-5.3.0.tar.gz 1176075 BLAKE2B a3418250845b39c4766dd19a1f423f18ca7393f675d0045477b345e589d5649f1cc332f9c228e9e9317bdf356992e533cfabe62bcfb50c40ffa38be9b5009013 SHA512 8018c92e1001e039243b4a22a790907b53bff21e062c7e3ee63d1e2de4ce7bccc4a7580fc4ec2e61dc2f7131ac336d46f76e2f03a7314c1547b8744842c0a02a
 EBUILD grantlee-5.2.0.ebuild 1070 BLAKE2B e1c7e4b33661b07c114de7b0c4b2626d029674202651ca83d8e1dc26fa3cde2234218f9580ce145a1f1b650dcfe4b0bed117a39de352b013c1dd43670bf6bd85 SHA512 1556fb717d94328c13f71e4d75d9834b415468dc067a00287d7250d54525ec9032bdf4fb554bcdc86f7feb53cb1bd2a1ec9b4cbc99ed402edb57355e6067362a
-EBUILD grantlee-5.3.0.ebuild 1123 BLAKE2B be871fbd00a5df93c8d0fa9f643aa61b94a532256ce68f38dd9cdc5ce25e906d733512e2f6b8f4c89a7ca1bc47f306ec2eb84c407a9c851d06c3ee9311fef34c SHA512 c647162b55f606c04c087cfc9b454380197a96a0e40511f238fa111fed197dc3c816c3dac82b580a7bde87e3315b753a6345e3d1b738f8236dbad4b6749ee448
+EBUILD grantlee-5.3.0.ebuild 1122 BLAKE2B 3b20e64b6248642743a55dd0924ac24234fd02442647cdc7c42f320dab3295dcfd63fcb040807196cdb00fab078e467637620e1ca39f6aacc31bee43e13379c4 SHA512 620e183e6a7c6d33418dffa0427561e745348dd8639081e74173c60ddec6c6f2927e5a4e773d222add4118bdbff462f05604a77b37dfe9d50ed9360a1af0c278
 MISC metadata.xml 332 BLAKE2B 655bf07600689b25f75cd8889d468ab092a861c8cd88c604a3d0411916ae29ab1508ebd7e296d0df1f037ab9cfad06b146cc2d0fe5d2d4d590d8a36e2de858ed SHA512 5837c62f635103c8ff77caf457916a32600134cd2d9333dc5389f92fa95fba39af867eac73df99fe59cd0c9a16388c6da890f25397986c8406e844aec66bf66b
diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild b/dev-libs/grantlee/grantlee-5.3.0.ebuild
index 54836e3783e4..3c7e7c10080c 100644
--- a/dev-libs/grantlee/grantlee-5.3.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index ea3d25990fba..c7fb7ff88490 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,4 +1,4 @@
 AUX libebml-1.4.2-header-fixes-for-gcc11.patch 599 BLAKE2B 850d5eca5b6126a791bbd3791ebf5b34f93b822e3f9d263a38ed1839a3f36073d4693fe82f02265b809c9a7ec1c41d1bbd721dc9517e5930410e8b25f845dc58 SHA512 c41024d454ae83318e899671aec45b27ff0e68e18b4fde1e838ffc9a4baff6e70e0dcbf0966f70241dbef3b05e04283451f9c0ebb01e5b0a0d060cb62a83d3b6
 DIST libebml-1.4.2.tar.xz 70484 BLAKE2B e27da59218c6c5655e2b57295b8f0ea8770f92eea4fe65331147a963f45fa8a06cc685af553b8234ca0162acea05b99b7463753044cc49bc815c752223e3b3fa SHA512 b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
-EBUILD libebml-1.4.2.ebuild 566 BLAKE2B f11cd66a0df5c8cb1c9f608c4e6ec6c59d15e14cbf0047e4c0718574d490c3ce1c4b944a7363f6904c38f62b35b8979bc10f11b18f7f97c0060c9b47b929daac SHA512 559d7816d161debc2a633fe23e26a47adc5516834e7be45f0e37f86a3c2eecdeb0217ddc887b4f73da1d64eb91e4a83efeb392738ac41b1075f7bbee5ab58041
+EBUILD libebml-1.4.2.ebuild 696 BLAKE2B 34d323e315321cd96bfba608db8037b64eb5ee5f0c6723d2229aa6e4b6cd0f73c6995f8ca9625512835bc6bbe1b4fa88bcab08ae6cd9303150f3eebea9da42c1 SHA512 42df09d9f40bf3e1765de0fa32b755ca2366708e392afe893c52616ab2d26ad687e3da1250b5e956aeb3574d44cdcc0af18e9b0d879406d6040f13a58f549fb9
 MISC metadata.xml 317 BLAKE2B 9cec3d87965cab02baa170724fc9f9b6742f4723985d1e8f3d75e97d990ce080f9daa334d5ca019a67d92c70e2b9d0cc8967f0e4817d8dc8f93bf0d03992237a SHA512 b05b64e9380e15165ddbe70592a4e9a0b50f8eefaafc7be6c16a34aa39b632aa7e6ea0a2beccb16c6638909e71f888daff7cce575f024c1dfed0805fc1646233
diff --git a/dev-libs/libebml/libebml-1.4.2.ebuild b/dev-libs/libebml/libebml-1.4.2.ebuild
index 777b6e12b31f..dd87bd442f63 100644
--- a/dev-libs/libebml/libebml-1.4.2.ebuild
+++ b/dev-libs/libebml/libebml-1.4.2.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+if [[ ${PV} != 1.4.2 ]] ; then
+	die "Do not bump to 1.4.3! It breaks ABI: https://github.com/Matroska-Org/libebml/issues/104"
+fi
+
 inherit cmake
 
 DESCRIPTION="Extensible binary format library (kinda like XML)"
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index 85b835f2ca8f..31cb06b316ab 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -1,4 +1,7 @@
 AUX pslib-0.4.5-fix-build-system.patch 530 BLAKE2B 69693c754bd4e348e8f4af2876ee0ae19b9278bc192194e9d61bd007701868bd1d676d1c19133aa390301aef7eeee9a5abb7cc8750a05f1ef1d93676dd1df917 SHA512 d9baf7bddff0ebe673d7396e4e4873ba71156d149b4544a537d31734771f4b91b8bfa809b92fcc44f3f9a9f28bd758bcf805ec26cef3e8731281581ccf933044
+AUX pslib-0.4.6-Fix-implicit-function-declarations.patch 694 BLAKE2B 5c69e4d0e72a383a51a96647edcf603348f372532f21b699a65d816f51fc704da2b3cf62f91cc9d348c9fb317a82ca6ffd0d98da221da01be904b19bf2b2f136 SHA512 9e0a195631b666e05547fb35dbb567bca5040dddc9eec87d82eb7b6e7da537e409e0ea6a810d40100ba6f3c902d45846534d5e986055b1a2d16ce3ce5c694a7f
 DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
+DIST pslib-0.4.6.tar.gz 543950 BLAKE2B 18f85ce5c2d558b2abe8c3297a65201890813d57d3e14353333c1e1b221ee89e0d2c27e6f247be8c1066c9be1e3cf390205217f2ca2fe76fe76208d4be2e2ac6 SHA512 aa1fb217fa36b33e8e4b1a9cf5057803f9dd2d50c76f8d33c6494939a592fba0bddef53d4e5d2c14769508df6d409b3bd18cd6d716014cd99224be5e1d64282b
 EBUILD pslib-0.4.5-r1.ebuild 1016 BLAKE2B 9bc6ef561b229f0d4d9babe881fae80f705890d3744afa2f6478368c522082c48aa3678db4df96a18aaa4d86ba3a2648b4c592cfdff39cbfd364c38a92b59b0c SHA512 3ac50cebf5bd6c53ccc4ae1cb84036d98b779db7dcee066df4ea77ce3660c0d026a84e5cdb2744e97dd9b252b6a1310453102b23f9492d0cbaec3176f29c59db
+EBUILD pslib-0.4.6.ebuild 1087 BLAKE2B 9a070803a58809c896eb395a5ffd27889566c01db90368b18ac092a76bc38351401ce56607ab00679c8f4108e5a1df017c3918224f56800ec3e2493381e7c73b SHA512 5f805eca725dcfdce9969e17be495d0bfd9ea9220e801890d01dcee6bad0de599aadc9b80ed68ccf70b8bfec9ccb4d1e565608d3249855b53fa7a203562029f6
 MISC metadata.xml 445 BLAKE2B d79021aa9674d0593bd738a9ef628315f3ae161f4d71c5c81e560ddace1ec730d6a6355ef70577148d2cca9ce6e012e0ccc828bda43711f2dbd5821a7dca394e SHA512 4f7425589cd82e37c8a282e070a80ed69d33c262fa34e378f0d749a2cfbc1c1f82900bded74a71c30659d1a18c6806b253a0924347364a6798b3e361bef99ec1
diff --git a/dev-libs/pslib/files/pslib-0.4.6-Fix-implicit-function-declarations.patch b/dev-libs/pslib/files/pslib-0.4.6-Fix-implicit-function-declarations.patch
new file mode 100644
index 000000000000..7548ced79b87
--- /dev/null
+++ b/dev-libs/pslib/files/pslib-0.4.6-Fix-implicit-function-declarations.patch
@@ -0,0 +1,29 @@
+From ffd2e04b8e32d916cc513e73e92afa98348d3a73 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 4 Oct 2022 06:37:32 +0100
+Subject: [PATCH] Fix implicit function declarations
+
+Bug: https://bugs.gentoo.org/871300
+--- a/src/bmp.c
++++ b/src/bmp.c
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++
++#include <ps_error.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/ps_error.h
++++ b/src/ps_error.h
+@@ -1,5 +1,8 @@
+ #ifndef __PS_ERROR_H__
+ #define __PS_ERROR_H__
++
++#include "ps_intern.h"
++
+ void _ps_errorhandler(PSDoc *p, int error, const char *str, void *data);
+ void ps_error(PSDoc *p, int type, const char *fmt, ...);
+ #endif
diff --git a/dev-libs/pslib/pslib-0.4.6.ebuild b/dev-libs/pslib/pslib-0.4.6.ebuild
new file mode 100644
index 000000000000..4391cb1b9132
--- /dev/null
+++ b/dev-libs/pslib/pslib-0.4.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="pslib is a C-library to create PostScript files on the fly"
+HOMEPAGE="http://pslib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug jpeg png tiff"
+
+RDEPEND="
+	png? ( media-libs/libpng:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )"
+#gif? requires libungif, not in portage
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-libs/glib:2
+	dev-util/intltool
+	dev-perl/XML-Parser
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.4.6-Fix-implicit-function-declarations.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-bmp \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		$(use_with debug)
+}
+
+src_install() {
+	default
+
+	# package installs .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r1.ebuild b/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r1.ebuild
index 9fc79f11279c..8f62e7b664f1 100644
--- a/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r1.ebuild
+++ b/dev-perl/Digest-MD2/Digest-MD2-2.40.0-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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the MD2 Algorithm"
 LICENSE="|| ( Artistic GPL-1+ ) RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_compile() {
 	mymake=(
diff --git a/dev-perl/Digest-MD2/Manifest b/dev-perl/Digest-MD2/Manifest
index 8da4a22d6767..18fe79c44a1e 100644
--- a/dev-perl/Digest-MD2/Manifest
+++ b/dev-perl/Digest-MD2/Manifest
@@ -1,3 +1,3 @@
 DIST Digest-MD2-2.04.tar.gz 17379 BLAKE2B 4816eac821ffaceff73fd79b933a6514cd9b696e796ed498134beb593207a762471341c408c840c3342f03422892163971b5a42b11176593e5a500f2d2f51855 SHA512 780ee79830fe8fcb3a844f67517c90d49a1e5e869dc8efd208d3eb73ccf6e56d3d112fcbd1effa083c4d77e5bddaab096b8aff9528707b235287761622b80433
-EBUILD Digest-MD2-2.40.0-r1.ebuild 462 BLAKE2B 43ecc3bc7971f3477bf2d63e96b7783344e3be3b4a7eed1f8d923f1f0e4bc44db6bdef35654ce189d4c78b7d70f14c5d3630f06fc091d417a497368da82b6b98 SHA512 06d9f56d2f381c05f768f98204962ac6cc575ec74c0fd4c74c0a182483ce46e9ab3f58cfbd17ac3ea3253e165613d03b244ae1693855a8a2e0650ea82f94c23c
+EBUILD Digest-MD2-2.40.0-r1.ebuild 469 BLAKE2B 31fd912cb5a98d5be732f46ae36efc296ab56d54a9bd84839cee0a9142870ac6e583fe2b0d245f55e64ad9b224972b8fa43d59e864faef50d96573caf17a5fab SHA512 71190829fe9f1cc8fdeaf4072d8588fee0eea13e1dfea0e9634bf68fa81ff08dd02581b2590d446c486735c37abd27a76d15b5e7849564152481843d9300c71f
 MISC metadata.xml 393 BLAKE2B df8c08df37c9a05553bd94489205c35e80604d7320acb957031e4d30a8161e7286aa4aee8961c78a94d4f7655fbecc6df8812323b0a6719dcfac8adece471228 SHA512 ef4e1b026b43fe48a6e36b2274e057b0e91e629e5569b93b03568e2d2c9cb8b76d763490233a397bfbbeac806424d3be989b30e2315f67352540561853bb168e
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index b01cccdbda50..9a66801859cb 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 330684fac18e..cf2e1e3d95ba 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index 45f6fd47d8ad..358f2249b54f 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,3 +1,3 @@
 DIST contourpy-1.0.5.gh.tar.gz 12153420 BLAKE2B 1b3899831938c114480606f0c2ef2962248721884cd2be727f2bd11d12d322e7652c7b63860f4c5d8bd039a7e838f3f360dd1af017219caa97dfc63d69ef7e19 SHA512 47dc08f02920cb0ffc081f313dd041fa36e2fd0a81530374ae77adc288af13cf2c526fc1f45d06ef1c256c4c8fe243e0b36b54d3fff7d4f8bd6f9f4938d3c805
-EBUILD contourpy-1.0.5.ebuild 1028 BLAKE2B 18b4adec0c71c0faaec0e420b21493e0b90974bb399de3e183d2cc3d9157da90d4c89e8a0cbaf00aa3de5c24ab929078ca2ae9352b9f9239d6dd8ddbfbdd6dbe SHA512 3f2c36857b75931dc4756533b79e84124a2ac659feb003e9250626dac96a91f633edc7909a20aacf52a91b665be7b7204f1bcb07ca52626790688705ea62be77
+EBUILD contourpy-1.0.5.ebuild 1033 BLAKE2B 3854cc94acd15999fec3b74ad05860adfca2b1673044116224232d715506e4d505bf0f72e50ebd1472ef4983920bc71f0bc363a2dbe7558d3f0c4cd1021e46b2 SHA512 3890dc998d5b606aa982574f00f02187635e02856afbfa9777f8cbaa913e228bfceb11207937ca6b09aa265891285828224959f22cb977ba6571f759d0f2cce6
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
index e8d9091ceba9..1dcae6929eee 100644
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ b/dev-python/contourpy/contourpy-1.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 11ae4d5082c7..5716da214382 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,9 +1,6 @@
-DIST imageio-2.21.0.gh.tar.gz 391056 BLAKE2B 90fbacf7b396ab2b422d8694274ddc3642c92cfd325bce2861100f5bd28d82120cef6819b53b8ed82ba474d5e287765b63da9a7edfbfab5a026790a39d4edc1e SHA512 5bb070da560ba3a2e10bdb288ad539274ee14f8cf0543847859f0bae052b3d1782777d823435b74120bcfdff0b6cb15a6c80b2a9bf729439bbb3802f15cf5684
-DIST imageio-2.21.1.gh.tar.gz 391159 BLAKE2B 4c569ec81255d1f5985d2d30f303a978f9cb22e0d7368845648ddab9e5734adba52173d42ad73c94c424ce1a5806c3a10ae31381b04949f7f8c30fd327b585b4 SHA512 61fd4a1a64fb152fa5c419cac9a69ea979ac762fbaed81076ddd13602db98f71f31825615111958f21b021213d55be060197417159022bba84d631618f5bb286
-DIST imageio-2.21.2.gh.tar.gz 392425 BLAKE2B 959c89627188aca0072f519f0f9c3a9fcf2da96883f95760375bea503efd96ff6a198ad7e8bc12dfffe6aecf42f4b07176c8d273c6d349b5e2581053ddefecb6 SHA512 69922f05457f050083e92dbce34992911d5fb04f283d6784a8e1fd7f10e7887ffeef343d8f4162efaa55690f363ed6ceb5d2cdc5ee712ae9b276f072fdc45d37
+AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
 DIST imageio-2.22.0.gh.tar.gz 394144 BLAKE2B 957edbeaad6be459ff865eed3159b0f7776e3dd0782e0380bfe2c40362d0c08ccc8f29a2f38a8427deb263554495b73cc4df641e569b9d33700fcc6ed1395396 SHA512 23d606e32ab2bdc306a4b9d17120e5eda8c8a4fd96d840181afecd6e35f6649621740608f0286d2a5462822acc7ef4e1e7f1e9076882ce975f1da717b136c8c4
-EBUILD imageio-2.21.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.21.1.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.21.2.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.22.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
+DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
+EBUILD imageio-2.22.0-r1.ebuild 2023 BLAKE2B 4599e2d73deb63ae4e4178a5e67f8f1111c52ca027bf7f51ebc4ec0ce7e930ac95243737ded30fac945555b824dd24262f522453393e6c416750fe0769434447 SHA512 7c9b11cc6672abe2acb2d1dbf471dce918dd02e105510edca0a7b7a9c4c2218546d802912c977b045fe9ba86fdbb8b8e1a4941b944786a9e9516ac638957bcb4
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/files/imageio-2.22.0-block-download.patch b/dev-python/imageio/files/imageio-2.22.0-block-download.patch
new file mode 100644
index 000000000000..ba483813b23c
--- /dev/null
+++ b/dev-python/imageio/files/imageio-2.22.0-block-download.patch
@@ -0,0 +1,32 @@
+From 1ae48cfa95e84cb064edc74a4a64bd0f7dee780a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 4 Oct 2022 09:40:42 +0200
+Subject: [PATCH] Unconditionally disable downloading binaries from Internet
+
+Bug: https://bugs.gentoo.org/874849
+---
+ imageio/core/fetching.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/imageio/core/fetching.py b/imageio/core/fetching.py
+index 0380bc7..70f1a3d 100644
+--- a/imageio/core/fetching.py
++++ b/imageio/core/fetching.py
+@@ -97,11 +97,10 @@ def get_remote_file(fname, directory=None, force_download=False, auto=True):
+                     break
+ 
+     # If we get here, we're going to try to download the file
+-    if os.getenv("IMAGEIO_NO_INTERNET", "").lower() in ("1", "true", "yes"):
++    if True:
+         raise InternetNotAllowedError(
+-            "Will not download resource from the "
+-            "internet because environment variable "
+-            "IMAGEIO_NO_INTERNET is set."
++            "Implicit insecure downloads disabled on Gentoo due to security "
++            "concerns.  See https://bugs.gentoo.org/874849."
+         )
+ 
+     # Can we proceed with auto-download?
+-- 
+2.38.0
+
diff --git a/dev-python/imageio/imageio-2.21.0.ebuild b/dev-python/imageio/imageio-2.21.0.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.21.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.21.1.ebuild b/dev-python/imageio/imageio-2.21.1.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.21.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.21.2.ebuild b/dev-python/imageio/imageio-2.21.2.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.21.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.22.0.ebuild b/dev-python/imageio/imageio-2.22.0-r1.ebuild
index 6770d9759db9..20bd98f88e7f 100644
--- a/dev-python/imageio/imageio-2.22.0.ebuild
+++ b/dev-python/imageio/imageio-2.22.0-r1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
 DESCRIPTION="Python library for reading and writing image data"
 HOMEPAGE="
 	https://imageio.readthedocs.io/en/stable/
@@ -17,6 +18,12 @@ HOMEPAGE="
 SRC_URI="
 	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
 "
 
 LICENSE="MIT"
@@ -44,9 +51,31 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
 EPYTEST_DESELECT=(
 	# Fails because of system installed freeimage
 	tests/test_core.py::test_findlib2
 	# Tries to download ffmpeg binary ?!
 	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# removed upstream
+	tests/test_pillow.py::test_png_remote
 )
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 2034cac7a954..8ae1a41cf12d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -10,5 +10,5 @@ DIST matplotlib-3.6.0.tar.gz 35749946 BLAKE2B 1e2e80e124ef1a0a1843ba077c3c933b55
 EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
 EBUILD matplotlib-3.5.2-r3.ebuild 7391 BLAKE2B 59b395f4d3384793dd72c633e98ea71f64656042b398a2af2d25689285534c047e572779f4e966913c912870c747488d6e9d062766d980e7dd53fdad01647188 SHA512 2dc2ca8a5a7cd7fd679800bfef9208e7679b9bcb4bd267993d9369f00a2c09e6ca0f1abd30d9dfd3712e869b205e1945f29f008f41c5c77e7c506c10fd2fdea2
 EBUILD matplotlib-3.5.3.ebuild 7446 BLAKE2B c49d5f0ce2d14d6c621746217415103d06a1cc6d0c0d682c373eec20d0af0167a55b00ba582df7d7f3745de00692e254547e721aa25dc363261ffd6297424274 SHA512 a474eafc8ec34b70535e889b4ce5606a2ad3a682308346bb5b26868f13a84e31291fdd77b3f522883faefafa1f4f0d6ce2cf399bc9bacbc584ced8a3fabf07da
-EBUILD matplotlib-3.6.0-r1.ebuild 7464 BLAKE2B b0dcd0d4b13927c0ece6c30e232f3b680cf9c56f62c248e674bfb2061d598e7e7f61613601e0257dce5241730d0fe86b6ff379822400ecf3b5fcacc4e1774913 SHA512 1b640f28bbc65622c37fffff99b503f196ed873dfd6dba7bd23ad72b6e678c00dcb3d7ee7d8eb44552cedcfecede761eb106dddeaf61fc84536f7fc88361c889
+EBUILD matplotlib-3.6.0-r1.ebuild 7469 BLAKE2B b4ab7c3adeed6690a3e66f784fffcc996ac5bcd4437af1feab7a5e94ecd2c7c9008aad58467e248dd20cb200fd2fead39c29cfcd0413eb28add9b27fe8593f34 SHA512 483c6beb7d91cfbc3c7cfb4198a78a71acc79bfea559c32d2e202586cac54e1fef2b7fec090b81303ae19b0199f5d7a774c7f52b74400c6627ff15cf13465f5d
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
index 031baed90541..c3d021be8147 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index cc9b91e41419..f85badca05c8 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,4 +1,4 @@
-AUX python-rtmidi-1.4.9-unbundle_rtmidi.patch 2139 BLAKE2B 04782e01de9d01a9f4d44c7f856527173227da94f81d2b7338c1e437194be53d0130bb8b03bd3fdc5b7e71d58f7514f476e817066ce5ce80dd530e78a355e2ab SHA512 d02951fe7f84a9b356765a734bdaa010a56562a86cdc1b54077ad25359339fb299080727f59f95273e842ad537192192f0705806d76f6aaf6022d36a0355ab53
+AUX python-rtmidi-1.4.9-unbundle_rtmidi.patch 2137 BLAKE2B b27c438fa93c00fd458fd8083302838ad0ca96c09c89f0993c6fdc09681f8eccddca53445925c1b437860faa488115d2bc33076a202a5dd730f44cef298c9831 SHA512 6d42f2fe1d533d85ae7ac32b903fc087d4932904905fd778e1979aaed3d4dd6e45db4a49ab87089d67a68ac24b724ef0c7e52eb815badb98d972d3de8cd70677
 DIST python-rtmidi-1.4.9.tar.gz 251238 BLAKE2B dda4052e893839f88a6756306f8ff4e89ee66ad9716d374efbb7b92a8e9074e98c8d5df0cc82aa3c6e0c77a78fe9b997079623a5147c03eeea9128dfb7605215 SHA512 91c5a0f807549fbe9d87df6e40b8c3db0f9be753616ba51804900195d02120cd972e39c69dd99e60e4ea1b1d9831d0b956b64ce71b2fe03422efc57bccf5cb70
 EBUILD python-rtmidi-1.4.9.ebuild 1168 BLAKE2B 688b922cd52b746cea5ba0b0d747afdf6b43f355f2823c31de653cec500a156f2f8523df34010a3b6b6eba6c77064efea96236bb2be129af51915c603b28266d SHA512 1008bf277276c1daf1dc1a757a190f1bf53497d6618fbaa5f6e54ade77b6ead54b87e5c737f6d9ff8fb835e2096fb5b6058cfbbf0e09d5578f2cd5af6ea0aabe
 MISC metadata.xml 388 BLAKE2B b1bce0f609aae5a298c26c80c3dc3aa33eadf32c9de9da22f4a4f808d1cfd8c769b095d12f2264cf9dd04cdbec8a0fb7202b10c04bb43f9112146023aadd398d SHA512 012ad743d364b9266bef852d159235f27b172ec7fceff43737fe8a67478f991dc53532b021c02d8ffc2eea19cdc568046cf90e440afefb46dcdad275a33f71e3
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
index ecd9f53b108c..45cece4b2eb9 100644
--- a/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
@@ -9,25 +9,24 @@
  elif exists(join(SRC_DIR, "_rtmidi.cpp")):
      cythonize = lambda x: x  # noqa
      sources = [join(SRC_DIR, "_rtmidi.cpp"), join(SRC_DIR, "rtmidi", "RtMidi.cpp")]
-@@ -145,18 +145,18 @@
+@@ -145,18 +145,13 @@
  
  
  if sys.platform.startswith('linux'):
 -    if alsa and find_library('asound'):
 -        define_macros.append(("__LINUX_ALSA__", None))
 -        libraries.append('asound')
--
--    if jack:
--        check_for_jack(define_macros, libraries)
--
-     if not find_library('pthread'):
-         sys.exit("The 'pthread' library is required to build python-rtmidi on"
-                  "Linux. Please install the libc6 development package.")
 +    if not find_library('rtmidi'):
 +        sys.exit("Failed to find librtmidi")
  
-     libraries.append("pthread")
-+
+-    if jack:
+-        check_for_jack(define_macros, libraries)
+-
+-    if not find_library('pthread'):
+-        sys.exit("The 'pthread' library is required to build python-rtmidi on"
+-                 "Linux. Please install the libc6 development package.")
+-
+-    libraries.append("pthread")
 +    res = subprocess.check_output(['pkg-config', '--variable', 'includedir', 'rtmidi'])
 +    rtmidi_include_dir = res.decode().strip()
 +    include_dirs.append(rtmidi_include_dir)
@@ -35,7 +34,7 @@
  elif sys.platform.startswith('darwin'):
      if jack:
          check_for_jack(define_macros, libraries)
-@@ -197,7 +197,7 @@
+@@ -197,7 +192,7 @@
  # Finally, set up our distribution
  setup(
      packages=['rtmidi'],
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 79445220f156..c9006bac3473 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,3 @@
-DIST qtconsole-5.3.1.tar.gz 430680 BLAKE2B 4655d9aa78a95200fb3f4d2016749d4f1c75865d259da8583818259d05301469b9851b85a2716336084f022f546e97ae003483284f0305793da80a5de7635ac2 SHA512 bebf9c97ebe2a030feebd34f9dbc83294af5eb64946b252c5b5e6391e2760ff95efa7f0be89ec59c424de5fefb3f876ead897d17b679fc87896fe440ba936554
 DIST qtconsole-5.3.2.tar.gz 430792 BLAKE2B 246dadaab92851f8da65dfa4c7e80390defeb0855fdb3ea5ef6aab96bf56b28597dc65d7cb4fc95f0f795a19f4b826d0ec1e1e0b025f4fa49d4d5a78473a2b29 SHA512 715e7e4b185a656f395a30c575e8996271cea4672871d9471c74a13364be1ef0fe0e63951e8f52f10b9c887592dc899c399ae82e09f9934492d13119b1154796
-EBUILD qtconsole-5.3.1.ebuild 1593 BLAKE2B 34ba6800a4d3fead61d6fd3519c0f861dee511cf9ffe47e6396585977163a2992f0d8d59525c20ce99db0edcd387cad79d8d268aa55a29c91965970fdaa8fa36 SHA512 5ef7817012f6dbcec0443b3c8671a513fc90e6ef8dd1b8117106c545cfe70f88948dac35242b563b302fd4a6a013bcea89923c35be047dd3594eaf1c87d8bbf5
 EBUILD qtconsole-5.3.2.ebuild 1593 BLAKE2B 34ba6800a4d3fead61d6fd3519c0f861dee511cf9ffe47e6396585977163a2992f0d8d59525c20ce99db0edcd387cad79d8d268aa55a29c91965970fdaa8fa36 SHA512 5ef7817012f6dbcec0443b3c8671a513fc90e6ef8dd1b8117106c545cfe70f88948dac35242b563b302fd4a6a013bcea89923c35be047dd3594eaf1c87d8bbf5
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.3.1.ebuild b/dev-python/qtconsole/qtconsole-5.3.1.ebuild
deleted file mode 100644
index a596e5db94b6..000000000000
--- a/dev-python/qtconsole/qtconsole-5.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/qtconsole/
-	https://pypi.org/project/qtconsole/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.2.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-# The test suite tests both against pyqt5 *and* pyside2
-BDEPEND="
-	test? (
-		dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	EPYTEST_IGNORE=(
-		qtconsole/tests/test_00_console_widget.py
-		qtconsole/tests/test_jupyter_widget.py
-	)
-	epytest
-}
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 13e0a21b3292..5941dcef5510 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index 0be3d7f9d37a..466e2c9b5f4b 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,6 +1,6 @@
 DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_copyright-0.11.2.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
-EBUILD ament_cmake_copyright-0.12.1.ebuild 1584 BLAKE2B 86c264708c8c39a0788ac8b2de4d0c4316c510514b729bbe4bec879e4ef1572d0e9a87df06520fed4701e582bfcef84717f0c7ed48b8afde77e7ba6ec446df31 SHA512 3c9281af951a09f65e75dcf8e8c535db5a19ed779bcc0a3953c7afa67092a3289681e914d6dd6701e9c70d2990e8cbdb28e75ff8ffb0fda05df87b3cf01dd036
-EBUILD ament_cmake_copyright-9999.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
+EBUILD ament_cmake_copyright-0.11.2.ebuild 1568 BLAKE2B 3b43fc8e211a04d94ad3420cc1bd90a9d7f9210f39b5ec11372e855335903c44a87d9b0499b0be093ec26562fdffb311f4b763b04cee49f341e8be71f87ca611 SHA512 15dfbf94c9070f7eaef9692697b04b0533a472abd34c1c6e04357634480a4366cfc2f82c7bc234b7e4d7bd1275144dbf7cefce12be94052835d82f6d69668a17
+EBUILD ament_cmake_copyright-0.12.1.ebuild 1568 BLAKE2B 3b43fc8e211a04d94ad3420cc1bd90a9d7f9210f39b5ec11372e855335903c44a87d9b0499b0be093ec26562fdffb311f4b763b04cee49f341e8be71f87ca611 SHA512 15dfbf94c9070f7eaef9692697b04b0533a472abd34c1c6e04357634480a4366cfc2f82c7bc234b7e4d7bd1275144dbf7cefce12be94052835d82f6d69668a17
+EBUILD ament_cmake_copyright-9999.ebuild 1568 BLAKE2B 3b43fc8e211a04d94ad3420cc1bd90a9d7f9210f39b5ec11372e855335903c44a87d9b0499b0be093ec26562fdffb311f4b763b04cee49f341e8be71f87ca611 SHA512 15dfbf94c9070f7eaef9692697b04b0533a472abd34c1c6e04357634480a4366cfc2f82c7bc234b7e4d7bd1275144dbf7cefce12be94052835d82f6d69668a17
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
index a5d7095d6b60..5366e55b2827 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,10 +47,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
index dd36342b121c..5366e55b2827 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
@@ -47,10 +47,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
index a5d7095d6b60..5366e55b2827 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,10 +47,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index a6810a65720c..34efefeaa30f 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,8 +1,8 @@
 AUX findpython.patch 543 BLAKE2B b5124bbbfdd97548aaf61bc5c0693bbd230a253302054103b83ae3136c4152f1b692b92a275dcb64713e1baaa0478a65a78a3e3bab9b8668fb14bf5e2c55ffac SHA512 1bd15b358230d43e7556536550287fa3b1e1eaf73fc852986ae7cec82bb13d883f08ac08b89de327465a76a0acdb94a1b09b4a80c4285f85224a2411ab712799
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
-EBUILD ament_cmake_core-1.3.0-r1.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
-EBUILD ament_cmake_core-1.3.0.ebuild 1075 BLAKE2B b316f88d4917bcd603d931c4dbf322910332d87a787e4eb004e3cac909ef0d9dbccc903a35d5b39534cf7b740c5da917d131ecaf80cac9a1702839b1d94d8eb3 SHA512 31c22b3cc6e68423f3f23aa3b0605fae6d6304c4fa194f621035fee473121a5df90eb7a29f6926a265174816dd67e88d556a54f2976c05d44e1287d84957e2ed
-EBUILD ament_cmake_core-9999.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
+EBUILD ament_cmake_core-1.1.4.ebuild 1050 BLAKE2B 6fb63764deca8b482a9d9cef499898f1e4224e34f5ceab0ab5d76bebeff8bca50d5060b996ed181395bf62e838f68ab6ccf42acb0e11e938e1c305ec40b52683 SHA512 2c9c5959306877abf4984eec2ae11f75f762969958e0300b0a67bddf7b6382481477c9ebbb8020368a7136e5991fa11fc8433b3749898375cbd1aeaddd8eb2a8
+EBUILD ament_cmake_core-1.3.0-r1.ebuild 1093 BLAKE2B 5e7193bb5e3e4099a25f3a8065e9c009e8866a011570c181b0e6cc4c765125dd0d72ac682f7b1903efef4cc455851a180d48c056ff20e0ece6ec4b3b3a608d81 SHA512 bc62add555c6a0417164494aa77b1a4a009b1936ec60b0f3e44bfbda75f93367117f6847a39ac2f3982ae08d840c697e27c667c098d48d291976cbfa55131aee
+EBUILD ament_cmake_core-1.3.0.ebuild 1050 BLAKE2B 6fb63764deca8b482a9d9cef499898f1e4224e34f5ceab0ab5d76bebeff8bca50d5060b996ed181395bf62e838f68ab6ccf42acb0e11e938e1c305ec40b52683 SHA512 2c9c5959306877abf4984eec2ae11f75f762969958e0300b0a67bddf7b6382481477c9ebbb8020368a7136e5991fa11fc8433b3749898375cbd1aeaddd8eb2a8
+EBUILD ament_cmake_core-9999.ebuild 1093 BLAKE2B 5e7193bb5e3e4099a25f3a8065e9c009e8866a011570c181b0e6cc4c765125dd0d72ac682f7b1903efef4cc455851a180d48c056ff20e0ece6ec4b3b3a608d81 SHA512 bc62add555c6a0417164494aa77b1a4a009b1936ec60b0f3e44bfbda75f93367117f6847a39ac2f3982ae08d840c697e27c667c098d48d291976cbfa55131aee
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
index 0bc79bd3fd0c..b015998c0bf2 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-python/ament_package
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
index 3e96c689fcb9..299b18017185 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 PATCHES=( "${FILESDIR}/findpython.patch" )
 
 RDEPEND="
@@ -36,12 +34,13 @@ RDEPEND="
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
index 102deab4e5c7..b015998c0bf2 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-python/ament_package
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
index 3e96c689fcb9..299b18017185 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 PATCHES=( "${FILESDIR}/findpython.patch" )
 
 RDEPEND="
@@ -36,12 +34,13 @@ RDEPEND="
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index 27ab17697b5e..540c1b69aea1 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,6 +1,6 @@
 DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1457 BLAKE2B 4d33712fae1347ae211d98b265300ef2a833c65868ad51b2ef2a72339b2b6f239724dea4fc0e51d7533ef74d7d0520c9577b7905b849d71a218c713891e2e59f SHA512 483e99eb874bf9c3b959b10446d3e92311acbf01ef11aca2458f027428bf128e516ac230a9c6ab2cae863f2842091301da294c610e532ce24807200ab05af225
-EBUILD ament_cmake_cppcheck-0.12.1.ebuild 1457 BLAKE2B 5d5f4a0a4e49a9a0dc4a1378fb1cc1c415b8de52b186ddf1d8385612950a55daf1f6c2493f53c7157dbee90a10e44c66f414c1477b56702af38a76be53dbb5c6 SHA512 67dea1e4e71a7e804f9fdce7853ba989f375337becc86ac12520bf4930643367b85842a664a5043bba6812be476824e6893c9c427bef0c60580c7c757913f0b1
-EBUILD ament_cmake_cppcheck-9999.ebuild 1457 BLAKE2B 4d33712fae1347ae211d98b265300ef2a833c65868ad51b2ef2a72339b2b6f239724dea4fc0e51d7533ef74d7d0520c9577b7905b849d71a218c713891e2e59f SHA512 483e99eb874bf9c3b959b10446d3e92311acbf01ef11aca2458f027428bf128e516ac230a9c6ab2cae863f2842091301da294c610e532ce24807200ab05af225
+EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1448 BLAKE2B bf14c617b202dd7f5b134e73cb96b01e52379407e6a4703e51f1ccc4eee3ec8fe9e0c87264c404a24329d086ca28674592046667681f679d2b5921cddec01523 SHA512 f42264130eef5ca480337abb3bc0a399bbc4bf5d3b29c79667f4642cb9bc3430179abe9b76edf0c25a1eb9aa59302c26f478efd834126c872d3b112eac4d755d
+EBUILD ament_cmake_cppcheck-0.12.1.ebuild 1448 BLAKE2B bf14c617b202dd7f5b134e73cb96b01e52379407e6a4703e51f1ccc4eee3ec8fe9e0c87264c404a24329d086ca28674592046667681f679d2b5921cddec01523 SHA512 f42264130eef5ca480337abb3bc0a399bbc4bf5d3b29c79667f4642cb9bc3430179abe9b76edf0c25a1eb9aa59302c26f478efd834126c872d3b112eac4d755d
+EBUILD ament_cmake_cppcheck-9999.ebuild 1448 BLAKE2B bf14c617b202dd7f5b134e73cb96b01e52379407e6a4703e51f1ccc4eee3ec8fe9e0c87264c404a24329d086ca28674592046667681f679d2b5921cddec01523 SHA512 f42264130eef5ca480337abb3bc0a399bbc4bf5d3b29c79667f4642cb9bc3430179abe9b76edf0c25a1eb9aa59302c26f478efd834126c872d3b112eac4d755d
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
index 7c749cbd249f..760fd56cb6c8 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,9 +46,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
index db187d2408e7..760fd56cb6c8 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
@@ -46,9 +46,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
index 7c749cbd249f..760fd56cb6c8 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,9 +46,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index 7d44e0b7f3cb..1d0006e31d9a 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,6 +1,6 @@
 DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_cpplint-0.11.2.ebuild 1423 BLAKE2B 1899b520512daa0a778d66e7ecbfc838f4ced3f048808bf1d9dd588963832808dfdbacca2018b83fe625a9a02e085476f5531db5fca490aadddd10965a41d7e5 SHA512 d202937e66c0d111bfd8d80971a7eb46be25fca44fcf1c0e821948571b0fab6e0d315fff9f5b029a92d41720cb47ae8fd8878fb5c29f9f3d7f5fc3c8a70e06e6
-EBUILD ament_cmake_cpplint-0.12.1.ebuild 1423 BLAKE2B b4b2bf7d19ff82080e26daa373b16f7b2ca302cfc5115c9f2af8927d53d00c509535af99a1ed147a113bd7b54066ad946c31db632801667b56ca19ce296ed45b SHA512 58fd31f70f6489b9b3f473b1132d2bc08e9c624c97007376995b9243a3d8f68d690f45c2edd1931dfdbd69ac54826d176374152e7a7191a3b7644329d6f9bc50
-EBUILD ament_cmake_cpplint-9999.ebuild 1423 BLAKE2B 1899b520512daa0a778d66e7ecbfc838f4ced3f048808bf1d9dd588963832808dfdbacca2018b83fe625a9a02e085476f5531db5fca490aadddd10965a41d7e5 SHA512 d202937e66c0d111bfd8d80971a7eb46be25fca44fcf1c0e821948571b0fab6e0d315fff9f5b029a92d41720cb47ae8fd8878fb5c29f9f3d7f5fc3c8a70e06e6
+EBUILD ament_cmake_cpplint-0.11.2.ebuild 1414 BLAKE2B 286ef2024524b6979d9d0de4e9340e8d56983226f5913320519e86081507c965203b2012951b3e7b362401a036998a4e58b6f686aabe792c43972b938732ac56 SHA512 6c45dc04f421d755159fd6c1c186fbf7e3a306345b9a2ed8fb0aec943d7e731a7483accd76f0e5f295a407a5748bba4a959590da73027499839ae7eda57b5a1c
+EBUILD ament_cmake_cpplint-0.12.1.ebuild 1414 BLAKE2B 286ef2024524b6979d9d0de4e9340e8d56983226f5913320519e86081507c965203b2012951b3e7b362401a036998a4e58b6f686aabe792c43972b938732ac56 SHA512 6c45dc04f421d755159fd6c1c186fbf7e3a306345b9a2ed8fb0aec943d7e731a7483accd76f0e5f295a407a5748bba4a959590da73027499839ae7eda57b5a1c
+EBUILD ament_cmake_cpplint-9999.ebuild 1414 BLAKE2B 286ef2024524b6979d9d0de4e9340e8d56983226f5913320519e86081507c965203b2012951b3e7b362401a036998a4e58b6f686aabe792c43972b938732ac56 SHA512 6c45dc04f421d755159fd6c1c186fbf7e3a306345b9a2ed8fb0aec943d7e731a7483accd76f0e5f295a407a5748bba4a959590da73027499839ae7eda57b5a1c
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
index 8fd9b0edd57b..8697fbb57423 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
index 7052cdbb4a60..8697fbb57423 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
index 8fd9b0edd57b..8697fbb57423 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 50b7aebcaa0d..045aa30c456c 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
-EBUILD ament_cmake_export_definitions-1.3.0.ebuild 1157 BLAKE2B 0d65047b840c2171c3a84e09c78f4d5fe87032fd7fc8458e647bbd893a82be3bd659795f81c0338b02958d865d47d1a868800309f2c601a0e708e966cbab5be0 SHA512 c874d2dc21e2ab429e8cdf72b36604c95ea4cc915c4ae4206c5b7cf40ea64088a7e7d5fe7ed8bf982a45b6669e6f89db62b591b46c5f6dfc75a11e3a91af64b4
-EBUILD ament_cmake_export_definitions-9999.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
+EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1132 BLAKE2B b18ffb1ea3def688c0a7baca1d157c6855b457cc6a1082f535c4fc8eb2b1146acbbc477055c6ec175233eca0b1ccc268e097bfc1063dbb5770ed344db76c0c14 SHA512 ec6ae631574b79436b49a093084045ebc0be1d7e0376fad79e6526e32172d7d34598bac4e3ab0e0b4e35c12c1afbccf9265bbe658c2dd3e37a55c356a07c711c
+EBUILD ament_cmake_export_definitions-1.3.0.ebuild 1132 BLAKE2B b18ffb1ea3def688c0a7baca1d157c6855b457cc6a1082f535c4fc8eb2b1146acbbc477055c6ec175233eca0b1ccc268e097bfc1063dbb5770ed344db76c0c14 SHA512 ec6ae631574b79436b49a093084045ebc0be1d7e0376fad79e6526e32172d7d34598bac4e3ab0e0b4e35c12c1afbccf9265bbe658c2dd3e37a55c356a07c711c
+EBUILD ament_cmake_export_definitions-9999.ebuild 1132 BLAKE2B b18ffb1ea3def688c0a7baca1d157c6855b457cc6a1082f535c4fc8eb2b1146acbbc477055c6ec175233eca0b1ccc268e097bfc1063dbb5770ed344db76c0c14 SHA512 ec6ae631574b79436b49a093084045ebc0be1d7e0376fad79e6526e32172d7d34598bac4e3ab0e0b4e35c12c1afbccf9265bbe658c2dd3e37a55c356a07c711c
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
index a76ef5d0d6c4..74a79383b500 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
index b9c7aa31c087..74a79383b500 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
index a76ef5d0d6c4..74a79383b500 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index 6a05e4c2a68d..bea4a1566d04 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B 2b43718be095690973e7fbab299a1eaf0d1db9f6afc32e0d3c4bae35b28c8a1cc1eefaa78b104f21448b7ae3fcfe98a20d90fdb113cd36d7b17586d78f9cc731 SHA512 55c3736c2ec7d266b2dcbbccf04d4e9483deb979c3a8289864434165332bf4005a3e2344a9cc171261318045a36dd7ad69e1ed6576b8d73afa4a12382a5faa2e
-EBUILD ament_cmake_export_dependencies-1.3.0-r1.ebuild 1233 BLAKE2B 3bda378deea27b6063720fd331fb4733857bba72b0ba3eea5f25208a2dc6077b179887afda6334efa89d9d38b2dd186a6c4249abedd5cef465740ebd3b55b797 SHA512 d92050158f03c58390682ef6c67e49816eac33c5b465b1bc3d0ec5b68c953793c72f785615ad7eac835e2267f75e939c0ed96474803f801b16e01e24b6353522
-EBUILD ament_cmake_export_dependencies-9999.ebuild 1233 BLAKE2B 3bda378deea27b6063720fd331fb4733857bba72b0ba3eea5f25208a2dc6077b179887afda6334efa89d9d38b2dd186a6c4249abedd5cef465740ebd3b55b797 SHA512 d92050158f03c58390682ef6c67e49816eac33c5b465b1bc3d0ec5b68c953793c72f785615ad7eac835e2267f75e939c0ed96474803f801b16e01e24b6353522
+EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1173 BLAKE2B 2b553eb7a582a62439f5790016d5ecec5ef1dad4331079c54683cbb5a92aa2adacecd503be83e0dc90a87c64664216335eca6a7dc87a25c7b0341132504b8ee9 SHA512 d3d3e4e0e221017a9131660d33e8217db7912ca184093a7cb0b8ae47a53ed96c63893aaeb46b977336be3174324e6a7212ca7487e167646231399f0e9e415e93
+EBUILD ament_cmake_export_dependencies-1.3.0-r1.ebuild 1208 BLAKE2B 36936e6dd89a0c290413789332ad08e3b2c343120f2692f43ab37315dfa83b6f8e1f74b369f33ae61e152e4e6186ff8f4dda9e95990b13be88224970c560b710 SHA512 40fadb6bf548f2608ca75981d1ff320195d815a53b7dc196b525303e8dfe1da7f59fcd06460db37405b9180f3df05a18db85c26fcc328c641ab2b88b19a29322
+EBUILD ament_cmake_export_dependencies-9999.ebuild 1208 BLAKE2B 36936e6dd89a0c290413789332ad08e3b2c343120f2692f43ab37315dfa83b6f8e1f74b369f33ae61e152e4e6186ff8f4dda9e95990b13be88224970c560b710 SHA512 40fadb6bf548f2608ca75981d1ff320195d815a53b7dc196b525303e8dfe1da7f59fcd06460db37405b9180f3df05a18db85c26fcc328c641ab2b88b19a29322
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
index d9868e9db6f6..e0d2318a70a0 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
index c116d2160e29..87ab8cbd0b33 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
index c116d2160e29..87ab8cbd0b33 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 283a416a4af7..1a53cd1d79e8 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
-EBUILD ament_cmake_export_include_directories-1.3.0.ebuild 1165 BLAKE2B 98de7dd1c74f24c2997d06be9d370afd68a5c8de33bb59c9a3b9df6bdb87cab31e70173e9c18df7f1a0bd0863386cf96ea9e141904e36892c7d15091cb29f693 SHA512 370fad510608f711b4db3b3edaf207d8f1e68847d18698f3ce3b36af3ecf30761886e9fc8545e8c8a4eb2d6c0b66b8bddd0dbbc62b29526a2ae0915a40914bbe
-EBUILD ament_cmake_export_include_directories-9999.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
+EBUILD ament_cmake_export_include_directories-1.3.0.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
+EBUILD ament_cmake_export_include_directories-9999.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
index 5a4b76c2c1ab..f6499feed3e5 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
index 4f7e319646d6..f6499feed3e5 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
index 5a4b76c2c1ab..f6499feed3e5 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index c7da829d25f4..ceaf400a1845 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
-EBUILD ament_cmake_export_interfaces-1.3.0.ebuild 1194 BLAKE2B c23d297e4572e024fc9f35fa0a42694d8dd78b811c2ff94bca7a5eb748e9b7d9befd34e929e4fb3fe13438b439bd1b427d5d8ce3da2f942f3fd5720a2114dffb SHA512 1259e13f359c029de5c60be039869387298d9e2aaf472aa9453031a76c719573da8a3e2afbc1809472eddb14275998636daa847f66b3915d71b7a1dc44f915b8
-EBUILD ament_cmake_export_interfaces-9999.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
+EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1169 BLAKE2B d71f9f7623a3f05247244d443257f5727fae0e01679ff12be894b0efa6d49bf532ca602286ae7b441f26e360cad1d1c8f2a3fd115770fa89918dc164e5d1130c SHA512 adc6572834e7e5f789b9ddd05465ce0c0b29ecfd9ee7f4ae2d9041096c66398c3f20a74f1d87c1e651cb1c6042bd0c67e1283641d4044811bbcd7aeb928f818a
+EBUILD ament_cmake_export_interfaces-1.3.0.ebuild 1169 BLAKE2B d71f9f7623a3f05247244d443257f5727fae0e01679ff12be894b0efa6d49bf532ca602286ae7b441f26e360cad1d1c8f2a3fd115770fa89918dc164e5d1130c SHA512 adc6572834e7e5f789b9ddd05465ce0c0b29ecfd9ee7f4ae2d9041096c66398c3f20a74f1d87c1e651cb1c6042bd0c67e1283641d4044811bbcd7aeb928f818a
+EBUILD ament_cmake_export_interfaces-9999.ebuild 1169 BLAKE2B d71f9f7623a3f05247244d443257f5727fae0e01679ff12be894b0efa6d49bf532ca602286ae7b441f26e360cad1d1c8f2a3fd115770fa89918dc164e5d1130c SHA512 adc6572834e7e5f789b9ddd05465ce0c0b29ecfd9ee7f4ae2d9041096c66398c3f20a74f1d87c1e651cb1c6042bd0c67e1283641d4044811bbcd7aeb928f818a
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
index 4d93075295d4..a240edee1e72 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
index 622ff31823d0..a240edee1e72 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
index 4d93075295d4..a240edee1e72 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 8adafea6eb0b..2475d891ab07 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
-EBUILD ament_cmake_export_libraries-1.3.0.ebuild 1155 BLAKE2B 4504538b49872446ed5da72b4f593345b1e4226dff5db70f1a5db69b438f7cf48b37d29ca50fa4921c9fde627614390f02a8bfc78931eabd6ea54180b08a7c5a SHA512 62dee1632bdc90df2abc16ccb8e341cd871ca4eefc10e8e1e00ab7f83360b9f81c847823a55e8ab9bdd344a0c09d8da66af95d935f1b494be4b872cb7a1860e9
-EBUILD ament_cmake_export_libraries-9999.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
+EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1130 BLAKE2B f415101f7ea62b6564ade96a4701c31626b9fd3c1a006d8b8c96631cf17402ba3cc567a0430ac4cfb3b8c9400a333fffa132b7f806866846ff737dfc09e1ee0f SHA512 ad75d3265e4432c08d91f72e3660d86ceab964239ed9dc9d1b14c92f51e638b86b873cbc9ddde6be4ace4e2a990b266931f5ca87fa9cc061a6d09465a9761e03
+EBUILD ament_cmake_export_libraries-1.3.0.ebuild 1130 BLAKE2B f415101f7ea62b6564ade96a4701c31626b9fd3c1a006d8b8c96631cf17402ba3cc567a0430ac4cfb3b8c9400a333fffa132b7f806866846ff737dfc09e1ee0f SHA512 ad75d3265e4432c08d91f72e3660d86ceab964239ed9dc9d1b14c92f51e638b86b873cbc9ddde6be4ace4e2a990b266931f5ca87fa9cc061a6d09465a9761e03
+EBUILD ament_cmake_export_libraries-9999.ebuild 1130 BLAKE2B f415101f7ea62b6564ade96a4701c31626b9fd3c1a006d8b8c96631cf17402ba3cc567a0430ac4cfb3b8c9400a333fffa132b7f806866846ff737dfc09e1ee0f SHA512 ad75d3265e4432c08d91f72e3660d86ceab964239ed9dc9d1b14c92f51e638b86b873cbc9ddde6be4ace4e2a990b266931f5ca87fa9cc061a6d09465a9761e03
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
index 027da570e32d..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
index c22c1ee30534..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
index 027da570e32d..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index ad80b1159a1a..683512290166 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tktray/Manifest b/dev-tcltk/tktray/Manifest
index 6dd811074cf3..b097dbc018b3 100644
--- a/dev-tcltk/tktray/Manifest
+++ b/dev-tcltk/tktray/Manifest
@@ -1,4 +1,5 @@
 AUX 1.1-ldflags.patch 371 BLAKE2B a18964ab4a2bcc1e7d3af98a76bb20a0a0993689d353a07b7c8f8296ee956755d3e51f9e7557a362a7bbc51604db3c7b73cb96ecc3c6ac350f313a51d53dbac5 SHA512 d29c06676607eca5fb7a0a0675382a80441117a5a070236329d8f4e8c046a5ade060d7e618740953f4c4c87f432fd661a19e201b737b4273805a48bd0165f553
 DIST tktray1.3.9.tar.gz 134484 BLAKE2B 9edeae9869dc318cd0f98c6585fdef5d903f84f8d32ad0a29fc456ab0eb38615684f7da8a8eb4022c9c40ec24a623c7a189f50d9e17bcbd0a204459e2030b546 SHA512 2c52a343e7f8ff5b7e7bb2e2f1de7766111ce6b47b8ace478a1f2aaa6c28a5b19ec854f2b22511136be1f1da2a87f506932a1d1b893deb3c44a7e47a28609518
+EBUILD tktray-1.3.9-r2.ebuild 898 BLAKE2B 7fe5071b23c81f94769af3ac3141f09982806290f67ca897b04b52a71a6b46ec7532fc0ba3500d59a125836123c797deb78758090609225cbda5b0fd02b7e083 SHA512 5d79159a2d7d8ad87427e29893fd90fec8f2691cb3b4fbdbb38af11896f317187188be50575f834ee6bd008dd541c6ac9e5f41d8f105848a344282e2c5b7df57
 EBUILD tktray-1.3.9.ebuild 768 BLAKE2B 7cd40b26ac07c5d8be2f9d639b536d2b02a1ad5b54e3f204cdca30967515aa7b68f8d95d79f0ae97214eac0b854d1f4bed2c501569aafe4c75ba22bf659e1d90 SHA512 8e675f664da1f60505141d3fa91b8ae86cdecff970d56ce8c6ab9fa1865a29bb51263e4cddddf3f0c2745d9e29147c3349e272cb603930075d1e6e8fc5058c1e
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/tktray/tktray-1.3.9-r2.ebuild b/dev-tcltk/tktray/tktray-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..db484aefe6cd
--- /dev/null
+++ b/dev-tcltk/tktray/tktray-1.3.9-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="System Tray Icon Support for Tk on X11"
+HOMEPAGE="https://code.google.com/p/tktray/"
+SRC_URI="https://tktray.googlecode.com/files/${PN}${PV}.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="debug threads"
+
+# tests need actual X server with user interaction, bug #284919
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/tcl-8.4:=
+	>=dev-lang/tk-8.4:=
+	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.1-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix bad configure tests w/ Clang 16
+	eautoreconf
+}
+
+src_configure() {
+	source "${ESYSROOT}/usr/$(get_libdir)/tclConfig.sh" || die
+
+	CPPFLAGS="-I${TCL_SRC_DIR}/generic ${CPPFLAGS}" \
+	econf \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 75b556f43d0d..d47ccc0263dc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index a00bde90799d..06dbca1f7941 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
 DIST kdevelop-pg-qt-2.2.1_p20220904-72138ed0.tar.gz 1131103 BLAKE2B a388fa38e27115912af7a589f43dc6f95f4af4790435bfda6344fa62245acb37254d86df48bda9201dc6341dc88f04d4bba7c3cfae90189a88e506af66fab95c SHA512 953dc8e76a7cf8d46963ec3b41252b9b19a03275469cfc145b649ef999df1b8aa8f45666616ee56c139eeb4b1e90e6f2fd85d18a1c2371a6133da674ce187106
 EBUILD kdevelop-pg-qt-2.2.1.ebuild 498 BLAKE2B 038fb285a2011f3ac700b5520c3ed1a509afce247a15697be0fae25b51a57253de8cf2586316d989cb48ee14aeb92e3ef99dd708c49c1ef1f63ff3e380152bf2 SHA512 dbc69484eef95d7cc080babc687e08ee4f4a81bf7a4513cf814b6f03deefd0aad4eddf02779ba568b437cae9987aa8b50635a7ab0bab96f0526bfe776632dd66
-EBUILD kdevelop-pg-qt-2.2.1_p20220904.ebuild 467 BLAKE2B c6e94a75795f315fbb5c5ef78a7be2c2979078013a57c1e609375278231ff571f7365279100806a7669e0fb7d0277f5ea992228ffa9601ff64fb4b4f1830e345 SHA512 e0f19bf5b8b1bac0dde2877f75ac324353a2134ef792fb6c67b59742fd1c052be9ddb650a339953ab41e420e71e58509148f2e3ce1dee8d12b95c1fab1baebb1
+EBUILD kdevelop-pg-qt-2.2.1_p20220904.ebuild 466 BLAKE2B 39701f4f18b08001efc267514f9519334cb78aacae58f305a7abb143b3e7348bae44ea5473a30572c60791aa9c3d0b32ed14d93fbe7dc854e958e532079fb90b SHA512 f6c7b32223c3acb4c8db074ff61d517944d3c4aaca15a82f652afb505d782455210b4d05aba01c8b2da6625d73cc3bb70103340f77ad7481ce83cd76320f8a0d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
index e15bf430de47..3b364b840ecc 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kdevelop.org/"
 
 LICENSE="LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	sys-devel/bison
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 982343732b62..d5c3a6fae9db 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/gBhed/Manifest b/games-misc/gBhed/Manifest
index d43e564afbbe..834940492e7a 100644
--- a/games-misc/gBhed/Manifest
+++ b/games-misc/gBhed/Manifest
@@ -1,3 +1,3 @@
 DIST gBhed-0.17.tar.gz 460425 BLAKE2B f3f0d7ee11aed7efdf4c69b22c45b1f36f44cdbea7b0c497d16eacf7d43dfcdd65d5351bcd3e4c20eae184cddcbea62c093f5448bb94ce9cc256e4be8192c6b0 SHA512 036dcdef2de70ebc0774e9907c7697d28369d71fdb763e9034efe9ab2385ac482d2f301e7291a1b4787338080943260cd22715067d10d5f8c8d3690db2f0cc27
-EBUILD gBhed-0.17-r1.ebuild 876 BLAKE2B e606915a11feab301a26aa58a945ffe1831b3a13d34c8fe98ff19884d5544cc5cd4fcc8099c56fb59d0bab4af43fa8a813ba36a6123bb3cd3463c49a47f409fa SHA512 196b86b7553912afa0fea3f5161ca984ff6a2458456a435e86b26b0919e2b0bd5405c3142008ab225d3f92d5d888546d9e6d4810e3e275d7e2206d0b33da9565
+EBUILD gBhed-0.17-r2.ebuild 900 BLAKE2B d39c73fb3e4c8b48444df4f2536fdac8dc1d737860e9ad05773af61f760eddc7e6e8f01d576644ed7f07f819d77d94794552dfd3aa762f8f31e14acc60815e67 SHA512 af3c5ffe761bf2c95b9e68f874f1a5876ce9d0954a9fd9d37878210973c66907f472d843b42e2b9ad0b2cd5b0c06fd669491f433cc1e079ce8b845d590cf4e5e
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/gBhed/gBhed-0.17-r1.ebuild b/games-misc/gBhed/gBhed-0.17-r2.ebuild
index 30e33c085ccd..2ea96ea67eb6 100644
--- a/games-misc/gBhed/gBhed-0.17-r1.ebuild
+++ b/games-misc/gBhed/gBhed-0.17-r2.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
+EAPI=8
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="An Al Bhed translator"
 HOMEPAGE="http://liquidchile.net/software/gbhed/"
@@ -12,21 +12,23 @@ SRC_URI="http://liquidchile.net/software/gbhed/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
+IUSE="gui"
 
-DEPEND="gtk? ( x11-libs/gtk+:2 )"
+DEPEND="gui? ( x11-libs/gtk+:2 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
 
 	sed -i 's/19/32/' src/gui/translation_fork.c || die
+
+	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--datadir=/usr/share/${PN} \
-		$(use_enable gtk gbhed)
+		$(use_enable gui gbhed)
 }
 
 src_install() {
@@ -34,7 +36,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	doman doc/abtranslate.1
 
-	if use gtk ; then
+	if use gui ; then
 		insinto /usr/share/${PN}/pixmaps
 		doins pixmaps/*.{jpg,png,xpm}
 
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 6affa03637f0..74d7defbc17b 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index a02f8bb68bca..a3185e8f734a 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,5 +1,5 @@
 DIST k4dirstat-3.4.2.tar.gz 411899 BLAKE2B 356844373c35def5421c234ae5b07bd11402f56309c30fc68a64766be634fec5f6d04a8931babe21efad6fc36ec992e8ebb08a29dc11a58b2b08f1072b3a8f18 SHA512 d29c9b18b4bc8e94af1f4b494418284a05b95a1b17dbb23614823b0e3e7cd2b470b8330d3f52c584c0c257d2c0dfd4d06914a3eb90a51f7b679437bccc695477
 DIST kdirstat-3.2.1.tar.gz 249498 BLAKE2B 9c80f0460a2a8b31fe1effd2159fc3ddbfd311038ebded7973e6c4f836b7de8a1510891686d3e8efb4c4e102582697c5e57e7363b5582bb84364d7a2c1c64dc6 SHA512 db0dc98257914b7cd006c9523b83bd3e2fc1f2f1b1f842b01e6eaab4c8ec9299ee6fc97badeffda89a00385eeb0fd693921dfbafc090bb29d4e7d8cde01ea102
 EBUILD kdirstat-3.2.1.ebuild 923 BLAKE2B b4e5696e999b1284a115172f99d36dab527d954a744b6b86089ee977af705714d7e8271605fd3df1d5069879bf20dc78ccfaa11218a78fa06fd7f65f050f5615 SHA512 6c3232dc31d3c28e67866a39585141195bf959a9adee49f27444207c2bacf97edba77c876a14b5e6c482511c4bd4737b1a3aaab278424795927fae802d5c3922
-EBUILD kdirstat-3.4.2.ebuild 938 BLAKE2B 7b8e7a797baa39b0361a4d9ed91181fcc5098ff195d5bb08dbca62a812bbd6d0a48e9c08664d30bb6bbdda1e1c8334d7d1b103a7082acf462640615ec145e523 SHA512 84045726ce832cf5349139ca5383a27815a278b409c573dbb932ba97f8d51be73e501b510bbc3dab6f96869132b592b1e84287cc1015c99c6728c72f44e61745
+EBUILD kdirstat-3.4.2.ebuild 937 BLAKE2B e93454e1fea59a5dd78967274a971c1faff4659106af0cdc1a5e57aa78c87b302c72438b06b3421939f876ff737fada6fb0f117c1839550cc062028aaa3640df SHA512 b967f007aeec7be7124de1d2332a7c207806f9e11dabb7a3405c21481078ee41bddcb34912ef9db5f12d24768ac1028d8e8a51514e45db95e1640b8d5ef4001a
 MISC metadata.xml 337 BLAKE2B 38d85ce7db71e7a64dbf1cd522be85c8046e39e5d8d9f8ce69d36f6eba5ca3c8bd575aa05be63f576089b11e3ab2f7a272ce0d66b81c490efc1632fec3e4bfed SHA512 71d8aad0051f0b3dd735faab0badc3aa607423dbfd970958eadd75d48ce6c72f9a8d7d1d0706f826cdf99679da84a6c27a8ecf0a61b0fee95c44962361eb3381
diff --git a/kde-misc/kdirstat/kdirstat-3.4.2.ebuild b/kde-misc/kdirstat/kdirstat-3.4.2.ebuild
index 50be1f733085..e409b1d498b0 100644
--- a/kde-misc/kdirstat/kdirstat-3.4.2.ebuild
+++ b/kde-misc/kdirstat/kdirstat-3.4.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest
index 83b322a1d23f..9e4a47b8e4d0 100644
--- a/kde-misc/kio-fuse/Manifest
+++ b/kde-misc/kio-fuse/Manifest
@@ -1,5 +1,5 @@
 DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd
 DIST kio-fuse-5.0.1_p20220906-fbd09a33.tar.gz 56438 BLAKE2B 45655e9308614f0094b18a6f9c6f52013a60ba00243a3871b182cf76d2f91eb5fddc401985eea39a7af26abc8045958894501969ad21dbdf9969f131005718cb SHA512 a6f4222c4f020b2bfd6c38b303881f4810f857aad9b611d2e6abe448d945d881e85d4f1ebd0d2cb7ca6dc3b11cbad6331dd00fcc6ec1109ad1fbea7f20490fdc
 EBUILD kio-fuse-5.0.1.ebuild 871 BLAKE2B 20bf3c6ce9f8224b17b025f0c571526dec6457c981e325322dd4820153b523582ed63d6ea966ba267382855614a9c0a97e92223114a65b1600f71a0de23a4063 SHA512 0c2773d1c933c3ac8d269389cac274d91f8657521ebd3a883d2e508a413216951bb2c0eef1a8337da799dcb8b6dbc403dd8cb53aae7ff83904e1cc3575cc49ba
-EBUILD kio-fuse-5.0.1_p20220906.ebuild 913 BLAKE2B 0a79b7e00affc8780de86eabb70862378938fac9decf026ad151e22786f4cebee03f8b0f47f31a81700cc7825aecb34127b0b57e8e48afb8c55b742326ae81bf SHA512 ee42f18f672bd8dfb181afaee2c7bd39c4e32f91ceabe55ae1e397178a6302c09e42f3306b85cd49bdf815b2c4d69670cde8d681191fecb9a38e3041339a75b0
+EBUILD kio-fuse-5.0.1_p20220906.ebuild 912 BLAKE2B 0707da3e58065ea84839d5385154ac390345c9b0a2d5dd38850e21b84fc6e96fd3e0a4eb3052ead815f46637660752161eccd24bbe2d2b427a7af72dbbef360c SHA512 90194cc212f286f2312cc26aad0140aadb528782c25a4c36db789bba908d3ad0c66f886f55c2a4f38c0fd0c498113b2319e5496eaaf55d29fb061cf77d5f3ba0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
index 05523cb743ec..8f73c33087b7 100644
--- a/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # depend on fuse kernel module
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index f36e5dc0e652..0689778f4c4f 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -2,5 +2,5 @@ AUX krename-5.0.1-no-kjs.patch 20279 BLAKE2B 06a3267c03489c06122fccb65b7ce317dca
 DIST krename-5.0.1.tar.xz 321556 BLAKE2B 38835e4f7ce97b4991419ac7676268701c0977feb32457c9dc5ddcea92f576012320eac06aadbe426a5e176aae6270606688afd377af4c9ea32d66bd75a74fdd SHA512 1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379
 DIST krename-5.0.2.tar.xz 337908 BLAKE2B 2fb7a96ca3f3f3b193d0924dd1131a7442b32149c1f62387734c47680077b6f77e3cf32b940b85d6f688d24f24af08ac39a8ccc86f10f5ec1d65b53fc9631108 SHA512 c065d6de90c43e5297db2773d8569279535b007d3b00b99a252329e78c90dc949678ecd2f2ecaa74e72394fa0e848b8774f6f387d4a7f367b367b1dd38405545
 EBUILD krename-5.0.1-r1.ebuild 1530 BLAKE2B 879ef3edf7668a0579ea1e2991a465ca4db1fd39604c079fafb8ca1dad4d25aefc1e394430641619f786fea4c86afcb9de06a4d6d48491b51442a3651a06fa3a SHA512 6596742c229adbdc0891ad9b2a20f17d9112dcaaae222b8f39b373d4f219d16535f73c60b94cd627c28c49cf01cda5e3041b691cf13450e89ec26f5951edd2b5
-EBUILD krename-5.0.2.ebuild 1538 BLAKE2B d9b2941c48ce57d0d0a110c9220beec8b5ac1140a23d6bfc820737f905b8c87d989393cb34c948c7a95a3ee7a927cc64cdf0d8227ef285c14184c625e46ad05f SHA512 b9d043963eebe4cbd21f9e3991539e5ea76cb89b4870db55586400c03338a1c39ea6592cf2ab84a69367f643f19f0ba2de73cdc958a47a1520f6dded5d9039da
+EBUILD krename-5.0.2.ebuild 1537 BLAKE2B 4bcdbbdd190da8f6472e767adfc38bc7f4915d46f262f8fb4e7c9412dc513c615434d57b971be3c507f480ab9e6ca89fb6cd729680c06fd0de98a0e656c89c87 SHA512 620ee01a89535c5afeac2e123e14ce91548408fcdc394ca66e0df5ac0add4a76fb8f338efb48b8b11a64083c94bd36a264bbf7612bb9302def309d317da2ea70
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/krename/krename-5.0.2.ebuild b/kde-misc/krename/krename-5.0.2.ebuild
index a0302fac3977..632cc5cb2f25 100644
--- a/kde-misc/krename/krename-5.0.2.ebuild
+++ b/kde-misc/krename/krename-5.0.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krename/ https://userbase.kde.org/KRename"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 076af9a30bff..fdb5838c0291 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 51cf3639535c..db3b9540053c 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -4,7 +4,9 @@ AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc9
 DIST asymptote-2.78.src.tgz 15274780 BLAKE2B 0c99aff54df79eabdf059cc0bb2cdd0832d7cc7ae83a2e3ab08116aa6bc75de44f7adfa096b7ed832fc96cd9db0bb41a490a8c5fd29716ad9a7852e52a98ad2b SHA512 dcc27ce608cb72b3979a87bd6e312774008a225b0936027c11bf1862e21dce5db6de9bf5db14c85ba1f7ed25ec77c3a57e2ecf58a73b46315daca11777910c24
 DIST asymptote-2.80.src.tgz 15054879 BLAKE2B bf1a569b1d752775630d6b775eed3119fba3327cd87af3963c13ec98269980a0d856cfedfe6271bea6a4e33ce58cbb0ae7aaafb0993351dbaa521d362ef41289 SHA512 cf79951c10fa327bf827c244ed9eed63c1229affe34786f5d397ec9f78df789c63f321ad548fa68fe9980c968262c16bcac4be5cef8898aaa9b89fde8a67d68d
 DIST asymptote-2.81.src.tgz 15062426 BLAKE2B 887fdc18c247e05249c2303fe8d534023620a5289225d769f2c59016d290cce76dc0156965c2deeb6daa09a1e1215b2d5a9fc440096f5f776c61849d7cafe093 SHA512 6959cdd58cbd8ec92b01a841e4a589f8826b35fd860a1d95e0cae60dd4bf2bc23c39d7df8350267a0053dbc88576933233fc21dae40cb25b216bb2cdf46893ed
+DIST asymptote-2.83.src.tgz 15044624 BLAKE2B f364d7fa5d09bfc94f2556d5c99fc2751182f4a231544c24b449f02f36cca62e48272827f5bb405119b82d75517ef1fe49ec87cb75eb30de92ed95ac360a553c SHA512 cb59731f6d68658746cd1e686a54b6f590e4a4990df572e89b4b5faab6bb8ed75de9d7f75e65b8ed76227ead59930d5492d54239db6acdb4bff2377ac2b97dec
 EBUILD asymptote-2.78.ebuild 5509 BLAKE2B 6471ecce59f1337426c50c7a0663ec24a84a65649cd98ed123122d600121168ea5bb0a1bf81b4a5213b5e4ffdec9741b347501894a86c5f70f53785e41aa6f63 SHA512 cc03d9be579252e87cca572eb73bab92be059d9ae76da2316bd419423abee353aaf3c4e1aa1b8e8c06e892b72b3e522cad2e672ae5b4c2c1a0f44b328fd9bad9
 EBUILD asymptote-2.80.ebuild 5511 BLAKE2B 5b9663e6375dd0bb195e85f34829a9b314e18bab509f26b4ee7e872bddb13f79ae09421f665b90e07ff25fa76f0ff2f7a11faf7ffd7154c8015b33365c136ec8 SHA512 d82a688f5d095e6414bc6957d5c8ecff283ccdd0c4b256fa37c520711c0b47870f333dffa423b5511fe86a557c76faddc8634c2c31f6f96eef5200aa27c339f2
 EBUILD asymptote-2.81.ebuild 5511 BLAKE2B 5b9663e6375dd0bb195e85f34829a9b314e18bab509f26b4ee7e872bddb13f79ae09421f665b90e07ff25fa76f0ff2f7a11faf7ffd7154c8015b33365c136ec8 SHA512 d82a688f5d095e6414bc6957d5c8ecff283ccdd0c4b256fa37c520711c0b47870f333dffa423b5511fe86a557c76faddc8634c2c31f6f96eef5200aa27c339f2
+EBUILD asymptote-2.83.ebuild 5537 BLAKE2B a6870fb3b750810b2e13365fd5ba69f153de663a4626a4764e22814a780696b0f8c15916a880c2de73d5ef3637071f45a547ba69af3075fd4a8829166c99c65b SHA512 a99fce25a0672c6d61a4243d8a8cc3b2dc68bf96b06ecde45004aa789031b9ff2202a9c3371c23ad248d1a27226d4919d026930c153794cee8bbb2673305041d
 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.83.ebuild b/media-gfx/asymptote/asymptote-2.83.ebuild
new file mode 100644
index 000000000000..e49720ad4fba
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.83.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools elisp-common latex-package python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="https://asymptote.sourceforge.io/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	net-libs/libtirpc:=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1:= )
+	gsl? ( sci-libs/gsl:= )
+	python? ( ${PYTHON_DEPS} )
+	curl? ( net-misc/curl )
+	lsp? (
+		dev-libs/boost
+		dev-libs/rapidjson
+		dev-libs/utfcpp
+	)
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+	)
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+	)
+	context? ( dev-texlive/texlive-context )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	doc? (
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${PN}-2.70-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${PN}-2.70-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		--disable-gc-full-debug \
+		--with-latex=/usr/share/texmf-site/tex/latex \
+		--with-context=/usr/share/texmf-site/tex/context \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable curl) \
+		$(use_enable lsp) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	einfo "Making info"
+	cd png || die
+	emake ${PN}.info
+	cd .. || die
+	if use doc; then
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+	chmod 755 "${D}"/usr/share/${PN}/shaders/*
+
+	# documentation
+	dodoc README ReleaseNotes ChangeLog
+	cd doc || die
+	doman asy.1
+	doinfo png/${PN}.info
+	if use doc; then
+		dodoc FAQ/asy-faq.ascii
+		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+	fi
+	cd .. || die
+
+	# asymptote.py
+	if use python; then
+		python_moduleinto ${PN}
+		python_foreach_impl python_domodule aspy.py
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# X GUI
+	if use X; then
+		cd GUI || die
+		python_setup
+		sed -e 1d -i xasy.py
+		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+		cat xasy1 xasy.py > xasy
+		rm xasy1 xasy.py
+		mv xasy xasy.py
+		cd .. || die
+		python_domodule GUI
+		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		docinto examples
+		dodoc \
+			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/*.png \
+			examples/*.pdb1 \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/pixel.pdf \
+			doc/extra/*.asy
+		docinto examples/animations
+		dodoc examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins *.sty latexmkrc
+		if use examples; then
+			docinto examples
+			dodoc latexusage.tex externalprc.tex
+			docinto examples/animations
+			dodoc ../examples/animations/*.tex
+		fi
+		cd .. || die
+	fi
+
+	# ConTeXt
+	if use context; then
+		insinto /usr/share/texmf-site/tex/context
+		doins doc/colo-asy.tex
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins base/asy_filetype.vim
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 6b7459fbbee8..3f261d768e8b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,8 +3,8 @@ AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b783
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
-EBUILD gimp-2.10.32.ebuild 5649 BLAKE2B ed0b99850166d7d0a464d16aa74faa18aea2a92e5dab1ae8680bf813e9eed1323a2fb042c08b3a6fec416fa9e5cc83c14591e785931ecf7ffaf5ab3a404cc271 SHA512 ed4a2a0a1f4c3eb0188d97cc8527996cfe5c18279cbbe7577c14435229261aeb7e77d7ec87b4295fdb9e298bb7e91d767f5bc5048ffaa9e6cb21d0b95bc4f5fd
-EBUILD gimp-2.99.10-r1.ebuild 6613 BLAKE2B 2883d26916fa9a54d5037c7524f141b47faeba5816dcf086e549f0c5eadcd607e591c655bce0ae8322ba9d69f14f20a7f816ad732fc7cc0ba063715e3286e1d0 SHA512 17e79ffad687a53ce0da2280c628b2309245aff2935997a6817e2297435291992216b934ece01bdbef69633744740849faf1115e6230e92053ef6c19621835f9
-EBUILD gimp-2.99.12.ebuild 6862 BLAKE2B 2cd043793acc11e23526a1a2f68b808c664472738e91e9d08a25d6812ac8e4deb0854941a936c8da9c769628ca352cc2d31e0e3f76afab35fba02b28949737b9 SHA512 cc8ce92d51e1340ae595eae143c26720eadfba0381d334fa8bf9d6d2bbd024e019cdca3c4b1be04121c0b32afec4c3af37911353c8c037bf7cf9b3b5ff7cd320
-EBUILD gimp-9999.ebuild 6714 BLAKE2B 027a7b3582dc93f251c6efe6150990e5a13ed4173f6923717052b9fbd28494d031af1cabb7a8bd3d6cd2b26dd403dd8d4cf1ba2ca81491017c83903b667cd54b SHA512 dda911c6d56ec16cd67387beb4199a47d9d9e7d081afb7b6cf44b2d92280f5a2e57be1dd1ad91a74a3b984ce7eb98e86dd476a8ae074ef2fb629e9d6de582536
+EBUILD gimp-2.10.32-r1.ebuild 5651 BLAKE2B ef43e980abbf5138658ab5d99c6eb61260c6c46830b7af5b7c73439fe9021c874e2a1510312ed19adf9aeef1c74690759ea812001b9e61b4d16ab76026f853df SHA512 5032166ffe5b5a90dff4dc9fc5198d8ea853fdee93c05993a2a2848cebb32b7ad762f2723237dff5ea09967236cac69235796bad654c57b203d45c75c9d5e042
+EBUILD gimp-2.99.10-r2.ebuild 6615 BLAKE2B bbc5019792517a8f16ee8a2112aa1b867ab69e1f5182fb1c4691f33ae43236d0791625daeea0b3ea8061a09afcf302f7f0994e543aa394eaaf9884dc620e4190 SHA512 96ea4d91f2c5b27b6b4bb7b8ef3974afc008aaf63a9ed309ca934399e54e9cb8846caee75d9807c9a5e4a392deace281bd5673be1616a04eff43c8568f63e9ad
+EBUILD gimp-2.99.12-r1.ebuild 6864 BLAKE2B c87f2113968c2e5fdc14a2295fa7482da7295f5ee18ed1f7c87a8711ff4fc5d7e8492d38e167b81169d09786a22bb5150bb5c687fee9001147f4d51841271316 SHA512 942d93da26e23fedfbf0e18a88543722d704e7700e828262feb05ef300bde97af23ea6b32253e3cf3c25e334eb639d30c7a542b50151ed0e3b057cfe6175b48d
+EBUILD gimp-9999.ebuild 6716 BLAKE2B 3bb64815eb150c7b212f7a0fac16308a580896b7cff02fcfae97faa528600ad0ad7330c75da29f62870d956dd865b5c8dbfa89b0025a920719e6ff7165709e69 SHA512 c93640bd93922e80dbca12a2490d4676657e26235f4a6ed57224853e76e5e5dbb15e6f7020bc1b3678a30dddea24e3dbad049f08dd19fb2071be19086472cb32
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-2.10.32.ebuild b/media-gfx/gimp/gimp-2.10.32-r1.ebuild
index f1395d2a1fc4..a3403b9088ad 100644
--- a/media-gfx/gimp/gimp-2.10.32.ebuild
+++ b/media-gfx/gimp/gimp-2.10.32-r1.ebuild
@@ -54,7 +54,7 @@ COMMON_DEPEND="
 	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl:= )
 	udev? ( dev-libs/libgudev:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
diff --git a/media-gfx/gimp/gimp-2.99.10-r1.ebuild b/media-gfx/gimp/gimp-2.99.10-r2.ebuild
index b0b067cd7b88..6e2153c71aba 100644
--- a/media-gfx/gimp/gimp-2.99.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.99.10-r2.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 	)
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
diff --git a/media-gfx/gimp/gimp-2.99.12.ebuild b/media-gfx/gimp/gimp-2.99.12-r1.ebuild
index fc46f29d2a4a..832014ddddb4 100644
--- a/media-gfx/gimp/gimp-2.99.12.ebuild
+++ b/media-gfx/gimp/gimp-2.99.12-r1.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 	)
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 04935142f351..a09486cb7046 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 	)
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 7545547de071..0b5639ca166e 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -3,5 +3,5 @@ AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed30
 AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
 EBUILD kgraphviewer-2.4.3-r1.ebuild 1134 BLAKE2B 98138f2be42b6e006d96576dac964717aafbcae7eaf222cde033791b6cfac6131ead11ecc81d68675e154448e9064b1b2fa19d714cabccb41daa27ca92544ccf SHA512 9da0a9b995323a44bc274838b33a16eaafd4584a4f54249ccaed1b638c762599dfb915a50a3207a5abf970a49b26b5d6af3cb40978f4266f488482bcdabfbabc
-EBUILD kgraphviewer-2.4.3-r2.ebuild 1099 BLAKE2B e4704719c8714ef6a5c8f9c1af39f45537ead1f143ee16038ab17ea165b99a298f792e3b0b9caec90fd6ae2fcd1df940333591324e9b0ef4e91a27742f8a092b SHA512 8938a61d3084ab5c97f50849bcbef12e6d8eaad4a1d3fc351965042f14a59b882ada008156b8022d3844d78b2231ac6a4600339e6959e3ce58df15dc1db6d5d9
+EBUILD kgraphviewer-2.4.3-r2.ebuild 1098 BLAKE2B 90ba69ef9a3118e4ee61bd53dd1a8585dabbe1094c99d180e553505786b633b8f891118c8df600a279cd4622d4913001ca04e3158f16ada49cf1f6331a35a85d SHA512 ea112d1219f7f577bf1f2992b2a8254da11945c3a6f8caf78fc06d719abb6fedefc849058edb5b74b90762eeb97d3da35016614b98ee559714b48f4f4c436e7f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
index 46516c3b741d..41ddd6b6b4c0 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kgraphviewer"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index da7b9557d05a..eb2f0b32b4c6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 05758d5026c9..83a2fa528282 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,6 +1,7 @@
 AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4
 AUX libsdl2-2.24.0-clang-15-configure.patch 768 BLAKE2B f21f01da86fed778f5ef88cfc692b0588d1ea6de1bd05c0f6d1b9b480175c79a1f7bcc62cca123beb387f174fcf70676997f1e37b6b2baef59143b9222db0d5d SHA512 7d1822a05fae900f572809ba7de7a46cffaa03be7ec2f6d4b1cfa3b164a468ad7c4bea2606da32598519d2f8abb0d9bfcc3268f2cb7858de784244dbe0a68804
 AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15
+AUX libsdl2-2.24.0-fix-build-without-joystick.patch 1263 BLAKE2B 9421e7056496fb46393b53e0d7da85ae0169e5dc769fc5b2be045127eaab13d69ab5d5e00f1a4f2c2223e03bc2cf58fe17f377dad39f35afcccd7ef4f69a94df SHA512 2c24c90503b62c30bd3aa47285d4cbb6372beacc5561390ad998a44fd5342a50ade2983e0731a3a63696c03f5b348ae711ea6e8ab59d5ada64afd0079e5d6d22
 DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212
-EBUILD libsdl2-2.24.0-r2.ebuild 6464 BLAKE2B 0a23c1356dae43988311889f2775beeadb899def9729953aacb54af8eb664c22bf3e06fecb5ebecf7b904541ecb17da30bed9d0d062ec12e1c86106c58b1aad4 SHA512 c1c64049f309b8e26bcb6c293069f7a0baf6f4bcf40a9fd466f1584657ff0d618dd9277e722f7eed1011a4e47ee4a7747771f09798f9ae6dd69d9c70cee380d7
+EBUILD libsdl2-2.24.0-r2.ebuild 6517 BLAKE2B f809229345e39e0c4a0946526181475d18e45dd06c9a74f8df7529afe40cc87af2fe17dfa0256f7ea255be7a49858eaf6ee29b887250817d94c0ce268afe8c86 SHA512 84f2aa5a22dad410e09a86cafb71ec9edbc110f07b9c7a980ce0c5ee77009fbcd48f27e4ba494d909d2a211064a42adf13744d12bf9ecb72b6375a7f46d13281
 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1
diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch
new file mode 100644
index 000000000000..0370f66ef8c9
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch
@@ -0,0 +1,32 @@
+# https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51
+From 71fb91f7e43c5f046a037bf5ca59214d93fe2d51 Mon Sep 17 00:00:00 2001
+From: Cameron Gutman <aicommander@gmail.com>
+Date: Mon, 26 Sep 2022 21:38:09 -0500
+Subject: [PATCH] evdev: Fix build with libudev and joystick subsystem disabled
+
+---
+ src/core/linux/SDL_evdev_capabilities.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/core/linux/SDL_evdev_capabilities.h b/src/core/linux/SDL_evdev_capabilities.h
+index 26fa7400485b..990ebe01b872 100644
+--- a/src/core/linux/SDL_evdev_capabilities.h
++++ b/src/core/linux/SDL_evdev_capabilities.h
+@@ -25,8 +25,6 @@
+ #ifndef SDL_evdev_capabilities_h_
+ #define SDL_evdev_capabilities_h_
+ 
+-#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX)
+-
+ #include <linux/input.h>
+ 
+ /* A device can be any combination of these classes */
+@@ -53,8 +51,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)],
+                                       unsigned long bitmask_key[NBITS(KEY_MAX)],
+                                       unsigned long bitmask_rel[NBITS(REL_MAX)]);
+ 
+-#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */
+-
+ #endif /* SDL_evdev_capabilities_h_ */
+ 
+ /* vi: set ts=4 sw=4 expandtab: */
diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
index df06e35c7b52..481ce62c0cdf 100644
--- a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
@@ -97,6 +97,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
 	"${FILESDIR}"/${PN}-2.24.0-clang-15-configure.patch
 	"${FILESDIR}"/${P}-cmake-target-fixes.patch
+	"${FILESDIR}"/${P}-fix-build-without-joystick.patch
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 59e1b837f85f..e2a8ba0d1f40 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -6,5 +6,5 @@ AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5
 DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b67c38797cee140488afe268687e4030158280c1064f8111891b9114106420314cdbce1b8be8d7dd45204a07aa5b0 SHA512 b0a555276e26d171705e93bdc26d33869fa611e01728d935edd0a7b96815db4f9ff264d7d6cecccc751b0bbfd639b14316f1ab576b1182b755e0f1832d8f43ca
 DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870
 EBUILD netpbm-10.86.33.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc
-EBUILD netpbm-10.86.34.ebuild 6056 BLAKE2B d9f4109dd96128f1de18010ebb080e5dca5e3a85066b94d5af645ce2ccd7b81dc9133d7d5498ecaba84c08025ce9f5110473feff8747daf681aa82097a040e05 SHA512 9a286556e902e75dd88534f6c4740fc6807cc36b8307172daa501bd088701cd06b977a4a85f0bfa7d17e067e4c29e3a0dc71252041edc4100aefa52bdcd55596
+EBUILD netpbm-10.86.34.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.34.ebuild b/media-libs/netpbm/netpbm-10.86.34.ebuild
index 6bcdb4345f40..8b60df263a57 100644
--- a/media-libs/netpbm/netpbm-10.86.34.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 BDEPEND="
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 2ad8774996ef..b4e4dfb9f9ff 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -3,5 +3,6 @@ DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175
 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
 EBUILD tiff-4.3.0.ebuild 2056 BLAKE2B 424dba5d1ffb1699a268dabb5498fe6a46a21b70123bc1cba04b5e9bcb637151b4ff49262f9a53adf95766293a4a2c7d9bfaeb192c92e083ae5cefa21931a436 SHA512 09d81e358ed7af8dd65c73dfb8c857e5d48d7cdaf764a5a5fbcfe400133915d074a2c6c15bb0a617d0fdd271f10de20402a807a4e265dfc96dbe65af8b016bb3
+EBUILD tiff-4.4.0-r1.ebuild 2836 BLAKE2B dbf76350331330d17c0b9da1ba07e46b199afa7d5b72c079d6d1d0f55e589d83055be0f5ef47567a90816f156589c50318a4d38a9cf30e89953e5534b9245e7b SHA512 080c5df137bcb521c9dab08d32c63fb0dd1bf296814525e10156acf8f8f21ca1292c317fcdc9e454deb52d57b5e1b621d8601028d92c181a398892823cc3a9c5
 EBUILD tiff-4.4.0.ebuild 2749 BLAKE2B 2972cee88d4e4f9ae3a612338e4c3c8f01fde2f6ac1f9185dabe23ac9ff9e1932abd306a226167a50864c5bf17daf82ef39513c68c0cad5e998ba48ce5d029cb SHA512 c345cfaad0670f8dbe1ffb413fdd40943628c75c526bf2626331aebd95e346f422f7c3d7db1734c35340ebbb5b1868ef025e8861ad6481e55c80feb69f909c8c
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.4.0-r1.ebuild b/media-libs/tiff/tiff-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..10db9528acb3
--- /dev/null
+++ b/media-libs/tiff/tiff-4.4.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION="$(ver_cut 1-3)"
+
+# Release signer can vary per version but not clear if others will be doing
+# them in future, so gone with Even Rouault for now as he does other geosci
+# stuff too like PROJ, GDAL. Previous release manager of TIFF was
+# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying
+# who made releases.
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc
+inherit multilib-minimal verify-sig libtool flag-o-matic
+
+MY_P="${P/_rc/rc}"
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="libtiff"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+# bug #483132
+REQUIRED_USE="test? ( jpeg )"
+
+RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+
+	append-lfs-flags
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# Remove components (like tools) that are irrelevant for the multilib
+	# build which we only want libraries for.
+	# TODO: upstream options to disable these properly
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f37422602244..56e1a266e38e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 2bc453437073..07034e39d4d5 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,5 +1,5 @@
 DIST audex-0.95_pre20190721.tar.gz 179903 BLAKE2B 4260130eba3b1b30e94b0af5535beed6ce73b2a1a46ff91fd808f7d224b363474e02ef6592ac6136361b871cd91a7a4371faad6769f1ab74bd21d1fd2d793876 SHA512 3eec37e3396408c0ce753ed4c315830e542f3ae17fc4000b3c790be22ed74208bc2a956da4248250932e5b7fceac11802d731cf4d65709c207521bcdbaed5957
 DIST audex-0.95_pre20220909-f94cd394.tar.gz 192286 BLAKE2B cbe2376aba03a5c575aead2ff3f105381150e370415433136128642e21c6481cd8db6ad44f7e9ca0e8e6ea00886a918582c232aec49023ca710d501a579f1a25 SHA512 b251a9d90f3d24ae3da75a2ad73654505ff6fc3bbc71ad65b5f37380cd2b6f04122c1f6246013f5078178982de6e37afe2bbea34c084221401e1f91fb9ff4ba1
 EBUILD audex-0.95_pre20190721.ebuild 1307 BLAKE2B 28868cba19f03fc2e3f2b211bea3e26478ee470fdf0a76918cd9a0d5d2c25695556e5ffda45a247de192a07598daf5debc97a09df2e3971ba0883c89aa559d7f SHA512 d8f4256bc7402e51b55d5e69f6638b3943b07e6f09a2716e69037b7778fefb90937b1a1697571c56aa12981ad18e2930d5cb9d4a68462c19b64df9dc55e69a70
-EBUILD audex-0.95_pre20220909.ebuild 1182 BLAKE2B 07dbf57ae9504d412e8f858e9d159f727a55a166eee049332ba16669eb756ab6ddbf8a3af2d9efd50936d7b998974a6bfe3ec9d69b1f2dd2fe5016d8fa96e451 SHA512 923faff97a2adf93b81380006955e26422c5bd3e0fa0ba3d70c7398bcce8a8f8acd1850cf247c38291cf93d81a602eb3df87bbf2499bf57505a0d5c62e369c72
+EBUILD audex-0.95_pre20220909.ebuild 1181 BLAKE2B 65d3332fbacb2b7b9eac7978f91f5132e9373e6f1a4e0e88c419b6b3979a6b54b1e3396cf153ccd67dc75754b214ffcbef7c859acb533ad064bfde07ab7283b8 SHA512 89af4c5eee55429d654fd7ac8a5238d2a1a5d1b9ad69e85921855f0bcac7e2fe587965e370956cb2db9aa5cc41f2d360f80c752213c8bb8b8732e15fb96b4dc0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-sound/audex/audex-0.95_pre20220909.ebuild b/media-sound/audex/audex-0.95_pre20220909.ebuild
index 0dee099c1bca..c4a6572fc313 100644
--- a/media-sound/audex/audex-0.95_pre20220909.ebuild
+++ b/media-sound/audex/audex-0.95_pre20220909.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Audex"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/mp3wrap/Manifest b/media-sound/mp3wrap/Manifest
index 0f7baf189c26..f02b5dff0058 100644
--- a/media-sound/mp3wrap/Manifest
+++ b/media-sound/mp3wrap/Manifest
@@ -1,4 +1,4 @@
 AUX mp3wrap-0.5-Wimplicit-function-declaration.patch 171 BLAKE2B 76309d73b37655dfb91d40a7b37c9940904d981b3a3c081bda31b4f3e68dde928689cadcb769b6f5f03498473147b53922138ba288e2237e814a8010e288cd1f SHA512 30ad56d51d8008930a30e5aadaf29421fafa4da1ac419974b3956692521b179454dafde8466c42b2d498d985a43da054e7f51c0ef27863031f03f37a2ee129e7
 DIST mp3wrap-0.5-src.tar.gz 113008 BLAKE2B fea61d613b48ab492237ddf813a53ee434341262a69e5e36ef7052bc00088361550c363cc979ae012cdacd45bbdc86f9d54f2aaed60166586a1a283d8a5aa7a8 SHA512 2dc7a72a12b9245956000443a51cd5341e1d48795b629f6277f9dd26ac9b3ab2511a119478a10daa9516cb2526073956af42f83410aff1e4eae0c972fdd8b0f1
-EBUILD mp3wrap-0.5.ebuild 527 BLAKE2B 7ee5508d1dab4fb13a70c858ecc331e393b9bb90c048f033db89e605a6279a08d9a7c96abaa4cdb3af207273e6cbf0be7a04387afc1060316fb7e1604b765ba6 SHA512 a11855b89ec444d440c7552bffb0b08f493691d120b4ad5819de7b81bff72d90d1b6280d2d359db566d035b14f4de14818803a9090160e0f174df03af8fe70a8
+EBUILD mp3wrap-0.5.ebuild 588 BLAKE2B 99f4f7d2826acdc49d37ae13f5f350f5f282781b1b4cb1953dc725dae0cbb0ee339401f13188933913094c3ad0e893a7285bcfe90fb882c5f16d103a1baf2017 SHA512 5eb7c2f2ca4fde804adcf9d678401b07dbb39a3ba5d6b27a45592b8a7c890288a46c7d0ab5eaef3ff20879bdb6edefaa51cf5f02204f8854d27f71cffc1795d1
 MISC metadata.xml 331 BLAKE2B 578394893f649b1acc931b41b3f2edf769798d2e0e58400f6bdbc8dab54d3d54ea546efcbf3d36a2b49a01c790b6e026959178de6a595abca3e6ef79276b2d52 SHA512 59e4e6ac3240ff2e13899c3c34b4120780a6408d258ff7296a65e6885a968bc2a810bd49b6aa8129eea7726490187839d59b827dbc817753ba16270f0ca154eb
diff --git a/media-sound/mp3wrap/mp3wrap-0.5.ebuild b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
index c0f1e36d268f..02ef4c9ca59b 100644
--- a/media-sound/mp3wrap/mp3wrap-0.5.ebuild
+++ b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Command-line utility that wraps multiple mp3 files into one large playable mp3"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
@@ -13,6 +15,12 @@ KEYWORDS="amd64 ~ppc sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_install() {
 	dobin mp3wrap
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 25668cc4cab3..dabe638fbf90 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
index 614dfc781daa..ccdc33049e46 100644
--- a/media-video/blinkensim/Manifest
+++ b/media-video/blinkensim/Manifest
@@ -1,3 +1,3 @@
 DIST blinkensim-2.7.tar.gz 88416 BLAKE2B a1ac70795f1eeb70ef3d4ff4a961a76c591071aaf4278a7a046d317b7c5a7dd2a19595ed0db659735f97143e1dffba3c53edd00521a8b450dbeb17b31d174c0f SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4
-EBUILD blinkensim-2.7-r1.ebuild 634 BLAKE2B 21a535a066fc123411567dc7329e4a7b9f6d86bf9adc28efce6333a75571e41fa6601fa3df8c1e1aa833ab3f4d789aca83f84e81ddce4ef666260c9e4b6e2170 SHA512 49dec858034fe4c1d46312d375ea84f3bf5e24375eabfadcf753983950c0fcc0d0e016728c3bc68c69d5ac254b0bf537100875a7e20b736485d16bc23d3043c8
+EBUILD blinkensim-2.7-r2.ebuild 703 BLAKE2B c2878ef51b5586aba5f5b878bc5b8604a04e0f345d747b996b029fb58706f0e2e961248a271ccc16f09cfcf262520ab3f4a20fc7e696a4a681adf812d6c83ac5 SHA512 8f2fc170734393b626c9c7ca2ad05a5aeb4c239c9d100cc28339c55fd0baf8cef2d0919b2921023b71df4bde7541c0e930890c0fe6bef4bf81f28ddcf069614a
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-video/blinkensim/blinkensim-2.7-r1.ebuild b/media-video/blinkensim/blinkensim-2.7-r2.ebuild
index a5d76d7a4b6f..6ed9e5cc9d26 100644
--- a/media-video/blinkensim/blinkensim-2.7-r1.ebuild
+++ b/media-video/blinkensim/blinkensim-2.7-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-DESCRIPTION="Graphical Blinkenlights simulator with networking support"
+EAPI=8
+
+inherit autotools
 
+DESCRIPTION="Graphical Blinkenlights simulator with networking support"
 HOMEPAGE="http://blinkenlights.net/project/developer-tools"
 SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
 
@@ -20,6 +22,11 @@ RDEPEND="
 	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
 	gtk? ( >=x11-libs/gtk+-2.4.4:2 )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 1533344527af..902cccd22bf7 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -3,5 +3,5 @@ AUX kaffeine-2.0.18-wayland-window-activation.patch 1098 BLAKE2B a129d194ef354f0
 DIST kaffeine-2.0.18-scantable.dvb 1880456 BLAKE2B e435309f0a11cb6ecb9671c0948c6afdf4c946bc0914c0809945002e353383bb539e1c5594a0a52f2968393623c56914b360b37e5b24a0c17a8f3a60b100ad6a SHA512 2d00987eb261e6f52df490dd44b43567f7d4e3bdcfd0eb2f62e064604d91661e9754cf9e5462b491009fcb35bdca681f4be2a9f06b6b6d47a5b44f5819dbf4fe
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
 EBUILD kaffeine-2.0.18-r1.ebuild 1523 BLAKE2B 34353431c4762fb778b341bb7431e325aee9bb3c296427129953bcfef256823ffe2cdeae828f82830accbaff6b34fdb485fa261d1513f8180b4e0c15299a35cb SHA512 5c8843a715286fc1e3f34518ec629fc2276aba15d559810f25c74c0ceba5049c15681030e53d1d11f6431d307abfbf992365168ce66136c41f67037a4414a013
-EBUILD kaffeine-2.0.18-r2.ebuild 1747 BLAKE2B aac03082651227d2984a6fee2340ed99a7610c16ccfdb8b7a4d5deece62ac30a949049c06371ec5e104e84a9eb797dd6860c4aa43260cb40d7eb614d2ecc5589 SHA512 06f611b6fc91c7680d06db8ff7d16aa55feddb4f6ba3b43f11e5f8494b0fda82b014d055c0cf8b141468b490cc19a9dfaaea5558d6340d9d64eb9b153da46d48
+EBUILD kaffeine-2.0.18-r2.ebuild 1746 BLAKE2B 017a0a9f6e789a0e5001e19ee47a7704419a03a656f08f1984b72c3af644aac6cf7ef30326b35c9cf58f8adfe80eadde78e4ff20bfeb258435be99ab08cd58dc SHA512 7c64ae392aba349a2d0aa3dfe7d0a3393a0fda2c67ecdc3a7b0159208af97b34852a60a34146ddece737abd98033be35521518f8008840ab61f587cd7daeb625
 MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71
diff --git a/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
index 706e25ae3566..f988700d6e1d 100644
--- a/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 	https://linuxtv.org/downloads/dtv-scan-tables/${PN}/scantable.dvb -> ${P}-scantable.dvb"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Media player with digital TV support by KDE"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1050cf615dd9..5b0fe0adfefe 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ecde9f139954..14b8b634e810 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Oct 2022 05:39:52 +0000
+Tue, 04 Oct 2022 11:39:46 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2660c6b9b129..f98a2aa811a2 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529256 BLAKE2B a8ad285bac1cf4317c62825ad52e916f3d77cdd05175694abbde87461cf015178a8cf1dd6c3af6013668089990ee96f6cb9be7de7409b13ba538d09d94cde515 SHA512 3502c0b489efa2b78e07af6e3b1c1c817c21c7435c1db2224f9b91f9d0ce815b1514a1e3062680326c8a33813260f974b3b492221b06b61e7499b2dcad6eaeb1
-TIMESTAMP 2022-10-04T05:39:55Z
+TIMESTAMP 2022-10-04T11:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM7xytfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM8G4VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD1Bg//QJgiDeOwspopcAXCcWQfGdkJKssaV9thFUTPEI2XaXcezB70KyoBU6Ui
-/me41GNG50yYIRjIvEtgGyQCkGXPyDYylg9fzq8d3ZdfxJRBH89VcoZcqpGV8Jqi
-bEP8lrkOm7xwS1fTgvpWF5ZqgZrIQvs4iAAJqwVsJ3j3IEiwRS4bAJKxWCbx7VJs
-92FDAut0fxqjGORxszW8rfNvNVcZKkIo2Vk1ABvXXzF4juaJm2rVIas+NlOZI1aG
-BRzh9RGZ97x9xzj+0XZjdTmgdOYWcYOVK4PHqwWWvtAto7gm8EXOLPsAtrKVON6g
-2A/DWSdwv1GLIep5mCq2tNVbwDSjZCoRVPQWyAIDtCbG0zpEJVBvedJjYjNW5QBK
-1t8lFi3l0X/CoT4wvAgqo6J6qCvJdX1iF+IAUwolju8VTj//1TKPWb/2EAAmDj2C
-ZaCyu0oaOr7LtSzXpIPWDoY2kSP/10TL3Uj9HxWGCs577XWxal+okel63NguAsH5
-YAOjrisq0Y86VczIFPANzZ31+l+k7m9s42dUaGLBOI/4SpXbL3f97vo7Is1Xb3dg
-ygPKb6ZnMrjQZ6KmWDr1SkdQPdwhO2tzNmQlDHC2pwJHCW5H/EglqFkfOU/GL4NJ
-eQSPc/QQugcdWPtBz5iwP/MQ1qZCfeHXOqoTexDOF2rCjCbT8cU=
-=SNCR
+klCCHxAAiz94ByJUgqqi8+mp2cVDK0FkTZ9KkICyVMdvPf7cx+SUiLGCSfXkpUN0
+98el+h1EcWoAm71GFeXvG5V22KTFakoZn0cT7zKkD29zdFy4MHkomNRWddLhunlT
+r7GcZSn+acZTgtnAv/sRbMoL8BI/SKNJnAcLl8FXsOYZ2VUPnJSqEtPep+iVugx3
+1q3kYD6oAwBhmZgMyUL+bcYLSnl2l8c71nF1rp7yHYW8P+fCN10BlVsiHtSY0IdF
++mDXt3JCzUnMz2I1oZg6ShImVzss7zmcZEeFlceNMKjx2cvLSv67kBjHMQTJ9Gr/
+pD6Zmsd1EGrNeFgOnzoNGf3w1S24qvrK6jCMs34AUnuHRpqtcsnDlwUxjiKm1Bin
+hIku1TsI1MuDeyHj35KjyK0AN5sFp9KKTDDYl3OjiXu6Xpf78ZQpL7g66yjDVBNk
+Jzli+oSX8pB/3hH1t70kFFu7Zh4REiLk0mzwrjyIoOKWXWS1Cb7QwcIDxBGUOpVE
+CudHl8w6B5ImsAeVzgjwz7zRTIMmAY9/kW7L2Kg5PuxSippYZHPjImuc7OxfipKJ
++7qaUWSwltX8EHVEve87Ecj1udYCtNOjQQ2Z8lmpapHirApv6Ij+rT36LmZVTmmP
+chLm5vuz7yX7Yk231vvWTbCa9zsTbjA6g/9qs5HIBBvtcXsBorU=
+=tNMn
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 313557cc47b3..14b8b634e810 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Oct 2022 05:39:53 +0000
+Tue, 04 Oct 2022 11:39:46 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 92e33b27b8e0..54367d7acb0a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index c38483927a71..36381e0f5b00 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1
index 9f64e94299dd..794e52e76301 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.openwall.com/john/
 INHERIT=autotools flag-o-matic toolchain-funcs pax-utils
 IUSE=custom-cflags kerberos mpi opencl openmp pcap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA3 dev-perl/Digest-GOST !app-crypt/johntheripper
 SLOT=0
 SRC_URI=https://github.com/openwall/john/archive/5d0c85f16f96ca7b6dd06640e95a5801081d6e20.tar.gz -> johntheripper-jumbo-1.9.0_p20211129.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4e6c63a734463c75f5b7aec7d6fc465a
+_md5_=cbdef26230746b749ccf4ba4d3c17a4b
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 2322efa4ff5a..dbc83d964db9 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.5-r1 b/metadata/md5-cache/app-i18n/nkf-2.1.5-r1
index ed3de7fc4d71..36560c516d3e 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.5-r1
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.5-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/70406/nkf-2.1.5.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/c2c6724714b66f295137c8818dae4c09fc09e0a3.tar.gz -> python-nkf-0.2.0_p20191121.tar.gz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=b33a8f0a5db236efdaec51ad6f16ab02
+_md5_=827699cc13516cf003d1fe76daf5edc4
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.9-r1 b/metadata/md5-cache/app-i18n/uim-1.8.9-r1
new file mode 100644
index 000000000000..bf40a5a2c127
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/uim-1.8.9-r1
@@ -0,0 +1,17 @@
+BDEPEND=gnome-base/librsvg sys-devel/gettext virtual/pkgconfig kde? ( dev-util/cmake ) nls? ( dev-util/intltool ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) kde? ( kde-frameworks/plasma:5 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A multilingual input method framework
+EAPI=8
+HOMEPAGE=https://github.com/uim/uim
+INHERIT=autotools elisp-common flag-o-matic gnome2-utils qmake-utils
+IUSE=X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD GPL-2 LGPL-2.1
+RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) kde? ( kde-frameworks/plasma:5 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
+REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/uim/uim/releases/download/1.8.9/uim-1.8.9.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a5aa6cb0907938d8a91a304845b317e7
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c54874dcbd9e..0990f58ef149 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-10.0.0 b/metadata/md5-cache/app-text/ghostscript-gpl-10.0.0-r1
index c313e344edf7..098d0b01d742 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-10.0.0
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-10.0.0-r1
@@ -12,4 +12,4 @@ RDEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2=
 SLOT=0/10.0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs1000/ghostscript-10.0.0.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-10.0-patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=575a9100621a7d9823710b293bd68e30
+_md5_=f61473d9eefb38d3c6040263541ea888
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 044cd5992891..38006c147c3d 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/gtkada-22.0.0 b/metadata/md5-cache/dev-ada/gtkada-22.0.0
index 466d538844f8..6a2f40b5c5a1 100644
--- a/metadata/md5-cache/dev-ada/gtkada-22.0.0
+++ b/metadata/md5-cache/dev-ada/gtkada-22.0.0
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
+DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
@@ -8,9 +8,9 @@ INHERIT=ada autotools multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gtkada/archive/refs/tags/v22.0.0.tar.gz -> gtkada-22.0.0.tar.gz
 _eclasses_=ada	fc6c14ed095d505642b43326b744689f	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=20480f3f41b51da1311b470dd62713a3
+_md5_=ca32f95b28e64f3145e3691065608409
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 146ecc0c31fb..1595f20a059f 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index 853830604d65..f477c83ad55b 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5f4f2d91488556166bdc004714fdf6f6
+_md5_=5365b105212193b14dbba1b0a2109750
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21-r1 b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
new file mode 100644
index 000000000000..99ac04591583
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/asm:9 dev-java/brotli-dec:0 dev-java/xz-java:0 dev-java/zstd-jni:0 dev-java/osgi-core:0 test? ( dev-java/felix-framework:0 dev-java/hamcrest:0 dev-java/javax-inject:0 dev-java/memoryfilesystem:0 dev-java/mockito:4 dev-java/slf4j-api:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java API for working with archive files
+EAPI=8
+HOMEPAGE=https://commons.apache.org/proper/commons-compress/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/brotli-dec:0 dev-java/xz-java:0 dev-java/zstd-jni:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=6faed9a298f6f2ae8a596e6bffb25a38
diff --git a/metadata/md5-cache/dev-java/easymock-2.5.2 b/metadata/md5-cache/dev-java/easymock-2.5.2
new file mode 100644
index 000000000000..6dbdcac940df
--- /dev/null
+++ b/metadata/md5-cache/dev-java/easymock-2.5.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the fly
+EAPI=8
+HOMEPAGE=https://easymock.org
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2.5
+SRC_URI=https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=38f4fff4cf026f20e65e2a4805815459
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index 559dc5c330dd..d501cafa47c8 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the fly
-EAPI=7
+EAPI=8
 HOMEPAGE=https://easymock.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=600961bfa15ecd7f7b7f9310c15c0a1a
+_md5_=8756a40188a88794646f84faaea90d85
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5 b/metadata/md5-cache/dev-java/felix-framework-7.0.5
new file mode 100644
index 000000000000..3c56cf73fd43
--- /dev/null
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/animal-sniffer-annotations:0 dev-java/osgi-annotation:0 dev-java/felix-resolver:0 test? ( dev-java/asm:4 dev-java/easymock:2.5 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Implementation of the OSGi R8 core framework specification
+EAPI=8
+HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-framework.html
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/animal-sniffer-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz -> felix-framework-7.0.5.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=28327f86846d451960cb27560f33e538
diff --git a/metadata/md5-cache/dev-java/felix-resolver-2.0.4 b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
new file mode 100644
index 000000000000..af851922a666
--- /dev/null
+++ b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 test? ( dev-java/felix-utils:0 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Provide OSGi resolver service.
+EAPI=8
+HOMEPAGE=https://felix.apache.org/documentation/index.html
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz -> felix-resolver-2.0.4.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=3d6f47fc85d16d1591f138a8f4f149a7
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.11.8 b/metadata/md5-cache/dev-java/felix-utils-1.11.8
new file mode 100644
index 000000000000..197d85d62ea7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/felix-utils-1.11.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-cmpn:8 dev-java/osgi-core:0 test? ( dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Utility classes for OSGi
+EAPI=8
+HOMEPAGE=https://felix.apache.org/documentation/index.html
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz -> felix-utils-1.11.8.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=527883c2c47d94fde28ab99789823e37
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4 b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
index a6d6f6896e48..2bf0d1c2f976 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.servlet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( GPL-2 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/servlet/archive/4.0.4-RELEASE.tar.gz -> jakarta-servlet-api-4.0.4-RELEASE.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=7ae5d97baf9bb169cefb36364c13ea2f
+_md5_=f896dde4a1aa06afdf3cc58cb1ec6b6c
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1 b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
index 4b3a32b43490..dc03cb7cb561 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/Pragmatists/JUnitParams
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=1df4e1c033f5b47fe3613081513fa086
+_md5_=65bbce8fa50be869136354dd1522ad59
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.4 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.4
new file mode 100644
index 000000000000..22e767447fa0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JNI bindings for Zstd native library
+EAPI=8
+HOMEPAGE=https://github.com/luben/zstd-jni
+INHERIT=java-pkg-2 java-pkg-simple cmake
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/luben/zstd-jni/archive/37faee49643b2739457716e3752f44fcaa09005f.tar.gz -> zstd-jni-1.5.2.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=710c7d56350c94813739bf8eb3363fda
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e4e8b45d3c27..1d83c2184a46 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.3.0 b/metadata/md5-cache/dev-libs/grantlee-5.3.0
index 484f57d8c49c..9111a8c8316e 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.3.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/steveire/grantlee
 INHERIT=cmake virtualx
 IUSE=debug doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a8da43f9cc91ddd33cf11802dc72e7b
+_md5_=837b0edf9f1ce8bc8d9cb0336e5467d3
diff --git a/metadata/md5-cache/dev-libs/libebml-1.4.2 b/metadata/md5-cache/dev-libs/libebml-1.4.2
index 7d51f5a2ce38..9f5f0f290fb3 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.2
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.2
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fdc75cf6cfb2f1c9eb4623b444038efe
+_md5_=807abd8624a8b3c42b29a4f43309b201
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.6 b/metadata/md5-cache/dev-libs/pslib-0.4.6
new file mode 100644
index 000000000000..30c2a89a0ebc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-libs/glib:2 dev-util/intltool dev-perl/XML-Parser sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=png? ( media-libs/libpng:= ) jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff:= )
+DESCRIPTION=pslib is a C-library to create PostScript files on the fly
+EAPI=8
+HOMEPAGE=http://pslib.sourceforge.net/
+INHERIT=autotools
+IUSE=debug jpeg png tiff
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=png? ( media-libs/libpng:= ) jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/pslib/pslib-0.4.6.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=051a60bec07c1714031b941b297e8380
diff --git a/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0-r1
index 7779cae2d3f9..6d2a33db2285 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Perl interface to the MD2 Algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-MD2
 INHERIT=perl-module
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) RSA
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-MD2-2.04.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=e6d48401ac394682c4228bdd4df4cea8
+_md5_=10d5ab598238f5f3cca6ee41cb4517d1
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 6596f3bf8b80..04c1c3b02e56 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index bca49a6af12f..2fb43ff840f1 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/contourpy-1.0.5 b/metadata/md5-cache/dev-python/contourpy-1.0.5
index d716077d48ff..126da308c41a 100644
--- a/metadata/md5-cache/dev-python/contourpy-1.0.5
+++ b/metadata/md5-cache/dev-python/contourpy-1.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/contourpy/ https://github.com/contourpy/contourpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~hppa ~riscv
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~riscv
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/contourpy/contourpy/archive/v1.0.5.tar.gz -> contourpy-1.0.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=77ba7b69f37bc2b6b9a3ce03b198b187
+_md5_=19e2eef679d7e50a3b014c04c44f9697
diff --git a/metadata/md5-cache/dev-python/imageio-2.21.0 b/metadata/md5-cache/dev-python/imageio-2.21.0
deleted file mode 100644
index ba18d7c3265c..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.21.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for reading and writing image data
-EAPI=8
-HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.21.0.tar.gz -> imageio-2.21.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/imageio-2.21.1 b/metadata/md5-cache/dev-python/imageio-2.21.1
deleted file mode 100644
index fb23abfea8cd..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.21.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for reading and writing image data
-EAPI=8
-HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.21.1.tar.gz -> imageio-2.21.1.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/imageio-2.21.2 b/metadata/md5-cache/dev-python/imageio-2.21.2
deleted file mode 100644
index c06aa7eb59f4..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.21.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for reading and writing image data
-EAPI=8
-HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.21.2.tar.gz -> imageio-2.21.2.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/imageio-2.22.0 b/metadata/md5-cache/dev-python/imageio-2.22.0-r1
index 679bf897aba0..72346ea5f645 100644
--- a/metadata/md5-cache/dev-python/imageio-2.22.0
+++ b/metadata/md5-cache/dev-python/imageio-2.22.0-r1
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.22.0.tar.gz -> imageio-2.22.0.gh.tar.gz
+SRC_URI=https://github.com/imageio/imageio/archive/v2.22.0.tar.gz -> imageio-2.22.0.gh.tar.gz test? ( https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/chelsea.png -> imageio-chelsea.png https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/cockatoo.mp4 -> imageio-cockatoo.mp4 )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1be6ddbf12ba1226d0caea4060f90b37
+_md5_=6d95d00bb5d2696b4019f41878206682
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1 b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
index 9e8e8418bd4f..0e181138580c 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
 INHERIT=distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs virtualx
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~hppa ~riscv
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~riscv
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.6.0.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=08c59bd949b09da6bf192b7a58d20c13
+_md5_=fd9efd77ab10bf28577471f2f15dab2a
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.3.1 b/metadata/md5-cache/dev-python/qtconsole-5.3.1
deleted file mode 100644
index ce3d0cba42bb..000000000000
--- a/metadata/md5-cache/dev-python/qtconsole-5.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/QtPy[pyqt5,pyside2,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,svg,testlib] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/ipykernel-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.2.2_p1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/QtPy-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,printsupport,svg] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Qt-based console for Jupyter with support for rich media output
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/qtconsole/ https://pypi.org/project/qtconsole/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=BSD
-PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/ipykernel-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.2.2_p1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/QtPy-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,printsupport,svg] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.3.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=68d35ca6cf2410192c641f77fdab5a02
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index e38cc8a54bfc..5dbc43b5446a 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2
index e19260fe1ef8..82016a9b56cb 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=37c229a5505c035e31f6382542a97392
+_md5_=8d1acbacc2719736dec3bba93a5ebb2a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.12.1 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.12.1
index c0e6dbae3b02..1a9b3a2b8541 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.12.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.12.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.12.1.tar.gz -> ament_lint-0.12.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=95341807db29420a65c8ceebcaaec611
+_md5_=8d1acbacc2719736dec3bba93a5ebb2a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
index 83aa8ecce32c..b98600c40dbd 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=37c229a5505c035e31f6382542a97392
+_md5_=8d1acbacc2719736dec3bba93a5ebb2a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4
index bd7bc24a9986..29c76323b96d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -11,4 +11,4 @@ RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d90d642fca85f95e8096bdc5d533c6bc
+_md5_=89da470a93ff21272542e435ba8b8fcc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0
index 5c47d0a9bfb5..5ee6c9bac23a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -11,4 +11,4 @@ RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f94d8785d6c9a9b1f242f5f7ef941624
+_md5_=89da470a93ff21272542e435ba8b8fcc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1
index ddb8fcee1c6f..b3af724d2794 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -11,4 +11,4 @@ RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1c42966a406d5fabee370d2ea62046f7
+_md5_=63c5ddbf3c87402c5fc16491c2a21401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-9999 b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
index 605a85429cc5..536f5311a08f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1c42966a406d5fabee370d2ea62046f7
+_md5_=63c5ddbf3c87402c5fc16491c2a21401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2
index e87a8e2ad4c3..e7bfcb96db4c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6998d5df4c82bbee6a17189afec40099
+_md5_=f6c9e1a155ae18602bfaa82903123708
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.12.1 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.12.1
index 65ad6d8c57ef..d50149ccdf51 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.12.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.12.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.12.1.tar.gz -> ament_lint-0.12.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a1350552a9002145274d7f333533756b
+_md5_=f6c9e1a155ae18602bfaa82903123708
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
index 983e72f77569..59ce54d5a401 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6998d5df4c82bbee6a17189afec40099
+_md5_=f6c9e1a155ae18602bfaa82903123708
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2
index f03a7eebc87d..a98320272908 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5155df95676b7f2efb9ef0f37da3c7a6
+_md5_=be9ff8395558f94e3717e5f53d8c7df4
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.12.1 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.12.1
index 3249e0ae3e21..19703776150e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.12.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.12.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.12.1.tar.gz -> ament_lint-0.12.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6e1f2a9cf500921c8b628669660ee623
+_md5_=be9ff8395558f94e3717e5f53d8c7df4
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
index a8d22e901646..443f55c5e377 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5155df95676b7f2efb9ef0f37da3c7a6
+_md5_=be9ff8395558f94e3717e5f53d8c7df4
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4
index e0975037b75d..0c0e24aa7627 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b0f6156c8f2fc6687cc3b07bf291eb9f
+_md5_=b2a1b4cba32034a220559dbc6e150b28
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.3.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.3.0
index deab8434a893..e06a876d5da5 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.3.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a222038d07077a52d22678c545bcab58
+_md5_=b2a1b4cba32034a220559dbc6e150b28
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
index 04fd5ab84c7f..c87fac79a626 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b0f6156c8f2fc6687cc3b07bf291eb9f
+_md5_=b2a1b4cba32034a220559dbc6e150b28
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4
index 6ec68d642f6b..bc0baf394279 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=77a751dd0fde3255daa16ad16621f970
+_md5_=e510e34fe944a51a389eb49bdf741feb
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.3.0-r1 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.3.0-r1
index c45ffcd98e6f..a18e34e9ded4 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.3.0-r1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.3.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries dev-ros/ament_cmake_gen_version_h
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries dev-ros/ament_cma
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9b7cfc7fbcb1fce60b9ea04a0eaab1d
+_md5_=f89e3fc0c2b7656da4851c8b265661f1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
index 2bba0fa24a64..cf833593654c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries dev-ros/ament_cmake_gen_version_h
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries dev-ros/ament_cmake_gen_version_h
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9b7cfc7fbcb1fce60b9ea04a0eaab1d
+_md5_=f89e3fc0c2b7656da4851c8b265661f1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4
index 1f5d64a09010..72a9cc11fe6c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0cd9425f449cc4e94419a598f4fdac98
+_md5_=dd082d0d736e7843815ea2d2721e4116
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.3.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.3.0
index f3bd7489f3ab..317925ce17ce 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.3.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a76efecaea35ef1b5906e487d9218a3e
+_md5_=dd082d0d736e7843815ea2d2721e4116
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
index 1d78e5dcd95a..7fec9e7e2355 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0cd9425f449cc4e94419a598f4fdac98
+_md5_=dd082d0d736e7843815ea2d2721e4116
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4
index 8f4bda121154..e82c349395c3 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8baa914e33cc39147e5d5b3d62e417ea
+_md5_=f058baf4619782117ba4d01f37c86213
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.3.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.3.0
index b53f22e3cf47..fc4fb5cfc711 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.3.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=62473ae21f602d863684ba557f3ee4a0
+_md5_=f058baf4619782117ba4d01f37c86213
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
index df28de4b0b0c..3f17968e82e8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8baa914e33cc39147e5d5b3d62e417ea
+_md5_=f058baf4619782117ba4d01f37c86213
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4
index 1d0b02195e83..2a9e9abf7695 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7a758237369d996a7df04f5f291ee51c
+_md5_=f4bf28df67c4dd4ae9803760ba00e11f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.3.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.3.0
index 8cd0afda07a5..24536be837d4 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.3.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -11,4 +11,4 @@ RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dc3b5bc43138ae070e3eeae41034585c
+_md5_=f4bf28df67c4dd4ae9803760ba00e11f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
index 0545c586ada6..2df83252ec7f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7a758237369d996a7df04f5f291ee51c
+_md5_=f4bf28df67c4dd4ae9803760ba00e11f
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index de016568fb3e..12296a0189e6 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tktray-1.3.9-r2 b/metadata/md5-cache/dev-tcltk/tktray-1.3.9-r2
new file mode 100644
index 000000000000..63d26645d21e
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/tktray-1.3.9-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-lang/tcl-8.4:= >=dev-lang/tk-8.4:= x11-libs/libXext
+DESCRIPTION=System Tray Icon Support for Tk on X11
+EAPI=8
+HOMEPAGE=https://code.google.com/p/tktray/
+INHERIT=autotools
+IUSE=debug threads
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=tcltk
+RDEPEND=>=dev-lang/tcl-8.4:= >=dev-lang/tk-8.4:= x11-libs/libXext
+RESTRICT=test
+SLOT=0
+SRC_URI=https://tktray.googlecode.com/files/tktray1.3.9.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=69f7f4d01f145fd30c4d6a9621aa7a62
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 193aefbc0ecc..91533edbf3d9 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
index 17bf031fff59..dbfa935f2931 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
@@ -7,11 +7,11 @@ HOMEPAGE=https://kdevelop.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://invent.kde.org/kdevelop/kdevelop-pg-qt/-/archive/72138ed04d427f520e65b146525632e967177abe/kdevelop-pg-qt-72138ed04d427f520e65b146525632e967177abe.tar.gz -> kdevelop-pg-qt-2.2.1_p20220904-72138ed0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=05a7e75925113678318b7aba78fd5d01
+_md5_=cbedfbd2bfeaa6e8316c21df0ceadd2b
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 49b0a716ba7c..2f849517abd6 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/gBhed-0.17-r1 b/metadata/md5-cache/games-misc/gBhed-0.17-r1
deleted file mode 100644
index 62f1e7153892..000000000000
--- a/metadata/md5-cache/games-misc/gBhed-0.17-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=An Al Bhed translator
-EAPI=7
-HOMEPAGE=http://liquidchile.net/software/gbhed/
-INHERIT=desktop
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=http://liquidchile.net/software/gbhed/gBhed-0.17.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
-_md5_=4d8a6d952d532a89327ef1e30c985d55
diff --git a/metadata/md5-cache/games-misc/gBhed-0.17-r2 b/metadata/md5-cache/games-misc/gBhed-0.17-r2
new file mode 100644
index 000000000000..b19f301f4b43
--- /dev/null
+++ b/metadata/md5-cache/games-misc/gBhed-0.17-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=gui? ( x11-libs/gtk+:2 )
+DESCRIPTION=An Al Bhed translator
+EAPI=8
+HOMEPAGE=http://liquidchile.net/software/gbhed/
+INHERIT=autotools desktop
+IUSE=gui
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gui? ( x11-libs/gtk+:2 )
+SLOT=0
+SRC_URI=http://liquidchile.net/software/gbhed/gBhed-0.17.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=86b07102c437d9295346f87c944081c4
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index f66be5dce99d..03a793843eef 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.4.2 b/metadata/md5-cache/kde-misc/kdirstat-3.4.2
index 51c7fb0911d0..0a2951119384 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.4.2
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.4.2
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/jeromerobert/k4dirstat
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/jeromerobert/k4dirstat/archive/3.4.2.tar.gz -> k4dirstat-3.4.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=795521e0a871152f4cb4ebac60274f34
+_md5_=9eee10ab76990a8da7de11cb6dd2e28d
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906 b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
index ae9fed33de17..a1c53ae7e433 100644
--- a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
+++ b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
@@ -7,11 +7,11 @@ HOMEPAGE=https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org linux-info tmpfiles
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 sys-fs/fuse:3 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 virtual/tmpfiles
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://invent.kde.org/kde/kio-fuse/-/archive/fbd09a339f9880fe8d018001d4d2561593f90530/kio-fuse-fbd09a339f9880fe8d018001d4d2561593f90530.tar.gz -> kio-fuse-5.0.1_p20220906-fbd09a33.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=05e7bc85c52a038bba6a67e4f8220c08
+_md5_=00a60900e0ae7c55dca1b7759ddb9077
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.2 b/metadata/md5-cache/kde-misc/krename-5.0.2
index c3b16ae84261..15e80439b7ef 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.2
+++ b/metadata/md5-cache/kde-misc/krename-5.0.2
@@ -7,11 +7,11 @@ HOMEPAGE=https://apps.kde.org/krename/ https://userbase.kde.org/KRename
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=exif pdf taglib truetype debug test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo:= ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/krename/5.0.2/src/krename-5.0.2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=514cef9c119180f08cc9c5d6b799f52e
+_md5_=b82a88eb7b27bacb0bbf2a3b580a244c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 943e90d5fcb5..ead518843096 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.83 b/metadata/md5-cache/media-gfx/asymptote-2.83
new file mode 100644
index 000000000000..3723c74a2a11
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/asymptote-2.83
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
+DESCRIPTION=A vector graphics language that provides a framework for technical drawing
+EAPI=7
+HOMEPAGE=https://asymptote.sourceforge.io/
+INHERIT=autotools elisp-common latex-package python-r1
+IUSE=+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) offscreen? ( opengl ) doc? ( boehm-gc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/asymptote/asymptote-2.83.src.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=aa9312140d75209189f540e3f7c77e55
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.32 b/metadata/md5-cache/media-gfx/gimp-2.10.32-r1
index 6cc7a8b19209..aecbc709b89a 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.32
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.32-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
+DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=8
 HOMEPAGE=https://www.gimp.org/
@@ -9,9 +9,9 @@ INHERIT=autotools gnome2 toolchain-funcs virtualx
 IUSE=aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gimp/v2.10/gimp-2.10.32.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d18310b497961c0c4cbd5511477b44bb
+_md5_=514d37eb2a441a679f20bdec8fff1088
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.10-r1 b/metadata/md5-cache/media-gfx/gimp-2.99.10-r2
index 7ed8fcd5c6db..36b848f96e5f 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.99.10-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.10-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.12.2 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.30.3 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.51.0 >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 doc? ( dev-util/gi-docgen ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
+DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.12.2 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.30.3 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.51.0 >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 doc? ( dev-util/gi-docgen ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=8
 HOMEPAGE=https://www.gimp.org/
@@ -8,10 +8,10 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
 IUSE=aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.12.2 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.12.2 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gimp/v2.99/gimp-2.99.10.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6e9e4f8d664e8c13ead01152a2d23f51
+_md5_=6e41ce6204c7b766ece6825285ce4669
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.12 b/metadata/md5-cache/media-gfx/gimp-2.99.12-r1
index f01c3c78f0e0..1865e524eb7f 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.99.12
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.12-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/perl-5.30.3 dev-util/gdbus-codegen >=sys-devel/gettext-0.21 doc? ( app-text/yelp-tools dev-libs/gobject-introspection[doctool] dev-util/gi-docgen ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) test? ( x11-misc/xvfb-run ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
+DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) test? ( x11-misc/xvfb-run ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=8
 HOMEPAGE=https://www.gimp.org/
@@ -8,10 +8,10 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=lua-single meson python-single-r1 vala xdg
 IUSE=X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gimp/v2.99/gimp-2.99.12.tar.xz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eb8324908775e34b5a5aa8e15fa06f24
+_md5_=8aaff42c913104a4323045273f83c9ba
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index c9e19319f580..ef4c010d631e 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/perl-5.30.3 dev-util/gdbus-codegen >=sys-devel/gettext-0.21 doc? ( app-text/yelp-tools dev-libs/gobject-introspection[doctool] dev-util/gi-docgen ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) test? ( x11-misc/xvfb-run ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
+DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) test? ( x11-misc/xvfb-run ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=8
 HOMEPAGE=https://www.gimp.org/
@@ -9,9 +9,9 @@ INHERIT=git-r3 lua-single meson python-single-r1 vala xdg
 IUSE=X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3 LGPL-3
 PROPERTIES=live
-RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/appstream-glib-0.7.16 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.68.0:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=72800865758f7800644d03d905cb6b6a
+_md5_=9c3cddf420881b96f985d7783ce2e5a2
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
index 988a78490e7e..442b7e0dffe6 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://apps.kde.org/kgraphviewer
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=media-gfx/graphviz-2.30 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c0a2783191de60c6143526af67bc00bb
+_md5_=724210d034491d974543d592c3d75fc5
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e454e711b435..913acbfca1f0 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.24.0-r2 b/metadata/md5-cache/media-libs/libsdl2-2.24.0-r2
index 165d07d9f7bb..114cf702f125 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.24.0-r2
+++ b/metadata/md5-cache/media-libs/libsdl2-2.24.0-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=alsa? ( sound ) fcitx4? ( dbus ) gles1? ( video ) gles2? ( video )
 SLOT=0
 SRC_URI=https://www.libsdl.org/release/SDL2-2.24.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=320ce2a11cbb3fa311b27cd6c9228109
+_md5_=bd46dda9b1349b865e00879b42f3a41b
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.34 b/metadata/md5-cache/media-libs/netpbm-10.86.34
index 842c5788c449..1575d913266a 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.34
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.34
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://netpbm.sourceforge.net/
 INHERIT=flag-o-matic multilib toolchain-funcs
 IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.34/netpbm-10.86.34.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c6ede40779ae77b446559258b03ae758
+_md5_=6bca2c5a3a03135e8946b21f1fb91b92
diff --git a/metadata/md5-cache/media-libs/tiff-4.4.0-r1 b/metadata/md5-cache/media-libs/tiff-4.4.0-r1
new file mode 100644
index 000000000000..1e2c34bf02b5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tiff-4.4.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-evenrouault ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Tag Image File Format (TIFF) library
+EAPI=8
+HOMEPAGE=http://libtiff.maptools.org
+INHERIT=multilib-minimal verify-sig libtool flag-o-matic
+IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=libtiff
+RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( jpeg )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz.sig )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=b18c0024e76da01ec2ff240449d62488
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a67e846e6f94..dc486cdd57b6 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20220909 b/metadata/md5-cache/media-sound/audex-0.95_pre20220909
index b6dfafd90cf2..5d701e90607a 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20220909
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20220909
@@ -7,11 +7,11 @@ HOMEPAGE=https://userbase.kde.org/Audex
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-apps/libkcddb-22.04.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 media-sound/cdparanoia || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://invent.kde.org/multimedia/audex/-/archive/f94cd394db5d99e9024f47530cd7edf1a08a0cc1/audex-f94cd394db5d99e9024f47530cd7edf1a08a0cc1.tar.gz -> audex-0.95_pre20220909-f94cd394.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f52635dd39a81beefe9032071d85b326
+_md5_=925cfbc22352239b530ac244a6cd57f6
diff --git a/metadata/md5-cache/media-sound/mp3wrap-0.5 b/metadata/md5-cache/media-sound/mp3wrap-0.5
index adf6ac5fa313..e85cd738f921 100644
--- a/metadata/md5-cache/media-sound/mp3wrap-0.5
+++ b/metadata/md5-cache/media-sound/mp3wrap-0.5
@@ -1,9 +1,12 @@
-DEFINED_PHASES=install
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
 DESCRIPTION=Command-line utility that wraps multiple mp3 files into one large playable mp3
-EAPI=7
+EAPI=8
 HOMEPAGE=http://mp3wrap.sourceforge.net/
+INHERIT=autotools
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3wrap/mp3wrap-0.5-src.tar.gz
-_md5_=8940d63032de019f45668b9884319974
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=cde2c3f844b136b54737a4071432e6be
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index dd5c29372424..ed482b8b639c 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/blinkensim-2.7-r1 b/metadata/md5-cache/media-video/blinkensim-2.7-r2
index 5713b18d222c..7a2095eba5c9 100644
--- a/metadata/md5-cache/media-video/blinkensim-2.7-r1
+++ b/metadata/md5-cache/media-video/blinkensim-2.7-r2
@@ -1,12 +1,15 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 )
 DESCRIPTION=Graphical Blinkenlights simulator with networking support
-EAPI=6
+EAPI=8
 HOMEPAGE=http://blinkenlights.net/project/developer-tools
+INHERIT=autotools
 IUSE=aalib gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 )
 SLOT=0
 SRC_URI=http://blinkenlights.de/dist/blinkensim-2.7.tar.gz
-_md5_=36f0f6560dcd4460baad4e723780e888
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f3e3ae9586b7c773af60fc8947628149
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.18-r2 b/metadata/md5-cache/media-video/kaffeine-2.0.18-r2
index 84a2a39db060..4e89296b8632 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.18-r2
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.18-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://apps.kde.org/kaffeine/ https://userbase.kde.org/Kaffeine
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=dvb debug +handbook
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtsql-5.15.5:5[sqlite] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/solid-5.92.0:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l[dvb] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.18.tar.xz https://linuxtv.org/downloads/dtv-scan-tables/kaffeine/scantable.dvb -> kaffeine-2.0.18-scantable.dvb
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d1f51a37c42bdb74ef99b4f581945b86
+_md5_=af9547078a1f8bad1750ab36d1b126c5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 774d0808f70a..bcfda6574fdd 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/ike-scan-1.9.5 b/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
index 843540f2ae04..f42e93c4ae9f 100644
--- a/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
+++ b/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
@@ -12,4 +12,4 @@ RDEPEND=ssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/royhills/ike-scan/archive/1.9.5.tar.gz -> ike-scan-1.9.5.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4054e5ceb19d032cbda6b2e892b5e943
+_md5_=ef31dda782bb39e4ff573b0314ad24bc
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index c90472d3f42f..68521a17e7d9 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r4 b/metadata/md5-cache/net-irc/ngircd-26.1-r4
deleted file mode 100644
index c3c7bd1100c3..000000000000
--- a/metadata/md5-cache/net-irc/ngircd-26.1-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect net-misc/netkit-telnetd ) verify-sig? ( sec-keys/openpgp-keys-alexbarton ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=acct-user/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
-DESCRIPTION=An IRC server written from scratch
-EAPI=8
-HOMEPAGE=https://ngircd.barton.de/
-INHERIT=tmpfiles verify-sig
-IUSE=debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib verify-sig
-KEYWORDS=amd64 arm arm64 x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=acct-user/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib ) virtual/tmpfiles
-RESTRICT=test
-SLOT=0
-SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz.sig )
-_eclasses_=tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=560b7c84279e5f1f219db809651c4102
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 143c1346b05a..1cdfb89128a1 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.26 b/metadata/md5-cache/net-libs/libaccounts-glib-1.26
index a31f611f5a43..115227db1572 100644
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.26
+++ b/metadata/md5-cache/net-libs/libaccounts-glib-1.26
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/accounts-sso/libaccounts-glib
 INHERIT=meson python-r1 vala
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/VERSION_1.26/libaccounts-glib-VERSION_1.26.tar.gz -> libaccounts-glib-1.26.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=3da2e470159ca0a6222c423fd562976e
+_md5_=db1882b67e6b6660bfb58d2da83100b2
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e12c1c692ee1..ae5907e7f4a4 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.23.0 b/metadata/md5-cache/net-misc/gallery-dl-1.23.0
index e2400828b98e..abf73d144f67 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.23.0
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.23.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mikf/gallery-dl
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl,xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.23.0.tar.gz -> gallery-dl-1.23.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2c16518c4f8f3290074dd04a18cf2fd6
+_md5_=5f13869210f394ebc0e8f34e44406a2d
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2022.10.4 b/metadata/md5-cache/net-misc/yt-dlp-2022.10.4
new file mode 100644
index 000000000000..cfd17015ef3c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/yt-dlp-2022.10.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=youtube-dl fork with additional features and fixes
+EAPI=8
+HOMEPAGE=https://github.com/yt-dlp/yt-dlp/
+INHERIT=bash-completion-r1 distutils-r1 optfeature wrapper
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2022.10.4.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=91793711c86c926c1b3f724565bffc7b
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 7556bed99c4f..3c1c036a0d0b 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/blueman-2.3.2 b/metadata/md5-cache/net-wireless/blueman-2.3.2-r1
index b7e3c8dd39c7..cf133c2167d5 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.3.2
+++ b/metadata/md5-cache/net-wireless/blueman-2.3.2-r1
@@ -8,9 +8,9 @@ INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
 IUSE=network nls policykit pulseaudio python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] media-sound/pulseaudio-modules-bt ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] media-sound/pulseaudio-modules-bt ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.3.2/blueman-2.3.2.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98f4f79090ee890119bf393521bc1104
+_md5_=f73bd4c9233d86084671d96c187d7b62
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 728ae5ca115a..40e9399c1ef0 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -8,8 +8,8 @@ INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils git-r3
 IUSE=network nls policykit pulseaudio python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3+ GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] media-sound/pulseaudio-modules-bt ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] media-sound/pulseaudio-modules-bt ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=26d5b03c9e007bb53775fe73fd61f53d
+_md5_=e4f14701539a6c7fe7ee599ff34d412a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 18609a75cd19..69a1b7f24656 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/pcsc-tools-1.6.0 b/metadata/md5-cache/sys-apps/pcsc-tools-1.6.0
index 44938a0de5c1..e8df9c22c9bc 100644
--- a/metadata/md5-cache/sys-apps/pcsc-tools-1.6.0
+++ b/metadata/md5-cache/sys-apps/pcsc-tools-1.6.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/ https://github.com/LudovicRousseau/pcsc-tools
 INHERIT=desktop toolchain-funcs xdg-utils
 IUSE=gui network-cron
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.4.14 dev-perl/pcsc-perl gui? ( dev-perl/Gtk3 )
 SLOT=0
 SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.6.0.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=724bd1063901fe1fa961f6eef764466f
+_md5_=175650bf1665b629089be9bf580f195b
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.16 b/metadata/md5-cache/sys-apps/pkgcore-0.12.16
new file mode 100644
index 000000000000..7fb5c4ee4729
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.16.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=69f4e44f89201f35e9a49a68fb21906e
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index 1338782bfe78..dfe9f6a323ea 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ae3b57e03d882e5ef492433aa48f8206
+_md5_=1bf005daaaf38187cf9c8c59ac4cd04f
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.38.1 b/metadata/md5-cache/sys-apps/portage-3.0.38.1
index cea9034ace00..761caa7206a1 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.38.1
+++ b/metadata/md5-cache/sys-apps/portage-3.0.38.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/file-5.41 >=sys-apps/coreutils-6.4 )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.38.1.tar.bz2
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c07f27909150a45e897f0a73f535fd7
+_md5_=f878092a7d305612dafdaeaf68c7bf50
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 3e2ff61f301c..e0a28eba7cf1 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-bin-105.0.1 b/metadata/md5-cache/www-client/firefox-bin-105.0.1
deleted file mode 100644
index d98c364ccaa9..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-105.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst setup unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop linux-info pax-utils xdg
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=rapid
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/en-US/firefox-105.0.1.tar.bz2 -> firefox-bin_x86_64-105.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/en-US/firefox-105.0.1.tar.bz2 -> firefox-bin_i686-105.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ach.xpi -> firefox-105.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/af.xpi -> firefox-105.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/an.xpi -> firefox-105.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ar.xpi -> firefox-105.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ast.xpi -> firefox-105.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/az.xpi -> firefox-105.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/be.xpi -> firefox-105.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/bg.xpi -> firefox-105.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/bn.xpi -> firefox-105.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/br.xpi -> firefox-105.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/bs.xpi -> firefox-105.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-105.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ca.xpi -> firefox-105.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/cak.xpi -> firefox-105.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/cs.xpi -> firefox-105.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/cy.xpi -> firefox-105.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/da.xpi -> firefox-105.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/de.xpi -> firefox-105.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-105.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/el.xpi -> firefox-105.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-105.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-105.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/eo.xpi -> firefox-105.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-105.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-105.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-105.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-105.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/et.xpi -> firefox-105.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/eu.xpi -> firefox-105.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/fa.xpi -> firefox-105.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ff.xpi -> firefox-105.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/fi.xpi -> firefox-105.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/fr.xpi -> firefox-105.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-105.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-105.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/gd.xpi -> firefox-105.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/gl.xpi -> firefox-105.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/gn.xpi -> firefox-105.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-105.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/he.xpi -> firefox-105.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-105.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/hr.xpi -> firefox-105.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-105.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/hu.xpi -> firefox-105.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-105.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ia.xpi -> firefox-105.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/id.xpi -> firefox-105.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/is.xpi -> firefox-105.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/it.xpi -> firefox-105.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ja.xpi -> firefox-105.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ka.xpi -> firefox-105.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/kab.xpi -> firefox-105.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/kk.xpi -> firefox-105.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/km.xpi -> firefox-105.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/kn.xpi -> firefox-105.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ko.xpi -> firefox-105.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/lij.xpi -> firefox-105.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/lt.xpi -> firefox-105.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/lv.xpi -> firefox-105.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/mk.xpi -> firefox-105.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/mr.xpi -> firefox-105.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ms.xpi -> firefox-105.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/my.xpi -> firefox-105.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-105.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-105.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/nl.xpi -> firefox-105.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-105.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/oc.xpi -> firefox-105.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-105.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/pl.xpi -> firefox-105.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-105.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-105.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/rm.xpi -> firefox-105.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ro.xpi -> firefox-105.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ru.xpi -> firefox-105.0.1-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/sco.xpi -> firefox-105.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/si.xpi -> firefox-105.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/sk.xpi -> firefox-105.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/sl.xpi -> firefox-105.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/son.xpi -> firefox-105.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/sq.xpi -> firefox-105.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/sr.xpi -> firefox-105.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-105.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ta.xpi -> firefox-105.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/te.xpi -> firefox-105.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/th.xpi -> firefox-105.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/tl.xpi -> firefox-105.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/tr.xpi -> firefox-105.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/trs.xpi -> firefox-105.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/uk.xpi -> firefox-105.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/ur.xpi -> firefox-105.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/uz.xpi -> firefox-105.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/vi.xpi -> firefox-105.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/xh.xpi -> firefox-105.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-105.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-105.0.1-zh-TW.xpi )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=42f16c482ab36d974f4a7811a9cb3227
diff --git a/metadata/md5-cache/www-client/firefox-bin-105.0.2 b/metadata/md5-cache/www-client/firefox-bin-105.0.2
new file mode 100644
index 000000000000..0fd7116a9b07
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-105.0.2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop linux-info pax-utils xdg
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=rapid
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/en-US/firefox-105.0.2.tar.bz2 -> firefox-bin_x86_64-105.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-i686/en-US/firefox-105.0.2.tar.bz2 -> firefox-bin_i686-105.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ach.xpi -> firefox-105.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/af.xpi -> firefox-105.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/an.xpi -> firefox-105.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ar.xpi -> firefox-105.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ast.xpi -> firefox-105.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/az.xpi -> firefox-105.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/be.xpi -> firefox-105.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/bg.xpi -> firefox-105.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/bn.xpi -> firefox-105.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/br.xpi -> firefox-105.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/bs.xpi -> firefox-105.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-105.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ca.xpi -> firefox-105.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/cak.xpi -> firefox-105.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/cs.xpi -> firefox-105.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/cy.xpi -> firefox-105.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/da.xpi -> firefox-105.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/de.xpi -> firefox-105.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-105.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/el.xpi -> firefox-105.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-105.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-105.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/eo.xpi -> firefox-105.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-105.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-105.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-105.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-105.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/et.xpi -> firefox-105.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/eu.xpi -> firefox-105.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fa.xpi -> firefox-105.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ff.xpi -> firefox-105.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fi.xpi -> firefox-105.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fr.xpi -> firefox-105.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-105.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-105.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gd.xpi -> firefox-105.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gl.xpi -> firefox-105.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gn.xpi -> firefox-105.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-105.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/he.xpi -> firefox-105.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-105.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hr.xpi -> firefox-105.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-105.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hu.xpi -> firefox-105.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-105.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ia.xpi -> firefox-105.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/id.xpi -> firefox-105.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/is.xpi -> firefox-105.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/it.xpi -> firefox-105.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ja.xpi -> firefox-105.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ka.xpi -> firefox-105.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/kab.xpi -> firefox-105.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/kk.xpi -> firefox-105.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/km.xpi -> firefox-105.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/kn.xpi -> firefox-105.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ko.xpi -> firefox-105.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/lij.xpi -> firefox-105.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/lt.xpi -> firefox-105.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/lv.xpi -> firefox-105.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/mk.xpi -> firefox-105.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/mr.xpi -> firefox-105.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ms.xpi -> firefox-105.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/my.xpi -> firefox-105.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-105.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-105.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/nl.xpi -> firefox-105.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-105.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/oc.xpi -> firefox-105.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-105.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pl.xpi -> firefox-105.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-105.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-105.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/rm.xpi -> firefox-105.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ro.xpi -> firefox-105.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ru.xpi -> firefox-105.0.2-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sco.xpi -> firefox-105.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/si.xpi -> firefox-105.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sk.xpi -> firefox-105.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sl.xpi -> firefox-105.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/son.xpi -> firefox-105.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sq.xpi -> firefox-105.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sr.xpi -> firefox-105.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-105.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ta.xpi -> firefox-105.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/te.xpi -> firefox-105.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/th.xpi -> firefox-105.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/tl.xpi -> firefox-105.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/tr.xpi -> firefox-105.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/trs.xpi -> firefox-105.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/uk.xpi -> firefox-105.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ur.xpi -> firefox-105.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/uz.xpi -> firefox-105.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/vi.xpi -> firefox-105.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/xh.xpi -> firefox-105.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-105.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-105.0.2-zh-TW.xpi )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e70b14644bfd72c29bdc87cd5c4da904
diff --git a/metadata/md5-cache/www-client/microsoft-edge-105.0.1343.53 b/metadata/md5-cache/www-client/microsoft-edge-106.0.1370.34
index 2ab4dec78f78..632b51e42512 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-105.0.1343.53
+++ b/metadata/md5-cache/www-client/microsoft-edge-106.0.1370.34
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_105.0.1343.53-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_106.0.1370.34-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=32dae968365caf48740233593efe5e5a
+_md5_=3301d61577802771b104ca2c26903a47
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2805.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2805.26
index 8a7ede864c2d..d6d7de31775b 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2805.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2805.26
@@ -10,6 +10,6 @@ LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2805.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2805.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2805.3-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2805.26-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2805.26-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2805.26-1_arm64.deb )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 75faa2b33d05..e279715a6788 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
index dc7f502d10f4..9d1439ee37f6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/vulkan-beta-5154919-linux -> NVIDIA-Linux-x86_64-515.49.19.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/515.49.19.tar.gz -> open-gpu-kernel-modules-515.49.19.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=eb7210de1e3ee6ec72438cbf2ea5cee1
+_md5_=dd5158c970ac4454d8522fa7d76620cf
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
index 2f55360a8bf8..dc21dc5f991c 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.65.01/NVIDIA-Linux-x86_64-515.65.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.65.01/NVIDIA-Linux-aarch64-515.65.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.65.01.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=7dabba8c47624e78fde4771e915a3a5f
+_md5_=7b38913766621e5532f58f932e9dc113
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76
index e98c235caf5a..0e4c91cb7a7d 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.76/NVIDIA-Linux-x86_64-515.76.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.76/NVIDIA-Linux-aarch64-515.76.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.76.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.76.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=dc847e26afa6debb66c24b6a5cbf4294
+_md5_=1b9c72085fb670f0676cac345fa3c144
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index a6d809eb6dfa..48aa171fb1ae 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libast-0.8 b/metadata/md5-cache/x11-libs/libast-0.8
new file mode 100644
index 000000000000..d9273390e1b0
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libast-0.8
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 media-libs/freetype imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=LIBrary of Assorted Spiffy Things
+EAPI=8
+HOMEPAGE=http://www.eterm.org/download/
+INHERIT=autotools
+IUSE=imlib cpu_flags_x86_mmx pcre
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 media-libs/freetype imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=https://github.com/mej/libast/archive/refs/tags/0.8.tar.gz -> libast-0.8.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=408720cd2a2f4dde1777fd639b09f5b5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index dc3d65f11cd9..e8d48ac75922 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-04T05:39:55Z
+TIMESTAMP 2022-10-04T11:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM7xytfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM8G4VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC7YhAAjpF1ZOzeNsCT+D/hw93ghBzubzzoDR1ptIhlYAoQuO/QrwUBWYSm0P9v
-uGbhTY+tX4BG7aL/H41UKgA08m4uSUEoYQ70xjweR+uEwTVnNAFuTOP0fs3kv4d9
-Q3DLQx47dY+glF5Dr0NME6fJlnEh9Os4rnFqU4f13emL40CtG6IolzELrdZnH96r
-mk2oBH+6vgp2cA8S5eQxU8SpgvYzmIw/I27/hFyPUkaf49ZlFfBMijUFV25tzgy7
-Nm1muN0cVirWwHurODl7AIEdr4Kp6xz3FADcGnhYDnyfmaCXehjmw0PpDDN92oE5
-ZgZDCX/gluoaNV3xv//cG3RALWqZ1S3iMvGQFCnp/QWq+N6wjG3T0TtSWYTNq/++
-75NS8EVDFvcKoxaWDcRxb2AGwpqVNmWSeLXluTFkc7oUfNRmUwOcdQD+0duhwvT4
-qgtjfnX8xfO9/IdkvrYh0qB4OYu6cWUrwjCTWOxcHFVeAWWWi4vfqANFyWOZOXvq
-D84Wmj0DWD3vsqkcSyG/PpdzUF9iqhJ5mWPG1EHtjwyG8DDoFmVgDWU2tkI8NSQO
-8mVE28VqgFQQoKztxqbkmklfB8SgXXRXEHd/0XKwJEuCD+cmBmX/mbFJPi4dHaxn
-EzoQz0gcDRVdYIbcqsdRuhpZmKI5LLrZgnFcpEZ+ezB7SuG6HVo=
-=WGAM
+klApyg//fafT486sIKBElv/T1AunqCVBHt+fYJiNqiDW4uyfD1hRRHWpY+qm9BZX
+N1ljiow51t5vcC5/HwTZ9CGMPhB5ngZohEOyA6tIt+jaJrmpgzJPwkWjLROn7MZq
+9th4VydHXWXdSWOQ0eUW1VdqS6A+CCGrHY3DNRTbOE/n73alyq+dop77yc3fsVqk
+ckBDgvidufP3fYfKMdoMe987ZMyb8TKomDO5AZsQL0AVA64z0ognLk+KhjXvpHD4
+Vl49BXVQUw8/wLi0QJ/vxc+JMO0Fcz+PGCmyiEmxX6LzZbSqDNuhKN5mdZwQI9D6
+txyFUQBvfjuYydt2yFTr/gUcCbEtGe2olbYP5IhS/wvc5qZYNBiJ2Z9wwOAi+Kx0
+SbkC/FNDo/bhELarmR0Z5DQwmDHbclpgDscpE9j/7rCqfZmBKg0b1aL+0qrdRvPp
+rwpukrbwRIQnJt8WBY/CpJXfMi3STh7lLtvuRbCUMkKvt4Zy4zYzDDSxp1N5TM96
+ge/sjEBzs5HX17+pxiMm9xDtZQQGPOvOlRlwa9onHNZHNdEfoMMOUzDghyH5KKsX
+fI6PxCfc3y8N/iPBo1r2MunXLXXbaD6/Xk7/VQUbxJa5pcxSAmYozjvTcxZrAzl3
+X2gyKlZLRmw1ciHbHk609mf+eGAIKYMfVg+jQPli0gSP1zqBHNc=
+=sKxO
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 313557cc47b3..14b8b634e810 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Oct 2022 05:39:53 +0000
+Tue, 04 Oct 2022 11:39:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e231d2f7639b..d770a5a0f20a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct  4 05:39:52 AM UTC 2022
+Tue Oct  4 11:39:46 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 57baf94ae265..a5f3214764c6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Oct 2022 05:45:01 +0000
+Tue, 04 Oct 2022 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 21e0809c2cfb..01a43d08c39b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-08a966791d0a6dd166e0d562e2456869d8162aed 1664861104 2022-10-04T05:25:04+00:00
+3c24f1026227c0be0e9a5b32532f8c6e73671bca 1664883309 2022-10-04T11:35:09+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3c9aa7b73e53..a2a586ee8d40 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1664862001 Tue 04 Oct 2022 05:40:01 AM UTC
+1664883601 Tue 04 Oct 2022 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 313557cc47b3..14b8b634e810 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Oct 2022 05:39:53 +0000
+Tue, 04 Oct 2022 11:39:46 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 04746f61a5ca..1b07f22f29e1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 2f9830a26384..9a7f1c95ef1b 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,6 +1,7 @@
 AUX ike-scan-1.9.5-clang-16.patch 3150 BLAKE2B 1ed607aee9003ddb07a49c96ad14e882d3e5135ca5f0af07212bb60dff25854b5104ce35b2bc9c7c286b34d1feb1fcd2a0b8ee6da18a35c04f800671431352ca SHA512 9e84734e60ba0bcd2ef714e5051d486ed7594b33e99447fe8ee9a6b59eda57ccd7311b01781d5e5096b98df45ed141644a94bc78d69747e5639b19cd89b0df79
+AUX ike-scan-1.9.5-openssl-libdir.patch 2502 BLAKE2B 8964dbbe156acc61db3518a1007eda8d300f6ead15b783795f8d9b102ee80663531364353814d24474cb7e42167ec29b181bf5b87f66f914baf3a28ca5b9e9b3 SHA512 d17e8a2a783009912476b45a0395f3165296588a972b92f8d4221cb826fb6ed325fc63a2e55148e51292835ce07457cffcf64b0600e875c208aad9f663616f8f
 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be
 DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590
 EBUILD ike-scan-1.9.4.ebuild 738 BLAKE2B f73bc5fb1a446a3f9cf97ad85a1cd68db0be95bbf3200ac4530763d0c696569092ef7032c03633cf051fb2a7d01eb7cd106c0718a76b619cbaf341e1122683a0 SHA512 aed95ea1d8511de9b542394d5f5ae41df0408dde189e95a1a255d554524e0099b0d262b1b32daaab8fc15121120400d2767dd2a57763b1bc5ec22894c75089c9
-EBUILD ike-scan-1.9.5.ebuild 784 BLAKE2B 82997a6df4449ab79ceb62d06d6605e57c04a7374d70128780f2f7772066451b7b035f48662f7b7a3dead619707a01a61f682d3f89694b01443640e41cd168c0 SHA512 b8d8a1744aa6f3107384d78dfa77f4c00f15c0185085ea40040eb18d83e1f3b810e038bc690332ccb987bdbe9c93195125ea750762e2966810a7141176665635
+EBUILD ike-scan-1.9.5.ebuild 854 BLAKE2B dd3ecb2701b7070469184a2c6a811bbd077663119557a8e37387d7c25faa0ebdd8a7017c9c749e895183cfd2237efee85e2cae24310a8772ceed3f9f6c680c32 SHA512 eec6d7ea51a5615fbe1dddef42c3b0c327f6b56a4f036eebd9cbe59158877fbfa97c1c8b467d59a05260e3bcb7fd873e19e02a352657bc62985ea557ebe11931
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch
new file mode 100644
index 000000000000..0ee12dc2f907
--- /dev/null
+++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch
@@ -0,0 +1,55 @@
+TODO: switch to pkgconfig
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,49 +187,9 @@ AC_ARG_WITH(openssl,
+    [
+       if test "x$withval" != "xno" ; then
+          AC_MSG_RESULT(yes)
+-         for ssldir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
+-            if test -f "${ssldir}/include/openssl/ssl.h"; then
+-               found_openssl="yes"
+-               openssl_header_dir="${ssldir}/include"
+-               AC_MSG_NOTICE([Found ${ssldir}/include/openssl/ssl.h])
+-               break
+-            fi
+-            if test -f "${ssldir}/openssl/ssl.h"; then
+-               found_openssl="yes"
+-               openssl_header_dir="${ssldir}"
+-               AC_MSG_NOTICE([Found ${ssldir}/openssl/ssl.h])
+-               break
+-            fi
+-         done
+-         if test x$found_openssl != xyes; then
+-            AC_MSG_ERROR([Cannot find OpenSSL header files])
+-         else
+-            AC_MSG_NOTICE([OpenSSL header files found in $openssl_header_dir])
+-            CPPFLAGS="-I${openssl_header_dir} ${CPPFLAGS}"
+-         fi
+-         if test -f "${ssldir}/lib/libcrypto.so"; then
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.so])
+-         elif test -f "${ssldir}/libcrypto.so"; then
+-            openssl_lib_dir="${ssldir}"
+-            AC_MSG_NOTICE([Found ${ssldir}/libcrypto.so])
+-         elif test -f "${ssldir}/lib/libcrypto.dylib"; then
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.dylib])
+-         elif test -f "${ssldir}/libcrypto.dylib"; then
+-            openssl_lib_dir="${ssldir}"
+-            AC_MSG_NOTICE([Found ${ssldir}/libcrypto.dylib])
+-         elif test -f "${ssldir}/lib/libcrypto.a"; then
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.a])
+-         elif test -f "${ssldir}/libcrypto.a"; then
+-            openssl_lib_dir="${ssldir}"
+-            AC_MSG_NOTICE([Found ${ssldir}/libcrypto.a])
+-         else
+-            openssl_lib_dir="${ssldir}/lib"
+-            AC_MSG_NOTICE([Cannot find libcrypto under $ssldir - assuming its in the standard search path])
+-         fi
+          AC_MSG_NOTICE([OpenSSL libraries found in $openssl_lib_dir])
++         openssl_header_dir="${withval}/include/openssl"
++         CPPFLAGS="${CPPFLAGS} -I${openssl_header_dir}"
+          LDFLAGS="-L${openssl_lib_dir} ${LDFLAGS}"
+          LIBS="-lcrypto ${LIBS}"
+ 
diff --git a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
index acfffd464bb0..7f1d570df837 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
@@ -19,6 +19,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.5-clang-16.patch
+	"${FILESDIR}"/${PN}-1.9.5-openssl-libdir.patch
 )
 
 src_prepare() {
@@ -33,7 +34,8 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with ssl openssl)
+	econf \
+		$(use_with ssl openssl "${ESYSROOT}"/usr)
 }
 
 src_install() {
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6f4ab2ae1b2c..6171de7e85b0 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 5d556217017a..dda8c8c495c6 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -4,6 +4,5 @@ AUX ngircd.conf.d 166 BLAKE2B a7e6e149bfe04bb54e97820f6d4fda2f7d81c224fb0975335a
 AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a2933a8562f5c05bd356cee49e0bd9bed389d9f42b92e94dbc37387db34eb3c5946e6cc92ea8ebf8ec2 SHA512 ceaeee66b31463273ff88c5356c63bc9b25c272dd038940adba95a8b7e3d4f4d0bd0c96bd9c99fb522b7dafa3a413b5611ecb748951ef5cc7a944384983cf45e
 DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee
 DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848
-EBUILD ngircd-26.1-r4.ebuild 2533 BLAKE2B bb5d0f9d2653184ab0964afb08eb7fd803041af9005b9675e7446a13c3a63ed305e88c53d7e7fa4e116c8519a4f8edb63fa075be4845b4c94728ce49e1045120 SHA512 744ff2b19724127235a91c8b88e2f937ba7903a0ac0073e4d298276d3410171f231b907d5c114a7fd9da6157bf41186baf4a51243867a2af5b89672cf29062c5
 EBUILD ngircd-26.1-r5.ebuild 2668 BLAKE2B e3b2e0a99164aae019698f7f0253fee655d81300be13575231c40fe62666c3d0be9a873f5b4e56e49cd3a4c35adc9b5847c749adf972ca6389898c996aa6168b SHA512 39745a7682ef79ef18488befc0bd60eb253b4fd7a28e677082e18474379e969a0a8f6a58d1f6c60181debd1f4667d7b394629fc678c3de5432beb1239193415a
 MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7
diff --git a/net-irc/ngircd/ngircd-26.1-r4.ebuild b/net-irc/ngircd/ngircd-26.1-r4.ebuild
deleted file mode 100644
index 383cb5fad69a..000000000000
--- a/net-irc/ngircd/ngircd-26.1-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/alexbarton.asc"
-inherit tmpfiles verify-sig
-
-DESCRIPTION="An IRC server written from scratch"
-HOMEPAGE="https://ngircd.barton.de/"
-SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
-
-# Flaky test needs investigation (bug 719256)
-RESTRICT="test"
-
-RDEPEND="
-	acct-user/ngircd
-	irc-plus? ( virtual/libiconv )
-	ident? ( net-libs/libident )
-	pam? ( sys-libs/pam )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-tcltk/expect
-		net-misc/netkit-telnetd
-	)
-	verify-sig? ( sec-keys/openpgp-keys-alexbarton )
-"
-
-src_prepare() {
-	default
-
-	if ! use prefix ; then
-		sed -i \
-			-e "/;ServerUID = /s/65534/ngircd/" \
-			-e "/;ServerGID = /s/65534/ngircd/" \
-			doc/sample-ngircd.conf.tmpl || die
-	fi
-
-	# make pidfiles work out-of-the-box
-	sed -i \
-		-e "/;PidFile = /s/;//" \
-		-e "/;ServerUID = /s/;//" \
-		-e "/;ServerGID = /s/;//" \
-		doc/sample-ngircd.conf.tmpl || die
-
-	# Note that if we need to use automake, we need a certain version (for now):
-	# https://github.com/ngircd/ngircd/issues/261
-	# WANT_AUTOMAKE=1.11
-	# eautomake
-}
-
-src_configure() {
-	local myeconf=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		$(use_enable debug sniffer)
-		$(use_enable debug)
-		$(use_enable irc-plus ircplus)
-		$(use_enable ipv6)
-		$(use_enable strict-rfc)
-		$(use_with irc-plus iconv)
-		$(use_with ident)
-		$(use_with pam)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with zlib)
-	)
-
-	if use ssl ; then
-		if use gnutls ; then
-			myeconf+=(
-				$( use_with gnutls )
-			)
-		else
-			myeconf+=(
-				$( use_with !gnutls openssl )
-			)
-		fi
-	fi
-
-	econf "${myeconf[@]}"
-}
-
-src_install() {
-	default
-
-	fowners ngircd:ngircd /etc/ngircd/ngircd.conf
-	newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd
-	newconfd "${FILESDIR}"/ngircd.conf.d ngircd
-	dotmpfiles "${FILESDIR}"/ngircd.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
-		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
-		elog "You may not be able to login until you change this."
-	fi
-
-	tmpfiles_process ngircd.conf
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index de73ee0ca047..b942720025df 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index bcd4abc24bde..f65e29d28a8c 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -3,5 +3,5 @@ AUX libaccounts-glib-1.26-project-version.patch 350 BLAKE2B 6a2115cd408e425e94b6
 DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
 DIST libaccounts-glib-1.26.tar.gz 117365 BLAKE2B a3c7bf4058372001079c9c153b30f947882521f1f9680a63db2883307e998335a1e646112dc8a51640824f238d871d96da2c18b4ef175c837cebfe056ded2cbb SHA512 c08a11087745ba771e539b61de57693390960ad6b4e8217c159be49d31bd7f8856fffa835e7a230f352049bbf7cec9184ff225e74bbc195964221d3d9d49743b
 EBUILD libaccounts-glib-1.25-r2.ebuild 1377 BLAKE2B 6f92032e8467af5353c292bab1f033c5330f3596d2796027383ee2cd8fb14ae4438b62a15983f6d507948b5ef4a745ee32fa6112d40481a1329f9d14a57d46f5 SHA512 56636736f9e04190e2ffd57f2f442ca4ee1b12c3b6c9e39b5e4af44bc609344aafbc10ce6b7b724520d12050a0ec8275bbae37086c3ac3e83e9e7ec921aca9ab
-EBUILD libaccounts-glib-1.26.ebuild 1419 BLAKE2B c23f44314271ca854ce9a7c551ab7a295703b193acc0ec30a7dabd06a27101ec124848c7abf7a64b7b86bd1f322ef13ba1e189d1b05203534f87158eaf7fb9d2 SHA512 752e6a4f77a0587cbc6e0698fcbb5297ef9e7cd8a3a27e8af2afc6f71026580848e3677f6aff35a7be56ea257fd00fa268c4bd4d5dbd0ff9d1bac663854157db
+EBUILD libaccounts-glib-1.26.ebuild 1418 BLAKE2B 7dc205283363854d36b6ff957b13ee4b2033ae210c257a790afdbde4aab5ec814b24f0333d1d8eaa860e3bd90b81fb5c5bd3a489a70908385984cae68772f3e6 SHA512 613812328f776618447e26cbf9ee7b97238209a7fcfb267cfe7829913a26cb7d22ee086cbf42d28dc8928bab550ac89c85f2008544d59f10254d2ed816441309
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild
index c3405b08085b..04e4aa4fa062 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1a18114c9ade..8322b05417ba 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index e9380fa51d0f..62710ddd0442 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -5,7 +5,7 @@ DIST gallery-dl-1.23.1.gh.tar.gz 477797 BLAKE2B abb04762755cc941d3fef31ba2cf21ea
 DIST gallery-dl-1.23.2.gh.tar.gz 482620 BLAKE2B 2a537354f93a1d82659669d9a1cdec425e2438127304a5385a871aa7c4f89afa3f0d91326fd731c6ddc48a4cce67d35335270e602a34761726575e525ac19020 SHA512 75defb234faf0467e5a957594a58a02cfc75180d63a4b2c24d84061d326fbb46f08ad3230b72adf525f1ba82621963564c556047d4aa06c16cc5124ecd8c075f
 EBUILD gallery-dl-1.21.2.ebuild 973 BLAKE2B fef69fc7188b2f8714854ab4d98f726553eabb98a022ab8f28da6da7523594addf4549f249ef7dbae09d136669aeb3bb45da4462c052bbe3acf4f59908af3776 SHA512 70a1b88a1982618d4131124c301c1945724aa33b94b35154dd5f6b25ef45756f95572c0841916edc090752f7d868f18fba25b3b12274f136f72427148c667db4
 EBUILD gallery-dl-1.22.4.ebuild 972 BLAKE2B 338fa4a1e74523fdcce0333bbc1d1f342755c797a23c199e1bc10abc8d3b725fcf96c7a77f74716a876bdda021940589bd996e6247291d57241bf917559c5bd1 SHA512 287b64f38b3989d17adb44e5977a4044f78c974dee031372ff9af17d18d0cfd37c34558b90bfd4d516caf69813025a7e4eee5beaac71fd278b9727966ca08b7e
-EBUILD gallery-dl-1.23.0.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
+EBUILD gallery-dl-1.23.0.ebuild 976 BLAKE2B f671f57d2fbd01fcdfffb2c7b85806b5bba8178aad4256738e1c60e941aab2dead52b0234cdf9b37c83292454e35aff3787d07c13f1bc388d70bc5caa109089a SHA512 dffa04390871a723085af520abb69c0e9c46b61e46b377751836d1ef58d2d8e79cf4955f01f2195e0f3c7c7eb59b39d0a0337d64b3dd8913eb05a705162fbf08
 EBUILD gallery-dl-1.23.1.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-1.23.2.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-9999.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
diff --git a/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
index adeefda919ee..38dc948a797b 100644
--- a/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 8b3ab2755766..6c38e6fce5fd 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,3 +1,5 @@
+DIST yt-dlp-2022.10.4.tar.gz 2427017 BLAKE2B b3dfde252217ef7ed9f5b99351e956a1f30bfe7bf545e28bb262db90dc9b9cb5e44af7259a815f84cd4e821c8ae93f6372e9a5108483208cd8dec403cf194790 SHA512 286e219057505e4de2bb8af6dc334b43b4e46e7b998d98437f78e9cfa82294e2ac17432c22f741ad101dfe05fa0d2dc0111904be51f32ab3a002bda7b17a86b7
 DIST yt-dlp-2022.9.1.tar.gz 2387756 BLAKE2B d13f27a4666a967d6bc99a0705cb534b940cf42079eb9d3003c7759542ac8587375b0bf88e0d9c9ddba4f2cace5de00f97f025a624cc15324714e8f3b370737e SHA512 972bc3228ea7800007e56de0c0e182f99fddda76ebee05154827a6d4cf50e056cbaee3ca50d9fc396b2080a65ad5d02cde64de9c26896f33c617346465568355
+EBUILD yt-dlp-2022.10.4.ebuild 1829 BLAKE2B 653c11229a14a5f360e24041cee0610d843fd31127712a2460d9d3096a579ad32afb9b09f6eb69fc4695f839c7503bbec0637fb052b2687e86d7439499dfb268 SHA512 be1ee1cc642fa36d49dc26737e8eba82e63c49b01e864c757923ce0021e07dcda1e6823400eecaadf3cfcd3b4b784d64606bbb801acde5e064ef14b32f02cdeb
 EBUILD yt-dlp-2022.9.1.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild b/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
new file mode 100644
index 000000000000..775abf17078d
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri requirements.txt \
+		-e "s/^(pycryptodome)x/\1/" \
+		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
+}
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 30a25f58b1a7..ebfdba878281 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index c160727e872f..5befbdf3a1b1 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.3.2.tar.xz 1575412 BLAKE2B 25fbed432e103a46840dc10d73bce4e8e7a5e7ea623dbb3a50c420d166af7eb0eff046d0fd9986869055fbb4c3f8563920fb840f8f74f37a05b6680434f13dc5 SHA512 13760def19951bcb4582dbe142259256826a0f50e6c34e56c61c6f890f4e2e08085733f2480ad4c95ee52ec616cbb7ddd3a946634f042d80692cd37b57207cc0
-EBUILD blueman-2.3.2.ebuild 3158 BLAKE2B 31d7141e0ab38c752b71dfab627a6a3f9f7a140eeee10a0462a98b5475ef5415762c6a3e6d1fb24c4f919297fb9307b32532577719d0dd41b8fbb5fc833bbf6a SHA512 f06c1cedeec2012d38e13bdf52afebc191254c4093910903b5821d7566e65dd0e1e20453cbe23fde483164c491765797a2e49bdc26efe4bacb376493faf5b85f
-EBUILD blueman-9999.ebuild 3164 BLAKE2B 84b9a5a5271142d683423e032d1558437320c132200274d4d6da9798f1d06631f9d8efd0c706e48ef55492b58b3c19c13f380adad54149ebe5a8f0d959432a39 SHA512 61616ae0a28902de96e263356e2861851845cb93c50380bfb4f3a3e553b3d65d75ced60974685c8401df96a2537fea96011718c47b7af78840742186fd6f0cf6
+EBUILD blueman-2.3.2-r1.ebuild 3160 BLAKE2B fb4d5d110b87d1a7bd3c6288dbede2da6a8e74d0203fecea9e44b8bb9cb011522cf2f61f4c9d8ed1827c6443dc19ad43f0ce241267a07e2dd3f3f920597cdce4 SHA512 03d39449f27ce96e68107456e35cdcc3839bb690e6d419907ee8e0288d9d79c0a582047610b3451efb0b4574ca95fb2fc150265fa4f0c28b44eeab0563762254
+EBUILD blueman-9999.ebuild 3166 BLAKE2B b595373642359639017182378a8fafa44c719661f376b5ecbb7bac414dc310a9ea47dbc68113179cde8b568695c4dd2b11a30e96ad1f87e55998bb5ac57f3e1a SHA512 745acaa6d9199db5376c2672e7f51ca67590556e4480e1c0bf794e9e84779b672c6ae31f34d5be18c7a558364729eb1f5319f4ccbf44187edf459acafae4f068
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.3.2.ebuild b/net-wireless/blueman/blueman-2.3.2-r1.ebuild
index 9e0c9be9019a..6564c377f688 100644
--- a/net-wireless/blueman/blueman-2.3.2.ebuild
+++ b/net-wireless/blueman/blueman-2.3.2-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	')
 	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
+	x11-libs/gtk+:3[introspection,X]
 	x11-libs/libnotify[introspection]
 	|| (
 		x11-themes/adwaita-icon-theme
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index c34ce0ed1161..62b0322489b5 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	')
 	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
+	x11-libs/gtk+:3[introspection,X]
 	x11-libs/libnotify[introspection]
 	|| (
 		x11-themes/adwaita-icon-theme
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 672e40c5d43a..0febde324a4d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index d1c7930003ee..466175442007 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-10-04)
+# Sanitizers partially supported on this architecture.
+#
+# ASan: https://reviews.llvm.org/D129418 (LLVM 15 and above)
+>=sys-libs/compiler-rt-sanitizers-15 -asan
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-07-08)
 # virtual/jre is not available on loong yet.
 www-client/chromium js-type-check
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 23aab170ea26..2a68d22561c5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 1b68d156d595..152f22820739 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -2,5 +2,5 @@ AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f
 DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501
 DIST pcsc-tools-1.6.0.tar.bz2 304960 BLAKE2B a60d280d39689d7eaa407aa5857c63af0acda3791e5d9f5c2f62048260178dc728fb179aed3c369340e192ba9b3d5db04bacbe5cc6ef1519c7cde55e10ca6b45 SHA512 951014510dcfd011fc08c92a927ed8a39751c15cd9278e9bd61693a2743a82d4b88907e01e013738f6b5afb569cb4d9e9802ee575c731b83da33e92f96eb5d50
 EBUILD pcsc-tools-1.5.7-r1.ebuild 1380 BLAKE2B 8b965aea287ba16e74f2dc1fa3a2fef992ea8f688c7eab2fac5cd0e875cad7e0627d6e3ba83dbebb9ca6b6c9fd62cbf5c30b13a5952a9ad82978d6f05ada54b7 SHA512 0632d67332bdf81fdc647bbe4dd2f5ca6fb16de9ec7d9539ca3126a211504769f2f15ca31092e447a3cade72d2d745a90d088ef0601071a6357a03a2f21ff1d8
-EBUILD pcsc-tools-1.6.0.ebuild 1387 BLAKE2B 541eb3552bb12c1851c488cd0ed354a1d9d3754d42c0253c4865cf22a08c2ec393f44ad7089574b0a0d8461288c89d5c817f19c37ae79b15734a2d4f578284f8 SHA512 018994f252681c21aed94d66a1327f672e21475b0218799c692dca5f915bdcff3749760e70be466ba3470044be56a70d450668c513ad90fef5e6144d70d18282
+EBUILD pcsc-tools-1.6.0.ebuild 1394 BLAKE2B 87e5c7a92121bcad371b01e41e8b307c51efa1b65a47955196eb8d46fd51ab7ac4e8eb86dd993a06486827f3269c1e4f3b60a119dac1cd2ad7004e7ef6a8092c SHA512 aca5ed9991ae9ad5d79b00064019e2270d508d499b7570db1ccc6a764c03d3dacd723aa1d9386e8af5af2051a5376f87a542262725c75ffc910f02e3e1bcdf3f
 MISC metadata.xml 357 BLAKE2B f11eef0c97a68d73891f21b1d47bf3e5cca15e4e0f7085c64c8d6b8319c87547d58b5b08b82adb8dbe1537fd93095a139ec3eab37ac58254552ceb4d1f16b149 SHA512 62145d52ad3ec0d9f99e356bf9a22537d62a84064a1cdf12d22504a678af3a7282193b91ba9061fe3e2332d3d693402cef7703a3e40280bf3453cfdbe38b5889
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.6.0.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.6.0.ebuild
index 76cab41d9392..bae53d9c412b 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.6.0.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="gui network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index bd893786c9c3..938611ca3d7d 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcore-0.12.13.tar.gz 625121 BLAKE2B add4e54c9d92570f4a4e9dad1af45f7c10e4fa48a312f1dd07b24bede5bf796d523d0a8b8d069234e92db5cf64bfb2911c57e5161ebdb7325bfb336237066b73 SHA512 26267f8ac2c79408467a20decd5fa5b12c075269b3bec155f185349186d920b5273ad1666879ac59caf08af022c2395fe737e2d51f26f9674996767bfbfb9bc6
 DIST pkgcore-0.12.15.tar.gz 623988 BLAKE2B cea8187ec5f02990b5501c0d1d97a1d228de58c78e2be733074f312f1d3a1016722a0a7765b8c4284381082144164f39691c1118e6f5b509e76cf86fb9c410ff SHA512 cc70b9e0afda4958d7dd3889276f3cb3eb3873c3e866c862330ca4e935e022d742bb0e218b09a0ef584a411ef4924ae45da65db9d28147263a578157dae67c7f
+DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
 EBUILD pkgcore-0.12.13-r3.ebuild 1305 BLAKE2B 3cb59ae1773dcea18d128bd288b6f19dd30e10f595fed069612cd7470eaa22349d448eed24317008f0afe42cf16202df57be94e22d62b9724d285ae8b05db5a4 SHA512 97195820209d332acf0b9dd4d3da37e74b9483f85d5c0e26e8024943b4e0cf8562bcb241bec8802d345f10266b78ee1ac107d426c03485dedf0c5df92054d5b3
 EBUILD pkgcore-0.12.15.ebuild 1314 BLAKE2B 02cf0f8b47ac98ec22a50dd3ab8739cfb888b41d548a6effbcb5af33fb0ee7127f5881df172c4be78247c7a8dabb6d9e2a30b7cfc42feda0b163867a29e3e822 SHA512 7ebfa8caf198daffb7e99571d61da4eeab8889d1ef0a949fb651a008d34227573dcd526e7825b2f5aad48136ea99878b60fabe107724315ef3deaeee9473e591
-EBUILD pkgcore-9999.ebuild 1314 BLAKE2B ed50837daa6a1bc4891c60b96509c00fa2997bff94b03ca7fc2278483381240b3a5c0ec5b3edb6fa47ad6a26a3264a7ee6340efa95ca7feda3283f1e32bf4078 SHA512 68e126e282abe0d5ff5a9cc4b20534691d8f1d115791060b62e84f1eee2f7acf087e2ba121db53241e901bdd36a156b6b503be4d1abe83375fa4454a2bfb6ea8
+EBUILD pkgcore-0.12.16.ebuild 1310 BLAKE2B 28845ff4f54be71f8682e0b6735f179636656f6efbc247fd058ad7b2ee08e0b891c0ab98d3df41d53bb933f90300ff2b8935bdb0e7db9e6df399f0c526ccec11 SHA512 78d07000f2e5883038e5d9e0ad8b9e3827db6dd5dc58f1c9b62085ed30f26ccaf85e0abde3cd16ac34986a0e033d947d04c21f54d0d41afe743a01822cc85dff
+EBUILD pkgcore-9999.ebuild 1372 BLAKE2B 7efd36c4e1412cc4e984560fe1511c6e16b30f23d856ba144d269adefb332d284a94f6fefad9fbec14a5322ccb471f7b0c835e2ad0846600e3db9e5aff8b2992 SHA512 6723c7eee9cfacb30bc249b8f6cca541a6f5bfbee2ef362f322fcbb0efb720390991aeeeeceba84f02d9715049d46e8735742c087d98a52685009ca679dac2ba
 MISC metadata.xml 484 BLAKE2B 9f4ccbb77a4ee434a2370f0b6567025f8f0a9047d3ff795b5b3306c6ca458ef991d096cf83c024a3f409984e1d1f336bfe23c3841ef89c0cda702d61693c73ae SHA512 afc2dfe76697093b6b303b8ab8f413c8bd514a02b1e44a45924cca6e99b435a98b0c9b1dfe662e4054f846f8ba1fde262d6fd1ed858d90e651761b51b6adccfe
diff --git a/sys-apps/pkgcore/pkgcore-0.12.16.ebuild b/sys-apps/pkgcore/pkgcore-0.12.16.ebuild
new file mode 100644
index 000000000000..ae393c59b8fc
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.10.0[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+	# https://bugs.gentoo.org/840266
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 533d30e95bf9..a54deed756c0 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -8,7 +8,8 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
+		https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
@@ -28,7 +29,7 @@ RDEPEND="
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0f32948194ca..dfa16ceccd46 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,6 +10,6 @@ DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af9
 EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
 EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
 EBUILD portage-3.0.37.ebuild 8770 BLAKE2B 02ce919fad5997319398c57782e3a625f8c82ff89f9f8ab7af6ab1691870be6c4477c0d98b290a98b4ab1c49a2149ad05c84bbd4209ebca59e4ec26dfc0926c9 SHA512 9c0cb159a8ebec37d8f2afb4a425c857568f4542718d22f8d465157512c4442baa6072a0a737d3d676f56a3f0acefd25b443ca62e8655b371a57f8c72ad987c0
-EBUILD portage-3.0.38.1.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
+EBUILD portage-3.0.38.1.ebuild 8773 BLAKE2B a4d8dba9a26a388ec5fec3fbcdf5b8c8c0472e4a776cb941d8b93b71ae4ed4d19ea3300680fbc6164a99a37d03afc53b183626e3c516377490647d799dc89e54 SHA512 e61470d971f1cd80a1da2e8b17b41a400ddf1a04a4adee33a260d64f2b995968da12c85647ea7946425890aa788b658799224c9dfbd99945536b1e9bd3e5b18b
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.38.1.ebuild b/sys-apps/portage/portage-3.0.38.1.ebuild
index 26815216586a..ddbc5f517f32 100644
--- a/sys-apps/portage/portage-3.0.38.1.ebuild
+++ b/sys-apps/portage/portage-3.0.38.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b4ad528366b7..11efd0df5de6 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 1d793734bb4b..ffd5634ad4d5 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -100,106 +100,106 @@ DIST firefox-102.3.0esr-vi.xpi 586368 BLAKE2B 3ec464d87002e196970b04792767e539c9
 DIST firefox-102.3.0esr-xh.xpi 427184 BLAKE2B 85d46e7f2d1220e13ce660677603cb9ba90e2244c6140cb02ed3a93745479268c4b72a04d02ee184b88519b69b2c5784526625f3e478f41040a07200002bf8ef SHA512 a8ebe8abaed1019b5b8cdf567f1bd8eb41f34b75609e99e7abf53c92884c49a886d5c481245b4411ecf735acf2e611f872464d47a040ec7e6a6f19eafd23f51d
 DIST firefox-102.3.0esr-zh-CN.xpi 589094 BLAKE2B d496632b1f029535012ad3b43e93534b206651701a83e32750f03f3d7c2b2b22c6165aa0748fcee89c1b97a535e521ee4e8c20ea51fb6633892a0e851b8adaee SHA512 b328345dba6f6d02561fd63dad909b1c071af652d36c198bbbbfb746fd7907b6ca7d048899a4ef42477ccfbe5c2345be3afd4bbed1fa75f04f6c6714f0831e1b
 DIST firefox-102.3.0esr-zh-TW.xpi 590469 BLAKE2B 71323bfe2c05d01e38ad6629291a83f82eb2b5486a133d0836e5982d6ca8e2fda0ec11e66d874dfefff31b6b42237324b80146ac643b78d557102a8b693f6847 SHA512 3038339af3b2c01824c17bdcdfbe64354c63e4bc55b6bd463297c1f875c49980a747c5447f9f468ff567d6bb2b883b2cec91a1d716fed3245aa1a1bd840412fc
-DIST firefox-105.0.1-ach.xpi 462395 BLAKE2B ce1c579e09fca70c69e12120744c4c8064fb4c341237cb9dbaab65f0ae7b506d51325d9319694e010d8deb9d882def54e2796f3fd268833823c88471990414e4 SHA512 802acfdb41cf7f08aef47280c4c9c371c5e445c53b95d1d66b59f94d4ce4b60420d468af9efa9d30530cec411b931759b7eb057fb49396bb12897a5ee05df662
-DIST firefox-105.0.1-af.xpi 426884 BLAKE2B 869356a1a29749128266ff2e206310fa8cb3acd88b4b4fa31d0a1f23b1e1f0d13df6b824f4a14522582babb50862ecd04ebf2acc9d9dbe3d35f4a1939bc2fd47 SHA512 a650df3751203592574e358b9f591a8b7e01db86bc3e3ae95765024a42a1afe6c009f6b22d18243bf4e7e976731cc412e972ce6d60b79d2a48badee4e6970880
-DIST firefox-105.0.1-an.xpi 507329 BLAKE2B f6e6d5a3663dd81de2abb949ed8ab04cce2797d36cb7d34c42efe7136a7ee7cb3495ce139508c8704d58c9216a4fc9288710160b71198bedd32008b6e653a319 SHA512 93eb1cd05cc575581ce5fe344564053e6d6cf328952f85b9b5937f5b8af047eec4b322a94c5de254bce4f240cade090591a48372ff402b77562adbf53b422a2a
-DIST firefox-105.0.1-ar.xpi 571517 BLAKE2B 19dc855c7e2a2ec712278858ac98b4101d36ab5cf8fb26c1bb5b7dce8cb7ff5e56b274a32d136cbbe202a7ff5a7c5677a333be68e769f5a2053d2cf4ac106639 SHA512 26324ca59ee6b607c3c811a0722772e4152688ff8e70fe32efc3e15b396f5164ec9594e5d54515d1be98e3b01357bed9f54affdccceaa17fd90b8ea2f278d23f
-DIST firefox-105.0.1-ast.xpi 502223 BLAKE2B 9765d684c3e2b37e1640a73c382eba64351fa99232fae2528bcd293c7ef74695aa16d3fd10412cfb60495d4aa7c5bdf07f118257510da3884413600ac558a679 SHA512 61afc9a174b95ac085b75c39e092976e49d3bfcd10bdac24263494f48e75d6b199988a4aa82227cb23bad11e207e55d84ccbaa58abd9a886141b68fb09c5ba50
-DIST firefox-105.0.1-az.xpi 494479 BLAKE2B 0fb8e49e0c3ef534aaec2c26d18433a984bdafd49059c36490334b6266de452554d0d54515c94220d04ff4dfc7154efd28b2fc5d35b863b6e00a6cb100edda3c SHA512 d623dc143d20b8d3a0eb66833b2373702221d673b4a2ecefa145096d4fbbf0d871770cbea6d2086126a43c55294e6a9af90430d3a4684409e07d22ad1bceb8e3
-DIST firefox-105.0.1-be.xpi 647131 BLAKE2B e33f9263e56b6566adedd496dde6ba3d5f1a48ad8ac13bb841165d876db555a150c57843b95d2c8a0fa0bba898f6b69e9c2dbf3fbc1795f2d327d72664d58d75 SHA512 ad832b9afceec554f6fe89e93b4b98057d13acc235d98ff7aae7596936f070f9fad6da65b2f396bebfc527667cfec7926c8866c65f732814f1fbf334472bd153
-DIST firefox-105.0.1-bg.xpi 587141 BLAKE2B 1e144c7ba8a464e61ebab0f18e03241e5402f34465e7cfc448293b49dee60f4bb01c4dd6078ad173f9231bbbc5a2c562cd21e8349f954811bcad937460025127 SHA512 5ee951ed2a477293d7cec42e76ca38248250bf747c2b0564418b0533ce66f35a78e0bfae261adf132772c3bf7e9e80b9b7f891519d7c3a4e0e35e7dfc713c552
-DIST firefox-105.0.1-bn.xpi 585359 BLAKE2B 17dac7fbe9579bc677b7c4884c54e420d569197750b2642707ea5ffb7a8361726e3d51a2a133cbd1c5285a3961dd0d9d2a3ee31fc85adb69e5f777ebdab28913 SHA512 cbb09aae1383e4627fe6ce14392506ceaa9bb296f94f341b62baedca154671b2679a37f76961ecdada55af123df45b4a859a1693506d6f3e6065b68313c4bbbb
-DIST firefox-105.0.1-br.xpi 539953 BLAKE2B cf605b3ae5e1c13454c720a57b8b3eced0310ad44eb5fd333f0d5cd18d938d5f6db86e31f3a46d73d20df548f1b6ec6b10f9a437e76fffb4061cde278503d401 SHA512 12163f2e7bd0ec958bd70f95948aac07cfe47b71ad6906728f8f0b8a9cf921d26a92aac0faa520d23e09980a127e45b1453ada2a20c054626852ed8a2553159f
-DIST firefox-105.0.1-bs.xpi 470942 BLAKE2B f2fc66ede3a0a5e26b0684d1e76fbaf4f4a6864b448cfb5bdd786ace9435faf11d3a521df243f6d3a103133b3463b8a6190784edb9fb8310e36a855918df666f SHA512 a488009bce63393aa4c967f39f1132d1ad19da7ff0d07d400560d38c2d788e0c4e24b2b1917aa86ed6f1f83a3c6532ad6201d0297d935ab5238019a857b3f846
-DIST firefox-105.0.1-ca-valencia.xpi 546422 BLAKE2B 6bc88951bf265c3ad447b830d050c5f16f5a87f5a67790c79ec35b0e1c377471ce3cb630d2d272714c008588d5c677b507c9c7f903ef4b7a4bdb7eabdf518cc9 SHA512 069fd4dbc76494d958c3f26fcebeed3912ae042e904aba59cce55f02944d2ebe31799e7237638d097562871f12667d34790649447abf47517599c16c595670a7
-DIST firefox-105.0.1-ca.xpi 549866 BLAKE2B 9b725b12677248a9adc693c665b4f9751508df8b3fde58408806d126cd7e744eaf83c0e9bf75eb42ab4c78d9b060c81e79a4bd38cbe3a19269ae0f40c1a4653a SHA512 30ae7eb14f1ca7aec631df450c89cd7d6c36437fdffd140807ac28347b131807a98fc4c7dae50fd3208f37972db287fc2e1d1c2ff303c855b4eb4c8a00165d9d
-DIST firefox-105.0.1-cak.xpi 559990 BLAKE2B d3245f05776a40b3367d4e3d7a20861bb4b62f00b5ac4781573d6401cf89ad4feec8d20a024444f6dfb454fec81a73adf2133fae78178a7281db1af16ef67f42 SHA512 9371eca6655d8c5cb769f1b7009a1d730f52da8ff5b118108933a3097750ce261db6bcd597d226358e8582bfb8f95bc9fc9bf970121b74a752589099e5ffbf5c
-DIST firefox-105.0.1-cs.xpi 581742 BLAKE2B 0a768cb4562bd5060ae3d6f52cf0e48cddcf52ef0e74ab86bd817511f092ded28bcf91e97454316bc02f2f056683a7b208b07639f7e26616975843f8d586fc27 SHA512 bb0d3ba875ecce7992fe799a072f8f97d429c00bafb2f32671a3c84422369275a6939bf7f4dc88746cd2e461309eda798866a287615289a023c072a293258ce7
-DIST firefox-105.0.1-cy.xpi 562733 BLAKE2B a1318a7e76b497219bd7ec4220fa41225b731c504a5358faa32ff06271aae65b34ff9ac2cd7b697122c965cacdf4c9b80499f32993bdae92c70f748ddca3c0f8 SHA512 b4383ee24139d6f956f5da0db7ab35df9a2904b058d232bacc3407222ed04ada530b5abafefad1a75105f1f77ac6bf260b8d50ba528a82764154b9f155466c52
-DIST firefox-105.0.1-da.xpi 553598 BLAKE2B 0e06d83eb66a95b58e950c3e624aa9c36b775760667cf8d3a2a5c7e2875333fcf56cb9b09105422379dba01aedd1b7d0b2ce3cab67e46c6e3524ef7b7bfbfc54 SHA512 639de62d0f0e9cd7e5ed6fbe1de259c863537b09cfb829dce2e68261767c066551762ccb222f9217c86b3c98ef99eb55a17c79f4b7623156ef6870d87be759a8
-DIST firefox-105.0.1-de.xpi 574355 BLAKE2B adc3dc57f9c819f7fdfb7c33f3cabac3efd8f7c898ef1cdfa032d23c74de17ff809e6f9d1e63de2948b975638ba30312e59c17b9507cc6d948e4742bc2591ebb SHA512 834fcf649728c04d9d7c8ef515853a97f5508e9c9e92f3bd8db0c9f2e69d4c573c3058fd1c8212b604b4e75cc9b6c6530ea47e627cfd1dfab44cf37377c53868
-DIST firefox-105.0.1-dsb.xpi 587698 BLAKE2B 004a88885b3a2eecac82217f8fdf648958b94af1ac244521197fe915f649fd09126babdce38f2f31413f888c98e46a2a8a158c7f609307c01c4c3514d52f47df SHA512 8664b259c63bcd564577f5aeaf831e0bfdeb4ec535059d3414b044191f4ae511712772b50e0d60be443096c66c644aa636b38d19407515ad71e140ddc6983473
-DIST firefox-105.0.1-el.xpi 663193 BLAKE2B 93bacd2751ca07ea77816cc8bf38a1746465b50d807afd4101e29e01a79e12848bfe6fd3d31f8ef2eef5f68bbfa35579a3fcb559d4c89b0c080cbc4cd1f1f6d7 SHA512 9393a336b9fec3142c3cf63c4dddd3165840927847ef9066e091ebe43082414226626052a58c099888347eb1f47158a4c0d93e85a5f3bf0e080ad09d240d56e2
-DIST firefox-105.0.1-en-CA.xpi 523068 BLAKE2B 294d1d32bf08dad370c94d0550b8e4710e8580f5bf1714bc45728de010c2a192dcdb768e932d61b5a8cc7a2831ea71737eae1c32101b3529ccd51e6d608cecd1 SHA512 35ebd07c00ef0e9823797d3521b6972609ec4a6012e56fcbb13dd68eee6ca36ad77a4385f76ee702dd50fc099113a3a3bd58e96561b16ea38dba3fd7f1fea6e2
-DIST firefox-105.0.1-en-GB.xpi 530694 BLAKE2B c70d854e3cbf1fa5fcee775d87df4a4a2b9fda239b00c81456dadb277efd04de4f03f010f2fa562ae40b29109aa41235986279d96f18e8b10262d1bb5e28358d SHA512 db90f6c84aef3d184581764e3dd7e87c62f68c51a7312a3d05928568b4c61fd8d9fd543632cac1aa41e7acd46b265dcd4c8689b893203f681013e57ef2c0e734
-DIST firefox-105.0.1-eo.xpi 554048 BLAKE2B 39d7d977234178c67ba8bfb1a923699d12af5d9d0882e4b45af77548df8d64ce6f7ec91efbf998a5bc6862e813d893436d66f0f5d9659deb472d5394203f5c07 SHA512 fabd89263f0f7d65d3f7448f2af14c342aaf668f3a582aa6f26219a3b79218209e35f81ee6de61cf346c6c0f61c9841ab43922209573240f1c9dec266f697062
-DIST firefox-105.0.1-es-AR.xpi 568709 BLAKE2B 6e5dff0708a8011a9e984d131558ebeeafc2cfa8b420733af4bb1decb136c1df40951e30e9e3bb261d1c1f289cff55bf543c88182006778d72693736dff1fe37 SHA512 d3d9e5827e1aab3057ec9d9f79ca62ce5bc32f76d886212e6b64034076c9747fa8f3d75d88ffaa1996a07f93fe0fc35277d2a1f5b5025fdd194d57ef4a51d27e
-DIST firefox-105.0.1-es-CL.xpi 567814 BLAKE2B e84282536a52a066e09d847a8cbdd713c243415fbd8536bb3230b2aa37d55380e85260f3fb0bb9d3539105cfac60f8ae40f5b3a7a4dc3dcd61a125e522263b28 SHA512 2b7c85383640b57b544084b8041f407be622d2a32b16c618ba2af55e36e27e1d2f5da4aab5d5434dd7c258234a06e2e54f403ce310486d71d26157ceacc44353
-DIST firefox-105.0.1-es-ES.xpi 553322 BLAKE2B 76b58f3e513b0a7de60aaaf6aa4de3e1de4959c5a41a244f90e557bd160590e99e26321109972b29fe105c05fe29d6c08fb8d158fd96d7975a1f1b09e45e7b60 SHA512 0b06f97b9fe7623ad27d78a18a23818e82c8632619c33db18e02570d36d337d9aabcf7ce0c5b9674a251d0d455fa65741940d6406cce9a57b726466850cfcaac
-DIST firefox-105.0.1-es-MX.xpi 571860 BLAKE2B 2d587e09c001dbfca85b3f4cb037e6cce01f4a8076f125a2e0a1583a3869a1912b5174fa1f379ae6db5ef5f129aa86f8fe2308d71da1833b9694464e2efc930c SHA512 fde5903d934cc43bd02619026b8a6847f6db9403cb7fb7e4dd89dd5a1c6cbae696e71a60a3d5b5b00e89b5278d33ab03176250643641981bfbdda7f5a408dc06
-DIST firefox-105.0.1-et.xpi 539886 BLAKE2B d886e47dd809fa5f6bc893455a8b3fd766a9ce6c702c2896a4333c5681cecf5b43001a73e64cbe81c220c679ca60bb07a8eaecdc42cd90d616954ff335c169a8 SHA512 5183f68f69588d3c8aba7264be6381c298975eeb93e83b13f98daf8622f8470ff4c0617b4c2f626457fbf5442d4ad13baa3d600057fd86d8fe3b2e37d5886d75
-DIST firefox-105.0.1-eu.xpi 556245 BLAKE2B 161fea54c446be16c08118a31574dd670ccee1da25fc0ec362b20ea039a32d843f3894c8de3739609b71e49cbe5c6b2d319d46306e29475dce84474cc071efbf SHA512 a0d1e937038dcdddad0293f6b9304d7e83381857d0d846e5010b5b350918723cd8c67d5291553fa3926f360d3687a5243a5e6bfadee53eb3fc2edd7f9d0c0cc8
-DIST firefox-105.0.1-fa.xpi 571118 BLAKE2B 5219fabd543b2abc0caf3996f939e2aca4efc2a1f03c924dcc5309595987e2902a21d6a690cc4eaa7de3dee60f8975276c1f93dfe0ae1c7b25eebbf8e34feb4f SHA512 f0ed46bc6d877d257a473149fe4e3b828a8cabc86d4f77c8f1345f4844db3ffd3249757bcecafb96fb2bf2e22a4d345ef0b717be4bcd33f29ad2a83be7156c2a
-DIST firefox-105.0.1-ff.xpi 481136 BLAKE2B 51ee4f4c829cf5ffea7468205b4040a8ca0b4dc8d23f2c499552f590654d379abbb4b74662b8813dd22b1dbdf7adeb26517d7b31ad9668e4e2cf81bc1a057449 SHA512 957a34430b53a4b30acfff228d7457889bbc0b70110e205258a908fc0c7166e9648b32d15243621b2804e0a59841ec955c54995c9d1ce4963ed6c0f3ef9f39ea
-DIST firefox-105.0.1-fi.xpi 552065 BLAKE2B 2fe6535f51ac585a9cd2573a8ad346a62ee6b2645288f38e641d8cda85a7e3fec4b528211ac4c27c91a689d585fc84e1769ac3965a3dd0ecef6f8d1050bcbff3 SHA512 1fe97855000585886931d6f71d01c7f45c191595a3f9d3ebfd342da925a896712682bb17bf488a150fa92a7c20ea62965881173938c0cdcb2a0b7562f2ea2de1
-DIST firefox-105.0.1-fr.xpi 580216 BLAKE2B 25646a99b5dc3fb813ffabb73df1e35acaead0df40216773334b248f48d2ec229f864db6e712162ebbd3e04c4e4a1a3b26adaf01f0dd727457f16bcdb6f82060 SHA512 8ec98573c52bf05baf8d69957d58952a13c10fc8cc96029439a061ab14a3016968ae50e849837f05bc29897dbddeb179f66a4953e9b4bb0e4f606d5d88cb65f7
-DIST firefox-105.0.1-fy-NL.xpi 564511 BLAKE2B e341da66506a4a673a5a005f7e7e27496f776b97e1e563ae4d7a2211b883ba75fe95459b17ee709eb50b683af1c361802424c023c10583d1436d6dcc1eea3e39 SHA512 7392b48fa7c96471bf68390c7d7a00600e442165b20e1b7f8349b2c4ad7917f5c8084057e36dd5238f4064556a4eefb02c978c16715c475183bf2818827ab50c
-DIST firefox-105.0.1-ga-IE.xpi 479303 BLAKE2B 059d5c8a08d42f4defb6772866d47d962d2a318fa5805385d308d3d1a09459455d91d474526ff68914905e5d761f586c7506656b2588dd5971105aaa7afaa250 SHA512 b219078eee2ec8ae9fde1b3f68ad19b4e99542b0f46e91fb59ec15c97d088ba4b85b967fb2c9ead9a882ee0cb9ef7b0c28b59aa6281b60bc8b118389bd55b37a
-DIST firefox-105.0.1-gd.xpi 552652 BLAKE2B ab9c81b8c058bc0d4a6456bee85bcd7fbc23a83323f9a78ba6637dc8806f7ddc2c2c157643471d9b4618f5308a957678e9c8e2c5eafcfaa35cce6e7ea1fb159d SHA512 503e75cfc778ee05072dad305c7fe93dac159d3ed2c041c5f4d296894e9977265a51f8af586b5f22dbab7a2d2ed529674c567f6fa68a3e767d16540b5c2e7457
-DIST firefox-105.0.1-gl.xpi 548786 BLAKE2B cf96dfa6814e534b607ac211641c44fb0c90a883b5ba5597799da216e766604a9ce803d9ef85550cd91a86fcba6683a3b0109b34f67b39dbb6228e02d9a426d2 SHA512 57641eca1b1f30070a8bb6b49e8893c8df22cb0e3764799595b791ad55bc499a88e3c5af68af63cc95b5b70816e1b0e7ac0ae591245b3d7e8d11886bfd218671
-DIST firefox-105.0.1-gn.xpi 579010 BLAKE2B 6a73fca69d57b447b8906b1f300c61c9344db18454ac35b4ce226b20a9dc2af297dd10ebbec2bafbcb6a735f3f734ed4fd4e5a0d8a601f937fb5cc531d23dca6 SHA512 e112e22f3a1cdae8328f55d8bfbf51db26f01cd160b6ada3a0d3cd22a8b5eba6d54e843004b6d88c9e7ccfc40e2ad0d221e74b1cc3be8a041ed6eb2e7ea1635f
-DIST firefox-105.0.1-gu-IN.xpi 536348 BLAKE2B 0de946a1a403d9b8d659725c22512b14a7e40a9967c10663f81e8b89cc46c05f168ea4288944f4ce035e09a7f1e7d731acf1715d30ee498bc92b8e562d55b76d SHA512 4a7fe0b54cb74cebaefde042ebbeeb27db9277fd3cd4fd3ec66221edffbc57766edbe18f5cc968a85d4d37d659a73005f138dbaa0e4e596c09052f2690c03740
-DIST firefox-105.0.1-he.xpi 575466 BLAKE2B 2429e79512023a3d77fc56a543a2634eb991742f45be29ecfb3211a557b60162cc27cc26a3ab86585c36a8ae0d5cb527d80a8643a3bee95cedf4ce678339b248 SHA512 d0dce1ee96e7472a552690f1f58cb87debe531166303e5e975b99be1a1709455c62206020bb4c0f16eba29802d5970d8d6b0a9d046b47838f3a690b8a7171474
-DIST firefox-105.0.1-hi-IN.xpi 566805 BLAKE2B f67a2d781d258bd98cdb1d016893ae6498decf8bf18f86a4a712d96908d92283b13c13b51be8373c6f3a3496fd0255b55c9035b2d33d4aa367afe4d1a0e61f5a SHA512 4b45e6c35471624926be986eb96b6a27f51b851517af69c0bd6e70f13f70c69c4fc159dc96ade081ec2bedb20daf5775ec27dc507bbbba98caeea54922aa2f64
-DIST firefox-105.0.1-hr.xpi 539462 BLAKE2B f881ca413bf77008400a233a659f9eafcba5b38512cf5d9bae3e9e1701cc76635609691fe4c435bd01674c506527c7c63f9934ff1e8780902ec10677a5bc5c33 SHA512 e66af46cda0392b465f9482cd969f871e3600415db573b186c0433957022b7ed67c1117c90fb66f0311dae2b70374930bb17912d23fe34d51ba60d39c85e9b50
-DIST firefox-105.0.1-hsb.xpi 583868 BLAKE2B 351b9caf490e0e76eb18c39c656308d129cde9bbf4df71ad52ceb0d1b3e3342961410fb3999802f8c7ca1646b108f563e5a86f36dfe073b56c8aad74f429bb5c SHA512 0f4e8e1b18eabc8a3f0f02ac1de4dc9c3e3b6b7ac138a7a9c25c5b7b6aa3a5a4bafa0a8d0101b3c4577fd5cfa1f015114b02f25245006a170d212d85e59a9e44
-DIST firefox-105.0.1-hu.xpi 588455 BLAKE2B a593e84c2104937266227b806b910e7b2730e8bf792022e93a6cb3f2f8c999c8547dc3f638ae4d63df179115f14f127ed7f005eafbc85aa34268192574e0ea17 SHA512 15465694c0376210d7656c32c50cf52a0e1c490bf1732adf5ef32c56ed5420b5163874ff905224a77f4a00b504bd960355edd25804fc5be4c3c06b0a4554876d
-DIST firefox-105.0.1-hy-AM.xpi 591360 BLAKE2B 612c3adc14956e41c0e8bfb83e0b4181544678fc08c507aaf2f2a1eb480abfbfbfbb40f99488439687133dabe8917616acd710d14e733a87c726bdf95c537343 SHA512 1bba630b0a145ad58c687f9b24cd627aa95ea3d1520196187829c983112477eee514284a3452dd7b6ad3ebc79130fc78c101c49687a2223e42fbce2278e3756d
-DIST firefox-105.0.1-ia.xpi 553263 BLAKE2B 74fbd55452d514f9b04f119ed17b2ad7d1268ad3f96f1550495e2ace0dbf079c4403b71a997d2158fdfcd864a497db0edc705432abe3fce9599713c09bf89cc4 SHA512 fd4251f058d4ace91e63bb3b276325bef572552ff2502d95e5c302a33fb6d41c497b3cb300430835d164d68233d60b404bbe0146c9db1087ed6fa45a287f18a3
-DIST firefox-105.0.1-id.xpi 550328 BLAKE2B cc5672391fb4b94d498aaf5879c64ca958664fa5b65da829ba31019b66f2d0c9a1e85d2f77dac831f14defe8b3fed4e9a1ba07eb687f78e943e00f23712f5293 SHA512 8566e3d58949968be49c56b8cbd0a065770791693ceb0431a66d4a6528f600e2885cc9f4fd38a163b29532a7539c7dbd143d182076ced080de1e46268bd2e3d7
-DIST firefox-105.0.1-is.xpi 560804 BLAKE2B aeefaafdd1e10ae7d1fd1cb496ca0dfd6778581a2a970a3d8fb33da673a50e830109ebf66fb372eb04c04cbac92408e38b36be2e238d48ce0ffd5028d95c4a98 SHA512 5fe9d1b543f592364d8e5487d7f6096c202304f9bbe211f407866e56ecd88425616c3078890e3722359f156928680ba80b508fc4647aae5cde349cc2344faa67
-DIST firefox-105.0.1-it.xpi 471261 BLAKE2B 053974af8ca970443c3d2a41c16d4e49d0e9ea87f556f950e9ae45a77232367608f41b3f4071316f2287dbe76428bbfd29025b1552d4654776fca17fa3433b77 SHA512 a7c1525046707a14529b2e133eee7de6295c75399f901d94fa66fec535f29fab5185ed20462c7b411f26a30200204c4a054a3f107c2c711731cf778a3835ada6
-DIST firefox-105.0.1-ja.xpi 593772 BLAKE2B 0b7c8ef62406df4818bad282f379d1f5299afbecbb766aed95e02e3383f4e2b3f28cebf8e32335025b1b38832ec1a43e3cd781a929611207369b541a25286d2e SHA512 bc049b6c1c69388fd9fa2c34480980d94cd9831749061b335cb9a1531b294d135a9a3f88fc5cd944e13c20eb38b264e8a162151d99ecd39df2350a0a4aca5902
-DIST firefox-105.0.1-ka.xpi 614607 BLAKE2B 7ec15482e4eb615dc1af5345713bd41ecef79b1c3d1cc9ee89de95bf5be223c2be8b229a4a13bc5524bd0b2ff0afc2631f71c8bf9095b9c30ad09a8f7461af1a SHA512 f5c2c998e4a925c102a8d6951237e5735c6974e74a83a5b34c65db54072fb90365be1910b014455e16a51c77950068591713b15635e83b72449580ac39a8c870
-DIST firefox-105.0.1-kab.xpi 573731 BLAKE2B 3ec28b0dfd59120d57dde3d4b1bcc5a747f75a18ea03b9172ac6cb2c238abffae0f251525e8405812c798c6c85befcca501de759d4875984108409ed55d58fe5 SHA512 0c7e866eef184194739011131d509cbe281e5a063f338e0a0ca9fc230d8eb77549a6331664f2d5ee39f0f37144c82b90bc62cb9cfd90638f821ffac5ac2f5da3
-DIST firefox-105.0.1-kk.xpi 631195 BLAKE2B 30452ae407104d16e4c422896938b5d62dbb622e47a3a00437ed99665a525f61ea45911fee8ca47b66d316a08b0b6365ce69a4b482ccb442652ef622d78c8f59 SHA512 3edb981b56c23880f7f352aa1a48cfdf60e982bc2e219203803bd51444e801d631828f2846f28e771a6b6d9d64edecebeaa7f260244d6d107f5f6b0a6b71d2ba
-DIST firefox-105.0.1-km.xpi 540646 BLAKE2B e66705fefbba13cc4d9196b6302cd079ef80f4707021b5e052c9cc70048cb9f7fc9c83eb6ae6d5137faf69c23aeb944292a855f36abc37a567ab51ad91eb4719 SHA512 5af76916d9006af7c8726e94c7cb710c883fd3b1603c28c4ea82fb3c1e1602cc17b98a3dbd45fe9d26a3a1bd553b29b9a7454679c1b12a06fef969345dd720e6
-DIST firefox-105.0.1-kn.xpi 506462 BLAKE2B 33bbe6086bded85da62940ff916e4f4fd0da12463973d47e51fe226033de4f93aeb3562ab040e66738f04165ce9c3f6dbce005982acdab4e163926a93b58f2a4 SHA512 7288924a7bbd54d306c63ad42479b123ecffe73085114863adaed8c7b9d3fe16bb5774284b8b3cc498ddce6312ba7c97e019b73c7bc39c3ef46243f140ce90f8
-DIST firefox-105.0.1-ko.xpi 600512 BLAKE2B 16b703d8da64a0b39f6de9afa888f5f3b2054760b6364ed88857ceadc7053c1c0256a175fcfc1aafce4e5df4aee0fd1d8e090e3f9e7d10f08d0db22627dc66a3 SHA512 5a7a0d9511abb46f172264378ee0c19b6e54f55193ac3091b285678ea13974cee66680d5d431e61949df5e13b5fb1fc00635331d0802aba4229b3e706a1b681c
-DIST firefox-105.0.1-lij.xpi 479007 BLAKE2B 00f1e3ba54e049a1f9bafd2f00d2011ffbd0c14cdff60f46b4a38607483963a754f52fe0aaaacc2655bed8be50926056912188d355cf21b82b67f35279cb8a5b SHA512 ed1ac7cbd981e580aafdde9d20d71aff4a6a738bc2002a8eee60fbf487b482a3815aae12fae7f59afeeeafde007739f43ae14f4955e7c9d143614fbe8367c462
-DIST firefox-105.0.1-lt.xpi 570049 BLAKE2B 0c4364974255272a2e79e83e173437efff25dd408edbcfaa70e8e8c0d2f5df03d9d86b20fa5c73ff867318b8c56415c4445b3567fad7e5ea0816468e2e982b82 SHA512 bf38944e0381ed7295ea579a668a3baed97660ad9e6cd7a1c26531756d924dbdccd357e63641af76712170638905a60479c0d3bc78f953a0e4fd650832228428
-DIST firefox-105.0.1-lv.xpi 472212 BLAKE2B 104a30d12d21231d3c252c4b6e231ee1ce27455adfa73b942506797ec51e756725ba753ac7ebe0105db6aec9769175d6e0259a28894c26b121c6fbffa6e79272 SHA512 25c64f81d25f0869355db649942f48b26e55755310060ac4225ec1a7d8e4bd5cdeac11ef44d0528788b32e0dee75cd4212285f0f4d9aa410ebacb9a91065e2db
-DIST firefox-105.0.1-mk.xpi 490872 BLAKE2B 145380cae47cfbef653a99516be2ea65dccc9dfce30a2c3929d4585f751982c183c4efcdc480b0defa30af541bcc51c3492e4b6f943d649444560714adff9c0c SHA512 2f0e0c9ad415fe413a1c82416116eb99cf99dfc51f2b979578bb8828aeff240837e52696b452225ae6be89ac46445bfeaff24a313cf1231c2c3033898cd69201
-DIST firefox-105.0.1-mr.xpi 539882 BLAKE2B ff817d83caae25dda54c60b3f59dde9c950bb6774942b160746fd63026bca189ca5611330f641bdb627d49aed65515662b7e22dffd5a64bee6e02395b4826833 SHA512 5a459091441310d22075586589f85fa5350622ca4321f6aeeedd57e9ac91f497e6218a7b1ceb46db69fb8e81483cfde984f8c922135a4edeeb6298f41a9163d2
-DIST firefox-105.0.1-ms.xpi 457111 BLAKE2B 20f52d2c649607c6ddc2b7a554b9e3e58c0869e8c75fef3a19e5c7a809397d5f84395b87d102ac084c7b96182b0bef82a1efd4a8ff227d289894d55f6a8a8448 SHA512 0b9012f5ce8b724bf6178d1260a06136a6e04a0c595e53b178cfa1dbe31e978ace6c5203d82cb344aafd4e907c33be5e120e08a53de322609aeafd25bf5bc3e0
-DIST firefox-105.0.1-my.xpi 520853 BLAKE2B 611ddaf0a8e19c0571c5c757db8640f9cb43b34a8f975663c1eb02262e418a7f9dcbf40c5405380dbb12bb247973e7bd5c5451ecf30ca3df06dda0ccf28908fe SHA512 fe2fe095dd6c21103815aea2a03b08257af4220bdc5356c4c7c0c0cfef418c40710ab7b19101086ad484d7a2f0ba91ff5e35f7960d42839db45e0369e7042fe5
-DIST firefox-105.0.1-nb-NO.xpi 549448 BLAKE2B 1175fe9b8fa2e73d116acf211fa40466b24e66235414a7b2da77fd92ec047741602eb6284906a52722260f2d52233de2acaa9dc529f7ad9b409622e9f6ea81eb SHA512 bb59f1f89a88e81f52cb2a0ee172ae0ceb04a3cc355db5ff6c5a50786e71830b281b03505349ea910b2d7b2cd7c36d7d71172cd931e230e392c723bad5d6710a
-DIST firefox-105.0.1-ne-NP.xpi 498110 BLAKE2B f9762022db47c1e1c306a8be75df1b70fd0666c4b6d081d98df9b72a334d26934ea35ba08c98cb417015e11e50fc820b7ea54d11bd0a2bc6d46e6bdf2dcc75ba SHA512 7a734c12bb08a751ffa57c23f3d6bb0ba13b2ea1750e7abbecda29cca663725ec0a88aa4b834b3d496b2bd555b754fbc0a391e7201da3067a7a73b0e1325f83c
-DIST firefox-105.0.1-nl.xpi 558694 BLAKE2B 1233697b72e10bb5d7bbc0dc1eb2a3fb44223e75ec24eddcc7d3ff5dd6d69199fc086cc720e2525cf2431f34f95ce96a4557e08016e97afd6eed49332403f160 SHA512 ebaf57c1141c6aa571fd4306436a58f9d6c35db2b7c1ee81012b508e7ca6a0b635824e81f8c28241ba3a5ac4e6dac36a92ccfa39a85d3d7c717ecc7d5bc43b1e
-DIST firefox-105.0.1-nn-NO.xpi 549963 BLAKE2B a95731f9ddc8a4c05699f4cbf96aeda1d7c81dbfdeb0a9b277a8a39f401f3e5a63358023821cc8ab9fb384c88432a10fc13d8801792cd80b247625902f138d41 SHA512 0095f6701319a43a0a63dda3c0b2025e1da5fdf34e869ee438b764391a4b0727e69388491d0fbbb46505931614f1aa3877bb3e8d0858f1235d3a38d1dda334e8
-DIST firefox-105.0.1-oc.xpi 569615 BLAKE2B 72ed4104daf5048582a2d7e3ba0090187aa1d897e9cfc259ff75236d79760aa8d37f175e4decfef3d3476bc8f0c283b218107bf62f9fa4b64e3a14510ce6c709 SHA512 cb83daef5d00393e943cef6b321da957f53fffa1dd614955f2b772cb69317b758fdc5494f72380b0d5901ba35578c2b0cf1f0784eacb9ce5d20243b858612d51
-DIST firefox-105.0.1-pa-IN.xpi 621215 BLAKE2B acb33a45b1aac57f18fd38198548b2fe4eea9a4c0a3e8515247d4f59356d7f715c9af1e5359fae6576d374ba014e53750b411694fe8d9215b41444a60c94238a SHA512 636c8799c6bc61e3492fb74b3314f574a65c5d7b414b1bd00ca745e86f62ffa36de9c992d5ad4601a00b7bf2d2333cc056d579f47c38db297b23971de2c4adc4
-DIST firefox-105.0.1-pl.xpi 579341 BLAKE2B 5155069da06df120cf91b2f74a56a89a41113cde7e9bf06e0f7a24c441bf5bc46ef7abf6892aa877ee197f035c9440a6888105abec592e110aed4b2f778eebe3 SHA512 b2d7ac86172c964d78005a05b1eafed2e2b21afff584768c8686c048f2505c8c8591b8105810c3ef152340b3ffaf46e03fbda5f77b505f71a85fc447208a9c8c
-DIST firefox-105.0.1-pt-BR.xpi 563717 BLAKE2B 1911060723eb8df959f514e4dec63307c3e662bdd3b74c729eec63634bf284b0391a2f4d0cb1f1c4290ca639e5f9d7e5692988ad990f68343d096987913af80a SHA512 ec41c51a7f61266c05a4395424bcf7b3331e04fd79b9a0aae575bb37cd21a8fe11cd2678b164bbd070b5b8b63a917f54a594502b362413fbc20dd0c608d7fce7
-DIST firefox-105.0.1-pt-PT.xpi 563884 BLAKE2B 2317a7e95606a5c3581c5acc75aaab5f6a4b77d03e7cf318bc623a4f6ae8df826bfc21299cd51f652738f2517c2160678b6d233e80be35ff66fac775baad1a51 SHA512 8067bda5d2bc69ec9b2326b906249b9f478c35f3ad59d3a5576fb157396cb5123ccc153610c4d754a7bed45cb64b57b319aaf8c93f3ab4e637a71f68c66931a5
-DIST firefox-105.0.1-rm.xpi 547530 BLAKE2B 30b61933d1c7d2446199ff0a62f9c9f89da6fd9d850e7d195477dcd1f99a73d8ee88f7b1d6164e5b51879022986a1116b6d1ed38b0cb0269ed5db1ff4897c85f SHA512 42a83b322ebc33597db7d03c7fdb84168887c27621658e707651231e770b2dd3da3117dd21b313c66f44b74abfb9836696c873737a9e6bad3c40be3f8c4a3c6a
-DIST firefox-105.0.1-ro.xpi 537786 BLAKE2B 26c79e9ed2f902390b86dc0d29cc94966a3393c286267b80509de7d309eefdf3e206bb022a9b9bde5471b9cb8e11cff694bbb90303167960bb393d81f0e062b4 SHA512 8a86d6f33a480d4ee6d576ec240da5196d6542d0f83163a382a14edf361c1c9687cdc13a96e10ff5df157c04608c6e0e1c77e5b0b7237d65ee7e3e540015c83d
-DIST firefox-105.0.1-ru.xpi 651159 BLAKE2B d8e555d1d30fe299fd91e230191a5aaa54f3139d05a8d9042bb7eb2a5eb9f052b8a71d919feeb8245c6fccff505f1a2eaec16080a41e5d8c454190d3fad99293 SHA512 c74d078295c2343af5f7eb5fd824381b135504afff0f50cd2f14e1b02ea1aa4e94edf553d72580c0ae9b96c1722867c2df3d9bf1170a943c8b63563ee618563e
-DIST firefox-105.0.1-sco.xpi 505207 BLAKE2B 0dd0d97d9d108e7d70274a8c6573d9215045bdb2b804b2d793aed8dd5a3b6831bf5c080a536992beee2d9fdc007b40978ac6ef4d4f84721c75e7c2ed86d3f4d4 SHA512 63c4bda75f29ab1cdc83e6723a7ae42977b345208211efa5198e11e52799664026fb36a92673e382860468e1f5f6b3583f9e02fcabf33d37d3c311a9ad0fd4b4
-DIST firefox-105.0.1-si.xpi 573138 BLAKE2B 3057034ec4a2ae31381c2a58766640e45ee9b6cae9144eff21aab4b779c4a81fba10141a87285565beaed85bf188a9dcdb61a34d336cb9e6e359367d2f7d5c5d SHA512 97c026bc8ce5cb9f01d3a5642a3142d116674e792bc2b10eb9270959a46c1d3c39ed43385ab44d589a1c46428fb8e346130988ea8a17ba07247a15463a01fb0d
-DIST firefox-105.0.1-sk.xpi 588225 BLAKE2B c6dbba67c914b797aff727fd2d6d04c95b888c14c97d2a1afecc2095517fb05e8290e6ada9f82101d4135fbd2289ea19835f86d94593e51d77a90bc4ce650ea0 SHA512 e1cb37b88c8c6bc78225df39903f48e8b34e731eb5775bd9329cf41dea9b0ce7332ddb71ef41fdd4840d66a17b55e319027fe50795ccce51ea97e6e2732902cd
-DIST firefox-105.0.1-sl.xpi 561128 BLAKE2B bec6290725b2c8f91dc21ca880fefd03f8a2bbbd1f5522625565f89075e2469648f5ae4e43edea16cc00b0c147f0f87c1fc3a9e301c3cb867ac552ee5f9e2543 SHA512 f3e30eda30f29fdee94339d06cb27bf4308303e9c4ded7840a7e98502baad7ca4d31128744bc753c7962e29bf85cb81e9cb58b4d9161dfd6e24466a78fef846d
-DIST firefox-105.0.1-son.xpi 433327 BLAKE2B 0ff68e70a8753837a487ecee9aea7c95a7f912af5050cd1c7d79438c63d7becba0ff31790db48b80caf064df8e55d1d8a0bd6b8715545e90c0f930b8a6e38031 SHA512 2254e6578bf2d646a533aa91d0a371a0cdf9b6affd366ded96a70887db6ed8f0f095dd1663658818d64f34fff4ccdefcc9449de7ef3f28357e9b28e3ef99e9d3
-DIST firefox-105.0.1-sq.xpi 565444 BLAKE2B f605539724883ba39d05feb941188223b91a2e5fbc9c1ed2c8c66638e5480c59ef00b6e66997defbaa2e2869d0e0e9a3beaf15def95dac9abbbd56d5e3eff357 SHA512 802b3e109450ab64809e971ee15424f2dda2d9e1023797472d1e6faebfd0d77e93f140ab841dc985e191698e6a18a9b63303b31a6c35826a4c944d67d970449a
-DIST firefox-105.0.1-sr.xpi 604656 BLAKE2B 80453225ec2941d6b492ea42e356bc3f59d8c8b83dc7cd83954440fb4f8b0f1dfbf908ffc4ed8bbecb7d11ddad984c08b293a8da2b86d2eae76bdea8b88c9763 SHA512 294e56550105c32c29a73fc1130fd127a4872ac309fbb148c6fd7d07372dcde6617b37c77205a588e5135ebad10d652072cd5398d76df96aefd2e556e2f27d28
-DIST firefox-105.0.1-sv-SE.xpi 560615 BLAKE2B 9be16630ca720fc406fa68c16302b47c06ea4fb78ab91c826a7afa4a63cb87242c4eda4f1312796cd8f5985e6a57d17d360c878dc3025f61a77a8b280a819b63 SHA512 f97008efb6eb8352677860363e40f1ac308916b476b4183e1e4b26a21811159ed588ee49628b752961a63fdc4481efcc514ae6caf10821a11a0c7bfe7c9a126b
-DIST firefox-105.0.1-ta.xpi 519025 BLAKE2B cbf63da461c775c06630795d8634ebda4f53f9f1a305aba74fc1a510d0f838474037d7c084099945ee36ca86ca9de2ae6888bff477df50b05daf529423e3077e SHA512 3b74ac701f72696268951fc513cc4e0b2bc6af7a31b32ba60ced948f15a6e8e9bf4d136d5c335a6ed153ed43486d61104f15b5d3014f0a0ddcc63d869fed9ae2
-DIST firefox-105.0.1-te.xpi 560557 BLAKE2B d0a3422beca894c110e646e140bec441bb203b6610232ba568f84a1d0577d880a6c22c7259c038586f49a41a72c271e7e724b4f8671b517ae1f238b5ccaea256 SHA512 06131f674d56ce01b51dfeef18a8a99bbd5e624d85410ecc0247f702b396f9cb6a5cc504559a05d93c83ca06185343092e7793b93c1578539e55cc471c2a74cb
-DIST firefox-105.0.1-th.xpi 621826 BLAKE2B ede1d44f710372b8f76f3c3feefcca647faecc045a8e2e31ef20c60458d78ca71d688741003df243c3763fa6eacaacf7cb4babf9b42c3380dcbc8b1ed880b37a SHA512 5879c00c0f069138893656e69b32a860a3379eb9dc7244ce78203bec187cdf27614e6f1c0bce57194af99dcebea23f5be35c24eeb5690f7ef5c5d2f15269d1d6
-DIST firefox-105.0.1-tl.xpi 527995 BLAKE2B 4bd1776d8103baa63065a099c1815c9252aaab4686841c04197cb02948ca8a1418a37fc8cd6bb3fadcdabd0de1555535a5b77c4f9d8ac49a19e979c5eecb9364 SHA512 4ef538668822107b5b85c94a6c6390c5638034bf83a8a342a427434a32c9de379a6c39be069ad638db5455529123e02b531d2cba950366a56714afdf5fb6d3b1
-DIST firefox-105.0.1-tr.xpi 574332 BLAKE2B 026e1ae8badd160aeb4e3f4a052fb769d747fdaf704670fdd82ee6e29d65ebd2ef0cedc1c5840e30eb3b7d484648f49ac4f3aa383c9272933aae5994c2ee5034 SHA512 bd8a521088db01d9f6fd06a785833e19c548557704ff874f0ba28b30cc08fe77565d36a4d3d0d19d93afda52cb0fc7a7cb9621c62cc44be2b1b62654cc889e66
-DIST firefox-105.0.1-trs.xpi 498809 BLAKE2B 27f9f3161595f74dd1d6376d803270fbcb7068b36172d8f5bb5965535023efa6061edfe9c23fd3f064cda5227527d1be75ea17c42adcf9563d826470be54fae4 SHA512 6ddb519fd12023f1769b4d4c79ec7e0c6d74d1c00979b096676cff7cf350f65e9a3ab4f5bf8c858ecb367b6120bcf484db6bbc552efedefee01cb7f593d54838
-DIST firefox-105.0.1-uk.xpi 644349 BLAKE2B ca8e445436c0d6f7cac1cc601fc52814998653248c0f5dd45ec0f686cf2ac5a06a19fb92aadc4dfb62490a7a0b8d289041ba7a91763313645e2f275b08c0bec4 SHA512 0db821e82343020aa020176605b5ea99a6d8f8b3366e8c38ea00920c741f01da9d64e54cd65e8c3420cfb687fe7114835e26542ad9fecf5229f68c3af16bb077
-DIST firefox-105.0.1-ur.xpi 566537 BLAKE2B aa3d98f429baf0bbaa00181a9fb4492b9d2341bd2aea5aa60f6b934038e814a18c4214940ea706999548144bc76390c4e2e5072a3f0fe437972c026e7dd3dd41 SHA512 57590cb75e0e71eb7f974c5979902b797011775928cafa2dff2220319e728880269354b464299647f68fd8ea9e0c56c38699411dcc662796da297a85eaa8513e
-DIST firefox-105.0.1-uz.xpi 486876 BLAKE2B 49daedd12980f3c51a23708b6c765b8449df9f8b2965450dc7de0120605433b823399cb689319ba37c47b89653573b418a1d86b47fc7ad19dd03ec7ba3c52433 SHA512 40134507decb0ce395597c58c99c12a52d234bf273f686d8960135bdcc80e2ebed62b4536eb6da6a5eddf9bac28326f8abd630dd395b2fdbd70b2502c9542418
-DIST firefox-105.0.1-vi.xpi 595135 BLAKE2B 7328350b96c64a83c9077bbc71d42f7d8825835460b25226e61b35ebe39ebff2ed4032f7208d7bcefca2798327cef911098a4c5704e3d4e819ef24dac022e878 SHA512 d3c690da21315a4262b41d36c6c25c276cbdc1118ae116d021b5306e7307b4368d9aa5a99efab910ee992d350ec891e9c5b68a341474c4d164d19907b4ad92e9
-DIST firefox-105.0.1-xh.xpi 435741 BLAKE2B 4cc4ab55df561b95948dd6b5e389bf6a1e3575574d5a7d0072968bfc4548a90e0e507848f1f7161a84c2d9c3dd115bf2699713ec9900361224b23cce0a19f61f SHA512 0a67fb125fa6c511ffa5f1f7772f2679d959be04ae98f65726b1491756678cd8e6be6c9a43495f3bb78a67a00edc2464104c4397553a34bbc6a9bf90c32eab01
-DIST firefox-105.0.1-zh-CN.xpi 596364 BLAKE2B 18c80655c480efedd506922bfc0d4430eda525a1b4a15db66851032c25dd0e103efd8e246003699996a01137972ceff1b60ca50cafa8ee8c9ac8b2657726654f SHA512 51a8bcd726e46f28e404f3866abb8ef36b01163ffaa42e23ff73cf596b920b7225f0bafa2f587389f585577aca379c4ab1805c808dedb36ddf05dc90468417c7
-DIST firefox-105.0.1-zh-TW.xpi 597433 BLAKE2B 904ba9a3e987c3cde42aec94017000d5744e69195dc7382891f6443aa748f26f670bcc7c6e9da8f1954da8bc295c2f469fa666ca02141caa71fc467d5b4715f7 SHA512 c39cf3d846c43a1942ced5ead5c70610faa6089b8d87dd32a16d7d5909a28e051b122699947a8117e2ea34a8ba463d5b481f68fb231b33872b5c4b4d70e25024
+DIST firefox-105.0.2-ach.xpi 462391 BLAKE2B 9f81f3f73fd3f616495e0d3e215cd3164a407a28ec5ccb89a723fa02f32131251b5eab3fc91be15dbcc80fc77041c360791c638c63f8463fd9e2063ade45397a SHA512 c6f202ad025b5cce4b92ed32a55996f5bae9f6a2cbc5d26ead6399332cfe41d9020afe01ad3f4dd21f42d81982ad61e4f718bda006027fb8edc51e2103f17d42
+DIST firefox-105.0.2-af.xpi 426879 BLAKE2B 4635cfeb46eec321bf06b9d2ff2866a112817155de4dfd13fffed3e53ae3e121eaa398655a817bb2d728b86f2d7ab80be680f7a49a252a147785245aa0a7c107 SHA512 5a98eba4e0a00baac7c0f3f824816efb206c4bd8381af56f8956164d50f1afe74988a34bd5f74d5076baab55c6bafb9d08169f6b9491f6fd5e4da3cc40cc0832
+DIST firefox-105.0.2-an.xpi 507319 BLAKE2B 01c9eedc3a2784b3bde71d9e9edb5a2da8b329c21e5a048334cbc021f67f3980905ad0040cd9a3ddc12f7b844957817351f471711172f55242edacfae6d5f65a SHA512 d3857557ca2cfc20bc95d61d564e17d102d56c5de5f8b9f8529ff098aa3fe6dd3264d7cdddd78498252f42053349f68ddce496d2c5b61bc6d0e08a618dee605f
+DIST firefox-105.0.2-ar.xpi 571520 BLAKE2B ac4ee3a8906ee9e32256038753854badec8ce610930276b558f64b6cb17c09d7b995e8f1de48b9a13fb52a1a5708821a27b9502fcc83ed4f1e7f12ed84264def SHA512 d082aac8ce3d1d5e0afa5b019c57dbb47b1d43b75334f451b21b1a931b29325bf70849c581dab334f0f49cee70eca1aec1eb5fb745f4197d4c51623edfb0bb54
+DIST firefox-105.0.2-ast.xpi 502233 BLAKE2B 6b3baca0af83953bce5214c82ca7b3b89585fc9aecb4e22e676fbd86f4ecd9769bee90d2e7f53786a65d47605f25709aa36701b33a05e2b85279d4a9d4ab7d0f SHA512 c65f70642a917a40eb63a95d4e773afadbdb0048ba1b4f6120f11d22d15317c1326ae47755425e396a2c05a8d36d02e9153047ba7a3b9b5902bf90e15bb1f39f
+DIST firefox-105.0.2-az.xpi 494481 BLAKE2B 5f3c0f47c70945512bcd2d8ce77163d1222cafac66d6f40cf72f3c3285efe86c0a77b0d43e9f023f8175247330d11242bb9b0cc25aac5b4e984c060240f8a0a1 SHA512 09c48ec36988b66486a8cca6584f9e95172f24ec2b9222aa148c82f923a5fb773f65e6ba8effbc9de051488b6e2b7fb3e2c8ebb24084d0513b604574d66c49dd
+DIST firefox-105.0.2-be.xpi 647127 BLAKE2B a35edee8ea0dbcf970797ce1ef26e58d7b336bf4ea81fc5df4e85ae64a2a316237ba35c76a49cdd19006063d03cbcdb633353948b131cb099d3d7a09c2abb0c2 SHA512 26f97144bc0aa86917d39abf2df6a7ff71b0b32840730f67bf55c7ead27fd2711fe935753df3c743a00548bc777b8e300558a2a0a77c9b88e911b799cd3a69e1
+DIST firefox-105.0.2-bg.xpi 587140 BLAKE2B 6af462bb2ab04a951c7761218667058daa3c8d0c94e052176b38cc5223addc08392769778af58377876aadb6d72d5f5dc729d15ff11a171574f904f6c875ba5e SHA512 71839cfc774a01cf5e006acc6a3cd9f78f748f1c3902826d59c28a22dfbc8d930b9f6d695b1eb06ac4b24b8e4e01046d26b7252bddafc64fd435e63dcdb92ddc
+DIST firefox-105.0.2-bn.xpi 585368 BLAKE2B f04d81ac30695ccf974ae20e685cba3a714203dd5aec27b8a474fdfaf51033661852bea98408a9c4f3ef8417e39cf973e95a0aaeee6f3c844ef3019a6eb971cc SHA512 788cf144dfb42b5433c718bb422a5654ce1f6f726ed2a65b3b3fda9e9ba50ce2a5c094dd8419b0c97bc59ff81872d9cbf9477dd44214584559075fcae0b9c252
+DIST firefox-105.0.2-br.xpi 539966 BLAKE2B 0a4b89e3fdf802b3eb1993a9d63bb525abcd39531106f429033f35e5c88e03f00b5ddc4ca14bfd7bd57bec09822b5ecbfb1179d293593d28ace4b7448e60686b SHA512 bb546c791a44da27146c1874286d9a1ac3fc50d5c455d1ea9e6821d1422fdd4333cc7a0cdcf6d2d81d2a5c40e890bbbb849d38d336ac9c4490e0e50dbdae223a
+DIST firefox-105.0.2-bs.xpi 470953 BLAKE2B 28e3474d912227a80b43da629b9bbe0e2d3e4e31f0605c697b9464eff598dd1f95181ebf1c2f7ef67e374e0387c77812664260bd0504fdbec371ce060e3831fe SHA512 b70570bce2139c7117fbc8159ce194e7d4b9d2777c551cc81c258ebbe66fd79ce0c215afc6b2f9b0678a7a62377653942b7c2c8b8091129cb3c585a2d543efa4
+DIST firefox-105.0.2-ca-valencia.xpi 546426 BLAKE2B 65326ae5b3b91f00ad7c3c31125a39142492c767559cba70437f8232d02e4a13428a972ca1d2f253b1e488a4b4f3311a3bdf3e6e116af13d9a89051530d5ca5a SHA512 16a40af9545846298d55070136e43af57295c264cd8dcc93633ce11041400707fe8211063e46333cb7dadeb489c031919fb46ebe442b1a391038309bc33d1436
+DIST firefox-105.0.2-ca.xpi 549857 BLAKE2B 00b0b750ff0c9f3e208fd1705ec209084c34bf4e56ff46277b0aed73036d1c96a68ffeadd2a36111c631355f374ab160c79c422b099d6ad2fbbdb90074aa773f SHA512 912b56033a54ea3d45633f5393748377d178cee7c2f472248d69c0545b705266f7305d112715d36ba575dff9aa09a95f4e0bc36672101c161d57c39d5944076a
+DIST firefox-105.0.2-cak.xpi 559990 BLAKE2B 9ae57c23e5a4b5b4921e1c09510f0964bbb448f6e5e55a2caa8cb676478fb71a3771b47c1ee1e2250589bcb5517a6a951502fed9c4f955f9f182986e6fdd1fe7 SHA512 600a1b9babe5b40442d10b0162e6080920f563cadbe03d15457aa4a71088e56017936c78e0eeb6ec21fc37f20d3d4b6b47dc3bcd607e79e9165cc58c0124ee03
+DIST firefox-105.0.2-cs.xpi 581735 BLAKE2B ccb36c77d6ddba17017b748c34de7ed0f37b07748051d148c7660dc75127e9df8f4d3c02a542226073f28755eda2d19b3037175a479f9d30b04a57bec267b33b SHA512 21bd4ae4f92dc1c6bd87a5989c198e8cfdb9b4ec604e4c6fe455d48f792e2c03b63cef9c052bbe24fe1f153637df4261bc04a312037b477d6386a8b1b0882a56
+DIST firefox-105.0.2-cy.xpi 562730 BLAKE2B c00bdaf2d4b8b8a89b4f9cff462d6ccc771a208c2b2cdf8d5f83eeef9975f91122e3cee6c843fd88f3c880015995b60a4fe659d3d18246099b3a1cc107bc65fe SHA512 c62d561bcc3294be67231b12ad326fb910f96c2500dfd405db73ec3dd77e9983eb3754d6a2f37eeb6ef3507a44699d4e9f707da0782abcaedada21d7dac011d0
+DIST firefox-105.0.2-da.xpi 553592 BLAKE2B d619659f46f6fadcd0149dbf2f74acd69a7bce12c6a12e0dd29a70492bf0630fde34e23bfe7948907542ad91a321b75877d9d71d11482c3afed00929b2533eef SHA512 775de9c470f9cd08eaae484e3e7fc6083464ed9636f49a5328be596dc1ae7e57167e4dde462a74f8b0a754ef8a84f48a9f33fc8d37852409787f6f9704f9c802
+DIST firefox-105.0.2-de.xpi 574355 BLAKE2B 53b41e092a4f341eeaf28ae621f4ec3e8776cd482a53098cace4fdcdedc30cc4144e996530acb8f76aac8e8baf7cf2b6ead541783d90db2e63c143c6e9479257 SHA512 caa2f03277946d819214df127ebb5d13534fa1ac9633e560b4194234faf893c48b7becc6238d1e30100d431289dc2469e623998fa517308d64b6e31bb7dade56
+DIST firefox-105.0.2-dsb.xpi 587695 BLAKE2B a9b84253f0d47007924a99d7b5bbf3b289a2363f56ff3ef9d2d727eb85ef7dc71258952ce8b3443f2ac2ee4137afac328cdce83d108989d8141a92401c821fd7 SHA512 944f42bf5ba38d2f9aacf65bf3a762bce77dd5b9dc53e33004482b868a8c69dab934c1d883c2ebcb9661ee730efb427b2b0e166d24381796b04580f719daf279
+DIST firefox-105.0.2-el.xpi 663186 BLAKE2B 511539d15d52006e37e0327c1c0b22401e71504233cc25e9ebfe679262e05cb65627f065d1fe6a37a171abd058c1db92ef78432803a120d74cac8298cd60fd1f SHA512 beb94e7f840dac1745c6d332d6694be9f803a950976e573f29646b0faad5df91e7d821fb3fde945b5285e5e7e10f0ec39e2f60e5e35d98ee90c47d7cdadcdf89
+DIST firefox-105.0.2-en-CA.xpi 523073 BLAKE2B 748421a0eff80fbff1f9dbb80b646480b73c48825704fac6f8b0a8affe1a1832bb3bc11011d837919134594de78c7a4c939d49322983e3797b3b99ce59d26c67 SHA512 e02a51f671cc79140d0c1c8b4884c30653037fc7e90e0f0063b67895e524f6db7576efc521dbd31a0dc8f4bc13bf787e445f005b17d6036b496c6e19a5f3bacc
+DIST firefox-105.0.2-en-GB.xpi 530696 BLAKE2B 94a7ac14d7f783521dea81b62766b4f3a51b82368c097df055bd277dbbc183e0184f19422adf89247cbdd48acaaf609ae3a50b29a8d9b8ef5601b2929308961b SHA512 fe6dfd391693661a481b6939597276e821cba417eea8ff6243da77bcb823a137f359a54fd633f55a5b72094e8a48f251f3d319e9ca09a0e05263a212293d1bff
+DIST firefox-105.0.2-eo.xpi 554046 BLAKE2B 9f071b86a6d9b1d080d37de736d37eccb034dc2d04a87d6c1f8243dd1729c0a15de017c5373c152a26644f3c9f7c1c86d72f0723be8cb258d801ceb9235a77b3 SHA512 05c48cddd2c9d773561aaf5b331112b58c79e4c9e0ab3823549a5360b618932bed00cea63d7c5486c66c64218aef78318cf5746641557872eab8ac75d0613de2
+DIST firefox-105.0.2-es-AR.xpi 568715 BLAKE2B 48f6219030d8de47ea70e2575c20758e38ab7b568543c166c6e5b263ecb57b6e9fbd749074216f791f65854bcf1c8144bc181cb05b0fd6656d9dbab8573d4901 SHA512 89a4c9bf604b12ac2e8c3838810ea8fdf9b230ac2f19be15939e5ccb8776f2f3f1439be2287341ebe0921ec78a040631ac7ce1bf1c034ba7ed1f730e8968e440
+DIST firefox-105.0.2-es-CL.xpi 567813 BLAKE2B 712cc833ae89c4d95107cd99f75faa387531b867599a2e26973ee5ca1d053ebe1ad4a206f7b8befd9766caddc8ac96e9f68f2a0d2581f3cf2be2c2e3b7e59b75 SHA512 8120371a7346ff95da760e27c250f50c223d5b32fa0e6fce73914e37a47beebae60885b5537cf627a15d4f75e5a777211d8a9bfe27f34c8370e2a21e1c0fc676
+DIST firefox-105.0.2-es-ES.xpi 553328 BLAKE2B be7eb7433d61cd31989ed80974a27424caa31958217b0d35e9bfb9ad711bd1adb670d9dc0ee7aa71bb6f136d74521d7dcf1dce69675be939d7d9171ee74bed4e SHA512 b28cdd4117168a21c705ba8e20373574c422b0d4938396b297f76395792282a920eca98dc2c6b0d9bd1df20f7dd8dae5f67a9e6865c9da2dbcc882fd94e6f3b5
+DIST firefox-105.0.2-es-MX.xpi 571868 BLAKE2B c543064b6d40624e9f57d9ffc80541ff6f2fd1f4d742572c9665a696fb56bcd190a5de3637d1790fa0b25f3ad1759bd3b4be74c444747184c5003902197b6569 SHA512 eb6b65b9e2dc341cddd35aee7b5afd06bea4ee53cb5f8172e103d64ed985d8049c70e9249a8f8c51074d2c727c66d6c159a0435c09899c8ea36c862688e5f724
+DIST firefox-105.0.2-et.xpi 539893 BLAKE2B c28506dae8d9f1efadc99cf8de6f9bbecbb37c4780c1e10d2bd976b5816cc6f7e603c19ff0413e5e47eabdfb343ce884416aea5ddf64426949f929fe35d86e4a SHA512 889a3ea25723267092a1cf7479987ef93b6305947bd2fb7682803e44aaa94365ea6da1f955d560b567ea77166201cfff9e0857ba0a2a891703860d898917fe66
+DIST firefox-105.0.2-eu.xpi 556241 BLAKE2B 6357354b9234585062fa200ba378919cd60a6f84b7382f33e71530c2d688b33e1ac7bd91093d718c04e766178c44099ac78794315c4373d1232aad70898d1e6a SHA512 1a6413a3d4af7fbf174fb245fbf558549db51ed1d51861b86656222c1ec00fea70253720412fd7bd1a30e0fe034d0aa77fe53164022355f8cf0d9db974f60385
+DIST firefox-105.0.2-fa.xpi 571117 BLAKE2B fca76032dc92af5b980e5683c3a6a3bc69a3f1608ffc4e0144e61b19fa3d4e48632f4b5eb7bcb9f4899dd1241fb649f8d195a685ff6b9938a8bac46fbf939151 SHA512 004e0cf5efc9ca14df73529a2449b7ece5ced626288d9424e3913921901c6fd9de617f75fe13330a866fe28c9a47913abbd232fe24bdf6539e6000a14e18540c
+DIST firefox-105.0.2-ff.xpi 481142 BLAKE2B 0382a55580a424337ec6dbd3efdbcea4ff6f98ad98593a3e6df7392e2aab1d06ca2063b5ec1c86f8dda857c50be39af0cf36d605791f32d6c02b326651e32341 SHA512 728f94c6b71498cab1e66f3aef0f561e3d676ebdc1bac5398980397afed21da232ac9c2985ffee079a53a198d5a5dd5f9c8e520f6a3a8b3b70fde14ea07e75b8
+DIST firefox-105.0.2-fi.xpi 552067 BLAKE2B 273af3719257320d79ac206c907bea0b278241d2497f798f9afd8925827b6fecc9462d16b67cb7cb54586322ee7a476419f29cad33b1508a99c26d22d027e755 SHA512 4ff1b20dccd06ea78ac2b8588e88254662d119637edb4b3d176e204a42e6201eb81381e7b53fb4d98c37a19addaba6ae3698dfeaaa6d2a23065af1378fd8956a
+DIST firefox-105.0.2-fr.xpi 580226 BLAKE2B 997438094937024513daa2fcbbc5a7dccb70706e0292ab58630d7fa83668535e099163cf336418e8651407e246837ae919663053108ac8dcbc8749f39fb06b12 SHA512 87cc753dd7d07f791996fcaa13d4a058ffc7db7884b8150630d25e5da4cda5eca5eec0db3a054dca5c9dbf31e802b65c0aeab83492f76f240cfb1f8ee48e6c45
+DIST firefox-105.0.2-fy-NL.xpi 564523 BLAKE2B 9fd34d35c3f9b1b7716cce11aea6902813a4227259b33324150fbb494753d92a35b3f54775aebc2957fafc0b8967ddd68d59509c960758a2cba3e6417c6e5f47 SHA512 b9ab504502de460bb98f96001f96794545c2d565c9b78cbd5e581b51ff7234a4f92e5e1129f953b4ae0c862a45ae0df30a43edfe4ba7e0b2e8ac2bd2bd0d43b4
+DIST firefox-105.0.2-ga-IE.xpi 479298 BLAKE2B ee35cbc6b9f94671afc3223de9e7f070f20b96de787e30535975db1d6eddeebca4a9f8477400d05d4248f2b635cb094992f01d9b8f798eaf57f97150afadfca1 SHA512 922659b1536a28a73ff8047a5cdd2cc3875e2c761cb98acb239f1eabc72aa39647a4f086cfc12af3fe69e46bf9203fce7c12813b99bc72712889c43c373b72c0
+DIST firefox-105.0.2-gd.xpi 552649 BLAKE2B 74e95bcddd8aa7ae80c03d31d3bcc78bf5d2e4a32636c6da7f550ebc2c1fedcd4f209722761f140e66bff3b3eb7f3bf0b0f7b9ce432323e82c97fdca37155d5e SHA512 4c153764aec66677b7d9da70643710bc0553ebfefc2bd5d365afa0267396fe0f34f98bfa08cb118acaa42b36574842720048da88833b9bce594550ad9be7035e
+DIST firefox-105.0.2-gl.xpi 548793 BLAKE2B 135d55e43c2c59357f8b074b32d8b5767973ec9336eed0778990d010ca77a5c99dae77d5f91b331d509905dabb142e5d0ba9475d0fc7368d6522f672d7edbcb9 SHA512 d63d78644218a73e819df2f72eb686b2cf67732db33f6b63b254cba1da1ee8c6a866ff0b58c039854d7dc7287f78461ae1982884826648b81ec828e994458476
+DIST firefox-105.0.2-gn.xpi 579022 BLAKE2B 5db2fdfce8876095a6f3eec8c2d028319a383a46527e6e99cc4f197c32ec137b0e3d6a268e26b9df4ec70cfbd32c865ba15efa907c1cceb41d4df6025111b925 SHA512 5cbac237d4169bd69ca0e436a3cf17ffa7d2119924f37de749ca6dbb26a6238b5af79e3970d9f630e52b9655d3b6914d2a8880ac98c7b0be1779be0397f4b8c3
+DIST firefox-105.0.2-gu-IN.xpi 536346 BLAKE2B d01ee9f850392293e9f8c8b3c58f345b270ee18902ce76fc3a5917a7a1522abc91e7dc64c7169a95ec5e4e8160e228c4006b2b2cfdd29596fe4486eb064f9399 SHA512 adbd5a13cc0c3b88b61fe2e534ac9cdf62eb3d368de75b38c82d877714f3c30d348cb96a12b9af9c43347fd5aaba66dded560365cefdd24d53cdaac402d30158
+DIST firefox-105.0.2-he.xpi 575463 BLAKE2B cf12486a720fc4214b5df159d7ea5d2bdf82ad3d9566e31b298b3aa2ccff286d1b59677ee6bdbce7ed1a2e8ceca575869aee01752211c678e3ea62d9ad429597 SHA512 1b2fdaf49a552f960b625c45647e919c458f25edb3b47215a3a3a1e7ea2fbd50993578bd60244ca40195ca69efd1f0502958afad26f4d5678c8dcd55cb2ce95f
+DIST firefox-105.0.2-hi-IN.xpi 566805 BLAKE2B bfc296aa079b42deca8ab19da62568389263b7755883879c88f026f4ba3badb2a84762708d011f5d7aeb33574d4d80dff6a76b9a946ed01b3b5013a17c75c476 SHA512 39185e597b71e97e2a126fdcdb193152f3c191af86c4f8b73129a0cf2c6146b67084a492bfde5a648d28bf735082e0dbf86be9290c25230a4bb1e1495d71ea82
+DIST firefox-105.0.2-hr.xpi 539465 BLAKE2B 161d395c3c18d89d80ad88f0aa4e6ea43b47bdb6cd7da1dc85f1c200b9ab3ad74770a3adfa15e767f0461452da5a260a67217947f44d8bb7cbe769c3e921bffc SHA512 85e9dd87f45634ce5344b9f4f705251413be8048fd438e341d8311424e81fb03626d4b67df11fd31fe9fdd41a71705d47fe2f358b2a11deea0b8715f5f36ddcf
+DIST firefox-105.0.2-hsb.xpi 583869 BLAKE2B 7e9c3b2b5190f9aadf66486cc6b7ddf9b551309ff9f202bdc419c992d75d0285adf78d669522fa801d814176d6ae7dde95b1e8ee2e0a89cab34c759cc0c85bfe SHA512 2105e5bac07bc11cca7357853abe9d13d37681cb051cd89e34b8c5662168deef74bb63fb36c264ed05af7912770e14f4b0d6bd2c2372cd197d9469594c7b1058
+DIST firefox-105.0.2-hu.xpi 588455 BLAKE2B 31bc6acb3bae6f04331894bbd0bfb7d75cfec5986d49e0754cd6da5fa7be082c3bdc662dd302546c0a79b70342bc6984fb905380bbb95ab9382832bbc14bc021 SHA512 f829abe9d78b76f12e27b36c2f0560156d0d603ed5c21fee94a30013c6201d9d4fd002ec9ae775f48c3549067ebd1f6ffe6d024833e8e8432b69248eac742112
+DIST firefox-105.0.2-hy-AM.xpi 591365 BLAKE2B a03540a5115f6e00d13d809402486b9ec5566c9dfeb0c5a40b67f959dc20b0f2a363b437ff629dc9ddb6022c00c3d5320f05b182ac3e37ca05f37de2b64450f0 SHA512 31e36b5ca62cbd39630a82715b4e7fc9b96b151e4e4c4e84ebcf6fb5e580b3fe02ba5d24bf164abb4b2eab78609a0564486e6b0e9d55783db95a4337d9b61b15
+DIST firefox-105.0.2-ia.xpi 553264 BLAKE2B ab39a8ae95b164e223aa903510f00fa6059306ee6442c4ac894d6de0f50aaa30d4a15d38f16ac06940f705cedad6d3d1c830fe3a6cfe8c3434201458b15c92fd SHA512 a368af9ab1c8bdcdb8df23c16d8072c076af2aae511cc2a84c1f693f232f3305a26b6440f850a12aaa4ee05fe5cc750dd6a0c425b06712070a5e8cd210edb74c
+DIST firefox-105.0.2-id.xpi 550335 BLAKE2B dc8a6307176a2f8f2a6368749e8f9e9a7320d4244434768b85183505a9c8d5163542a453641725586c76bec814ede5a19a88112f996a8fe9be31cd7b4a5ceeff SHA512 fbc9068c66d3e7f16aca2d8e51411f57f1976a95859f2b794c07c74a135f0c85e008ef59b9a4ead8852cbafd8c9189adb6dbbe6fb9ddfc393fab6c659abb9311
+DIST firefox-105.0.2-is.xpi 560812 BLAKE2B 1182c294e5a76da3f13b71f46b11424e8e2dee07ec598051969a30ddbc2abd077dc4d44ef4f4f9cdc524b87335e7e25b3efbad1782b40c42f9246d454da36c81 SHA512 936c3e0e52113544e6f5780cc3ad9026b2a9545bb1cd505f40592efed072d7aa5c66ea1aaefe5cb0e5bacca9c75fa8f77fbfd21bc67384dbbf3fd17141abcbb9
+DIST firefox-105.0.2-it.xpi 471258 BLAKE2B 05cff008ec080bf47918fb0f4dabaf17f3826fd68c6c02fefcb59c867011e62246d5c142e843be4db65bd594bae40e6d29f02e750b390be60e8923e0ba4591a1 SHA512 e41202b8dc98966c4624654d4d748adec28c9374dcec30386b99bf604be2d0fe93b80b18149c224f041f4af8c9e41fe4cf35727a5e7f10420ee44efec9fc7135
+DIST firefox-105.0.2-ja.xpi 593781 BLAKE2B fa2b731ec606d949f3456787c80cd783c5310362f23ef440df46b83def7ac57ea54986283077bc37345c52874edafe147aab6feef11cc314704948e9c8685586 SHA512 77c3e9076b2a24b2bc999fed73338d1c628bb8d3bbdec2165cb9098bb56eb389cdcb3bceb3f3a0cd8b60622ee36d289de9febd008fd64efe21e58030e1ee1f7c
+DIST firefox-105.0.2-ka.xpi 614606 BLAKE2B 5db2ebb8c3330339397b1c4a0029673a4b87b473cac6199c5316659dced0c09fd156a48ab1710bfeac8b627f8c499f5731b71bac4b2b80dc87c8bdba3514c75c SHA512 6a5602c95d56da7eaa968996547e9b08dbc60c43d0e990ae61f652af0c894a20ec7398b9b4e3026aaf2ceb1e3d017e47aeddffac5244ec0f43c51ad4361a9efe
+DIST firefox-105.0.2-kab.xpi 573733 BLAKE2B fc06539af9610e0219c9c76fd558ca348a93ef70e84bb1edb0c0f9d6cb093a633121dc84577b4721d77fce17a4acebcec765c1bd6d1cc5a9b31f4400ae1f6464 SHA512 56ce13fd7acbe8f89004014c27271ea037e20a7f2d7bbaab2ee3acc12e3381ec9e2d1f91f2794c289d337280ef2902446fd577db8d435e543aa62ae16b4bb30b
+DIST firefox-105.0.2-kk.xpi 631204 BLAKE2B 77de41694d8b20d475ff5804bf03faa81cf6e8335fd3e5ad31adc541aa29638c3d3f6e43895afd7961ec32133b2a3deed1bbb5a77eec12399de417e5c53a06d6 SHA512 8433172fd1518933e17f36f146b2aebe6433a786c9d0a5fef2643aa7cb5b2c57108baaf83187860798e21d533dc0677814bbdbbcca8c5ec0662e027d78b788c2
+DIST firefox-105.0.2-km.xpi 540639 BLAKE2B dc637b0f092d4987174c71ff4d4effa805d73f5b40280df5de684081fa4fec4f076468566922fa88cae86fbbfe5cce43597b34f0107ce3f8dfb330a91b19fdf8 SHA512 9d34bc9d55b8af500520618eddf88167bd19684bb2855d6b21b2d95268eb9c84dfd6e725f1d999c288fc0ef200834fa37b90df241bcde013ab4fd6b83193aca8
+DIST firefox-105.0.2-kn.xpi 506463 BLAKE2B d738431c8d3b6bfbfe90106130c35033e3eb24513e2ac82088495240e855d5350a907aad0bebb407574e9f25c34cdc767f2f5e160cae9a50188acd5739563c92 SHA512 0c073a6a36655415030357e1a524253228edc79958c8f667cb97c9e0e2724e6d320160b5bd5b077e91661dd7b4e7aa6ebe70693f247c545078fedef82a67aa1d
+DIST firefox-105.0.2-ko.xpi 600527 BLAKE2B 2c4b4484986851912c4cfbe016e2b080af2f2e571b1d3e105ae3861b8ae145b3de78d9d1dce2ab47b8595a65005c3ed37533f8c78c3c61bf4e735b1b024deeb4 SHA512 64641a3cd47d4ea247f98649ea37655c8121267be4ce86037a1d5b2d0a8a8227a11497d2375a41f0ad7b651a38b696721bbd8a5074a933a938e0a889a3dd502a
+DIST firefox-105.0.2-lij.xpi 479004 BLAKE2B 5ebd246289cc6a3a3678d631e512eb87c9b6e1d3d32f57c57c06067aac810bfa57a719546ae68918d9a328a38ed7db16e4808e982eda410c603ac03ce7cca17e SHA512 e8eff656624960054785f1f41316cd033e3cdf611519c7faa89787159c21998e1b0a4c02103fc7b3ea2b67f37e94abf222819d7603c200dd6d508bf0bcb9fb3b
+DIST firefox-105.0.2-lt.xpi 570062 BLAKE2B 92ab598525aef040e1306ea1cf1cf87d9570b59af8150126415068633f380724e7aca9f280c12d9f5e7107c64afaffc0b65925eb4ed1f66f2b0decf645a13905 SHA512 f02380bb025843dd5699902d6ddd22e38051a9fe5909d9dd04c9d32ef1a4aa380404c031d88db3689a197b28a3f647a9a5d8bafec3034a21fcfcef226e0cef05
+DIST firefox-105.0.2-lv.xpi 472208 BLAKE2B 8727f396c7e64de6d66e7677972ac7142557bfa3c4dba53d1ecc4c902ab9572968a8108f4f96e1b99862290e5c3d3cbbad54f83b37613684702ca1ebc888bdc6 SHA512 4a6cdf9945ff7e00d0abeaac8df1e484498d6e9da2e489828f75959890688c497972ac2a466cab487a32a7782033a70a3568f5ea1ed6b52659872542f14fbf30
+DIST firefox-105.0.2-mk.xpi 490866 BLAKE2B 1a3259166faadf2996e60b7911981541c6dcd7eb6b2c74932fbcbb02ecdadd97a15215cf8a3276edf5fc400b60f2bca1d4e6ed056519b6f621112998a1586bfd SHA512 7dd9b7fb92111e36cd9ee913fbaa85a8e8ea795e22b9867bd0ae465c2e2e3171516909266fc645c6d23c968a069237c19683f158b4475e6c41fc3363eb81abea
+DIST firefox-105.0.2-mr.xpi 539894 BLAKE2B cec13d18f7f9f159058f824a60347f017a95dfb8610b1d0fe06c29e06d3fc065511288c4418add83d06d730cc70338caed72068cf0ba3c7ef248dc91da261b1f SHA512 3cdd72a08cfc9dab83319cbcff0bee1d5e23a568dfd62a3ed2822114ed07005d66e3f6db2df73892243159c589e26272231d13cb47ad194afb4578430596bce4
+DIST firefox-105.0.2-ms.xpi 457120 BLAKE2B 0c22455c08f6206b4217464379a64658f14286300b600027c9991cb2c04f2448f45be2547959b4d6dd32ec73b96b7d10badb288d4c7992ab3b06e7768f79d4dc SHA512 4162c44076a79251b63bae7a747561bf9721edde8a5434b988b98d34df724591f945010b03eb016d393cb5060309a0ef75cc875bd77ed5e60a858c23a452b31a
+DIST firefox-105.0.2-my.xpi 520844 BLAKE2B 7b999dc1294e0573ee41386f4ec1a04f19572950085c342850b544939063682e2adbba6152dc80e0baac85a962373f9209b95006ccea845c4ec06a9a2cdb5ccc SHA512 e0eb4c0c406cb17ebe92dbc1670bc65dbe2e357e95dbd3ff664f99bab7cc000d7adeca95dd9fbc0adf3e0cdadf190c030d0d4d25ae36198e03f973f9a4177c8a
+DIST firefox-105.0.2-nb-NO.xpi 549443 BLAKE2B 9f956621045003c573e2caa5c74fe017b59eb1665456bb950d449a07f20c53ad2bb1e05e02f47280114f3bba36001bdc305ca196f6f19800b83e44d4d08eba2b SHA512 9d79a8f27df35757f41d8ab5db1de6b787606d9f845bb88599cd9078448f08158e51f5d10d6ab4713e0ca4b3fb292335056211fb546b5ad2d914ef2e907a839a
+DIST firefox-105.0.2-ne-NP.xpi 498120 BLAKE2B a16bce2197c3808f16d2f36a49429dcc75006eed6ff528a6c0cf9ff57ad4193e54706f18ce78f489fa5c4631bf06c96798fd0daea5aa13afe3563a2dde8e6a5d SHA512 8a06dc72092c6dc09edb29b9d188668615e2e34368321936af44bd38f58bb21c498a8176e2f56d6c102dfd7663398a6bcc4b21b12cd23a8efdb8d0a512965085
+DIST firefox-105.0.2-nl.xpi 558682 BLAKE2B 25a6ad19d04bc652384b12eb70677ab8a7cc65d6268958466eae9d2f62bfe7e2c4a482de4c0968e35a752d3ded0dcd855e1e1867713f5e39928c15e72fa5c8c1 SHA512 0e2a606d4ca500d4b70e3f629b17b51f2fc7fef58a986a3515320b41e0479578d632924fdbd5b0af6a72f56e02ac4c4b6ec97f21363f48aaa0140656409f8c15
+DIST firefox-105.0.2-nn-NO.xpi 549960 BLAKE2B d4d83daa43a715e79c4a29e0a9b0c72667392ef2461c5996a4a1237d4ee2158dba6cb2853e977b5bf54c179c06c05884360f31625317c709f1e92b61ccee3746 SHA512 ca5721d397699573ccabbd27cedc011777abf1720e5e798d8946a96bc18949f23a1307271bc9948b26093fa855cce1b0a9af67be0dfc2e74bb2c0d49bf8966eb
+DIST firefox-105.0.2-oc.xpi 569604 BLAKE2B 753263c3baf420a020eecef985a1d07f001077993cc2df29c1b7e935d7e13fccab041d6c7930beb44c6b26e430cdb1403ab1cf3e1977eb8b226067e34444d920 SHA512 6a8cdc4c0e72e0db6cdad8a0e23501aa8a3f7a3845dab0c37f9b107c856ba8a9d48454cbacbc3a135ee65360d1da6a7adb8d1476b8c141e45a8344c3708a64a3
+DIST firefox-105.0.2-pa-IN.xpi 621212 BLAKE2B bfadf1e8ab2df2be22f84fb7c8a901e104a032f22868908414323ce2a9be65de873be362e0e48b6f057f3d4d6dc56bfa325be8024fd584fe3cd60aecd7b4dfe9 SHA512 107853f670afa0acc5e8968f210b9d9a85e93da23030e05959ba413cf8579bfb924f3b5692d54d23bb94693e212b84b4d22c4f4560d24c3855d4e8c244c333dd
+DIST firefox-105.0.2-pl.xpi 579337 BLAKE2B 9f694fb64a8037060211f669bd2b4865e12988e86b70965f49f9f8cd87d808a1dfc5d3a6bf7f22846da67e3c2c6f57cd9f8b051bd22df2bdb05dc40561117272 SHA512 0f79f8dad4ae55ced8e426136a27358254a5155f96ad6e74a1f3ac410180f3fab44b691ad9f3e90e446ece375c90b27fbe8df0dbc7b3dfd86e95c168c87fcbb3
+DIST firefox-105.0.2-pt-BR.xpi 563724 BLAKE2B 6108ad4774905ed8e1978d4af9b19c5420032b9ca7619cbc5d129afbd91d17ab6ccc429a77e3fc83cd8e58649e5223f8e06c411cfebad0e683747f2db465d98f SHA512 5d5e1834b394c1f27ce9acb0858aa114c9fbb97f9bc49d91b65e0d49d733b5233f7f01d30f4baab6adb62c9142cfdd96f8fe29e7c555c9fb60d18775131684b8
+DIST firefox-105.0.2-pt-PT.xpi 563885 BLAKE2B 522266f206108090f0c5775a241d05ef52ff47bc866f75addef0dfe67c06d170874ec687541573a13d018578d1f27d04e40a6f3468819d37747bd35f7571915b SHA512 5157855e5d111a693f1b904de840d1d9be7982389492888b1a95d1c78f5e4c1a08923d2a84333e3e1428d52dbfa7bd3096fe4045ceb6480a14eb2d7dbfc0d435
+DIST firefox-105.0.2-rm.xpi 547530 BLAKE2B 41eb8198de05b03ac4bd46bf9f6f4f15b33f947fa6c166ed61ca874f5d5049f6b757b63824ed4ef78cf281c708a6d885c2eea2fbecc25451ff0a0ff6cd24d6ea SHA512 716900f7c6dd71729558923d8c8922201e3daacb557fe5013fefc2222693ec2b4b7b1dd94c5dc600b97f09da32d5d6c3a01b7cd9c1027a406e7785e3c8f6586c
+DIST firefox-105.0.2-ro.xpi 537771 BLAKE2B 4c4b399d81d0bf477206416767564ddd2ccb91cfbd266c9d23cb7bc781a4cafffa7ba86da3c7036cc64faf349afbc9c50676eb2797c8fee320b55f746a4ab4fb SHA512 f6475731eb5ac23fea200f357a917fc705dd6bb53795e1b5d9511396f478ccb947a50f024447670d40b8f76d45fb8e64811cd08668e86b36583899199758fdce
+DIST firefox-105.0.2-ru.xpi 651176 BLAKE2B d23b863128d69f50b44955613c15604fc76c99f782501296455d7084b1a7c1ce4b29903652d48745e364d760bb23ba89070da078ed64d649d8809c5451f091fd SHA512 df80b532a180e6174664fd3920180f6fd4dec999e67115054b46c34bd7a5feacd30d038fdca9c5251a11ec2c69addf1152ac39472178cfea07f2e324d92df77b
+DIST firefox-105.0.2-sco.xpi 505200 BLAKE2B fcbad87d322d5dfb0a08efb297b6e9eff29e6bb11feb1cffa29c825d0a57f06d6a6b3ea8c06c617b72e76543d0779bee550bfaf900ff8427b8f1140250323097 SHA512 0f3a4fc9f6eaaf98303f79e404dac201ff26bb9d131fb3747242fef3ec0e27173e669b00a06b9a26c452d544009404768426c7c40bb84d16060995205d0d124d
+DIST firefox-105.0.2-si.xpi 573141 BLAKE2B def1a9fee03d08b66f3bb2e1efb3ac15204ed8665b9c1f74019f2f416ba1d7921476be868c18fcb94b90e04ddb553543137f39d708819385fd7c8d2129582a81 SHA512 217dc40d788645d07f602f6909bfc3b4b6501161fb4a032da4ab19fba980d6fa680c6946833fceaca417f4b97de330b8bf73f38b9fd561cbc784aaa7b3185d55
+DIST firefox-105.0.2-sk.xpi 588220 BLAKE2B 649bc547f8e0f76c54a851f4f9097d25f6076f16a3cd9f3b356af503a58fa6061c395dc7800ba8598e9a70ddb362a64120c4b0582b9006963032ca75396f36ed SHA512 eafcd8fea9a51480177be4ae7c3d2622eff0c0642dc6d0d08e5c9406525d286dc0d430bade1877e2cb4a429b497fe3bebc1524fee770e15335751a7af4869419
+DIST firefox-105.0.2-sl.xpi 561133 BLAKE2B 6f182a93f64f273fc251514c0cf8868513fbea4b519a51760e5eaeea0a1d224646087261e8115b20ee18fd800cdb1b5abc1e4d6cc27e6ce02e957b5283cecf0e SHA512 e2fd7db4e37ba1fec406b554b8730d53ff36dfa4136efaef942fa05afc7b125f3bf98c0478fb6591f1dfed7a10bab4b9bf2d4710673e7c29f9274fbb91d70b57
+DIST firefox-105.0.2-son.xpi 433323 BLAKE2B 423c15959c5b00bf743f6c9569d0059faac22066524cae248dcc49ff3192fd607ce5ca3258028cda10edb2c5222d759b08fc999451f16b0c1c6b0292fd378bbf SHA512 d65d8bdd5cfa5135ce376e5c7f4f788d60250f13889dbdab6843afdc4ed30106ee055a904c8ffab3d77a48b9a56334772ca08d735979c9e04ed754d2de50ab82
+DIST firefox-105.0.2-sq.xpi 565442 BLAKE2B fdb1df972ffc71a77fb9f180bd2c4660012a3c7963c7db9bc06ebdb9b3296e2a0d1e431653074866f7e2ac171d892d25f1285210eb1e522ff71bf04acd5ed6e0 SHA512 8653eac8102c7b43da6fd30b7458a6036019de9d97a5f6fda4b0372b27f1d5a33f2887ef8f5d659948f108464421d6217c02e88d8cfebb0e079a510010e0cfe7
+DIST firefox-105.0.2-sr.xpi 604657 BLAKE2B 9abf459951edd1f2d1a698215b63ec0f868d8bafa237a82ab433313a80e9220405fbf84863ae26cea1bf83e0eaac70a355e5710f2cb7b720f9c6545e86ba62e1 SHA512 894daf0c67f31d8f5668ffa7c977b80ca772d15698cbd2e2f6834c9ec23033d8143f4b1731ea4b448af0b510110539973f97b1275bfbab0b2bc1980d1b847ca2
+DIST firefox-105.0.2-sv-SE.xpi 560629 BLAKE2B f760e5db8f846aaccea52e8ba4b6afe4c23232e0199d11a7eb5c81180d06cc57a399f911089f788ea82c4424cede03f8785c65e13e539c5a94bad4752d932f71 SHA512 3325452ea4220f0a39f7da7564371da4093d375cccb51b668ef80af2b094b6e656cf350c0703e35afaeb4e314924c689c38de8826641c592d8580d5e7337247b
+DIST firefox-105.0.2-ta.xpi 519016 BLAKE2B 2a259071d0d6a77f6fb1856e2dfad5c06c9afdca1b5af52e9f922c69127e5767ba753497ec6a943086f91735c2837139c368e0168338a688eccd3c84fc8d35af SHA512 b83e641dcd43ad819ff592f47e98117ef489b20e4d2d47b655e9ec2f4525001f2e56fd138c2e744aa3ac872b9f87956414c63fe38d2956d75c1900a799cb9bfb
+DIST firefox-105.0.2-te.xpi 560557 BLAKE2B 334813703d71c92753165f3a6ff07269721f6d50d32afd691655a82dc95f2afabbf8b69983c4e34c105b24d13d5df38ba1ff119fb6df3996b7c98afd00dd80aa SHA512 bc8adb85c9f65cd9eea265d37bf323c1b80917dca252e6d522b33a7edfb49244869a093c62726f0f74e52562361edcc558a585d99fa2af0baa7c6b6da9606853
+DIST firefox-105.0.2-th.xpi 621832 BLAKE2B aa70347ecf893f0cdfffb9ac0e61f04efaf346f4f04f3b7c2a5f862ab00344631f1763c9393d04574433549d0b605b0874a95c1b175a44fcd9db13eb935059d5 SHA512 efdcc907cc964cd5dec9c5556535f565340b35e952483358d6e24be091a942a93dc848c7d632b2dd0fecd473df64a9316285fed6492bd771319d73d1f5d798e1
+DIST firefox-105.0.2-tl.xpi 528007 BLAKE2B 7af70e5c8d1867c90331f5aff1c9aa7fcf95a1f39cd2379b4cb17bf30c9cfe6e60d8ce4368410cb532c6fd3cc1e21e74cdfc181f491dea35006bd17808980013 SHA512 d2d62fa4a327ccd3502b80fbde00f9d4c8644db114c2950901380e0083af6e4452ab9464a615133f0f8467cf16615d24b42efbe442748414b6ee808b3f4630d7
+DIST firefox-105.0.2-tr.xpi 574329 BLAKE2B a3a62faa581a789340d2ad212c4bf803e5ca14d2b6be4865cb0d12bbde07882a98500c34a62a2c55edd75268a4f67d896c593115aef2f72a8034e29a854dd14a SHA512 e5f6421ce6e3da7b870c8cb1884dfa7bab71bacc707ba167dfcc7e558fdf6ac2c31e550067c0ffa7ec51a30f03b0f5bfc00d9ed1b1a81bb46ba06695c6ec7583
+DIST firefox-105.0.2-trs.xpi 498814 BLAKE2B ad77f52bf2ba9dca857b173726551c518ab14c7ada704ffbee4183a0b88ba87869be2eb6ae80f947a906f664f2ae4ea74f9060aa95547db1d14b0a7cae633357 SHA512 92f0f9ab1f2698bd9136119814a34153b131a2bbc5b358f18fd61205a1445b7fa945b24400a147bd2d6a2e27c23590dfcc1ecc7fd0eb7013f1f967d78f0170c8
+DIST firefox-105.0.2-uk.xpi 644340 BLAKE2B d7e9ef6b3de37799a2c432c9ba8d0e9c1aa00c12190823f7d33b7ad9580a85777b8aafb97eb0d31e590cd68737433d55188ce0068e63c6ebc22da08ef6225508 SHA512 77a246ea5d9735dcf485c19802ef4dcda67ed92da2a86cbd0fd7b10d49ffa96738458c019d1bdb7800ddee61f18f2a0d075e649894b879c085e9da0a66ce72f3
+DIST firefox-105.0.2-ur.xpi 566539 BLAKE2B bab7cd6dfe93afbc868e7d917fc981e5a6a075b28608640919e132c59c78ab5326e3715a754f060fd3723a477e5ba346db7ccadd20ae30421d95f3326d06c3f2 SHA512 950b4a90a382e48522e9b9ef90841e13a148d1fa1be510032010f7d9a55a818a4b6758958413a8d6aba36d8cbb3e3c3ea6abf89f05451438930550fe51cd99c7
+DIST firefox-105.0.2-uz.xpi 486870 BLAKE2B e3d241fc034cf2da5ac4cdd4152064a8ad9a353c7db528c32cd87ab0fdc02ddb310581911ae7cdc71d5898fafc4878c6a661b5fa69e3a060bc7888c4fe4d0f82 SHA512 bd5c01ca9564ef53fedbb1f1407c415c4f1220c2bef5dc6de4e647ae0ec45a60cedfc97eebfb8b036719553fd59da1c501032255d6ef07339bef442b559aff96
+DIST firefox-105.0.2-vi.xpi 595145 BLAKE2B 1768fd7fc806be488ecf1ec4f71522bf9def3294369f79261d1a76d248bb1680c9333345000602b2a93ae22c68fc8523f751426b4f4e7c523a5b3cc141694f98 SHA512 a217641e3ebbc6b5e42c8932c16e8ad4364b75bed5b46caf1d0d4579faa2eef40e03854616b018b311d9fd2fa251a5bdc107ebf87629dc1faf38d037a7b2f1d6
+DIST firefox-105.0.2-xh.xpi 435744 BLAKE2B 525f5a7ba427a5ae4323cfc71968f24598b1ad06a4a28b2bcafa457bd7f8a51a6a7e8f361e5d253a13a20e4989ff0e57e3a54acbca159506476963adc9041caa SHA512 dc3057114fca4b5a34c22f463aa5d0f149c4d560a8d896e8efcf5aede896792220239d76dc96815481046c98113ccf2717da9e1743da3a34647153e4308d06db
+DIST firefox-105.0.2-zh-CN.xpi 596364 BLAKE2B 9528ab694ce2070e977440bf4dc542774a1bfdef68612bde73a667799fdfb3c05031f6722ea397cc1cb1eccd2ce7ab4f23bbb6b06b5534f5372a291309f1b626 SHA512 43d867cfe07e90bb86647e2a8d66ca8d07e87dddabd3ce045c13d3512b346e16fb3f1f7c7bc2df37b257009d977fbc4bbaf4e7f3dd3919f529095cff02084c9c
+DIST firefox-105.0.2-zh-TW.xpi 597430 BLAKE2B 57b1e25bcecd1b917348bcecfdfc247497c914ca2ee06531531bd34191bf9d588216ce9689926b8c1d4cd770d554ff066a2239d8d170d8fda90bb669d57b1bc7 SHA512 468570b38d2b4f637b22cd0c7f7010d7675e4859bf84d6cf5c00b6e548a91dcc55f49442bf6f9afa2ca4d9f35fdd1319b7feb6aecd56a1c5067726434149aa03
 DIST firefox-bin_i686-102.3.0.tar.bz2 80503830 BLAKE2B 0b1cccdb9a63a8dea59edc0c5a1bb36c8af4829ddb968a769d9caf230cc908292a7648a4672a81a649057a891b3ce9dbcb2e01fc5a0ca90952da822ad00887f5 SHA512 9741bfee4abf2dc7b251cbe35cc63a701d974b741ef42ee134ca16133690316081489c161b5762037d1f762baecfe4427474927c2d95f9b1e35a1e3e0d86df03
-DIST firefox-bin_i686-105.0.1.tar.bz2 81446465 BLAKE2B 654d33b352a4e86ef2f8169a93c9856b14b52e20f96d011a7c2ca9ca87d33dc4cf47fa8524200cf3b6979c5062f44594905b2ed0f6aa7c1fdf6f83123da81f76 SHA512 41bb2a04ef3ddd9810a385c79871cd31a8ab21d61ac4629b70c7b213d063c5b3bd8220b77310d8e2fef13d76a8c1ca75764a4cf0dcb50d287542b6cbb13f71bf
+DIST firefox-bin_i686-105.0.2.tar.bz2 81678432 BLAKE2B 648f7d388ea597724c49033d8372e635d02212d3e96cd0a165016e25e8daae3a90f303f7c75f7c372b8744f5446e5be9cb0d73f4c588b82e2cee1b4d1dca741b SHA512 d5c1d59332d483cbc01368891ed24a57fdb879214e135aaf7aa0f6e1735dbc1f2aa5e740a59e625134934a29b9b66aaa49e22f659809ef880b8103a11692c5a7
 DIST firefox-bin_x86_64-102.3.0.tar.bz2 77273704 BLAKE2B 21342cfb3ced5bcbb66a86485d90ed83a639d7ca7b56126a16823f6a413133debdab7df4baa4bb8778ba8e226198c3a650d05800a86bdb96159b48c54186f604 SHA512 a0af5f7bc50341bc2ef6d90c325932f4cd4d2f2e909065f203cd47f6568aeca9f1b656935186b30b8c0c58a3eeab74ec42ab74b01fd84b8e4536100c50a865a6
-DIST firefox-bin_x86_64-105.0.1.tar.bz2 78045123 BLAKE2B be064c4d9766f7cd9af2d5f115dc5478856f216730be639b5ac6b8c6038dff24e3e447d9f2570b2eb985e9bb1144cd14a4ff55f8d512670e8ecf08e3262c67be SHA512 2f6e284adf5338425474d699647e831fce60f4bc5b516dc903d13b1a6961bcb7ba9318feba86933d3427af0227c05099f2733111b73730735caa45f9d427277a
+DIST firefox-bin_x86_64-105.0.2.tar.bz2 78114214 BLAKE2B 665318fdba1a24a297f97e1522551f506b7fc8db5a95c9ae4833542e1c9c18e115db245ad1840a0faa54046f1f9f7c04f99d06b24254f28a3ef0e1de78a07765 SHA512 415c070f5381c0b7a2179efdc3ebcbb25b6ba965b433597e43388a25e91544e8d36cc87e34e3d77b70f6a0851ef302d7a10b0587689493dd55609bc32b257c9f
 EBUILD firefox-bin-102.3.0.ebuild 10832 BLAKE2B 2783cf41b02d072b13107a09b6fe1a335a5b4be16256557fc68f91707d9262ea0306dcd3d8ced68b5e71b8e516d32fd23247335d33a6b3e2ddc07c8bb45dd442 SHA512 d90fb56680941033b1b399a8946eae56281549cf506096b908ca0ea637dc3040561ebeaecc0f984346cb3ca79064f1175a55a7b179813c19cf77c1f5b4e087bf
-EBUILD firefox-bin-105.0.1.ebuild 10872 BLAKE2B 1395ccce1367e57d8e417103265dfe5d33f8b7b68b8a486b41b9cd9b8f744b95fac5937b086d175593fbc1c8d49a16b07b4256b19771dc2a9ffd9ed64aff6c9d SHA512 800e6a6a9a5f1ee6f4d9bae92b13f35ea4c1788dc65e1fe26aa61c29350dbff8edc1a7707f685a1ddb1c8016e9954641e64e3e10d7ae220c57cf271659a996a6
+EBUILD firefox-bin-105.0.2.ebuild 10615 BLAKE2B f602b7d85b70171b9e555decedd2da1068c1ae809571a6579d0ced8342cd3ad1d301075d7a9e4b2f61887ec2e19639379259d9d7c8167f3379e0315a05640063 SHA512 ada88275ba21bb4ce8c2fb118f085a58e010ed61d394556bbafeaffcb7c04004ba2838a33f865940e25b1122d5f752bc5ab747703b161204d2d4b00c17069601
 MISC metadata.xml 520 BLAKE2B 4b540dd2d9ac3840061de8a73117f2859db156944826d22c1f74cbc0c35f6d305aa10ff45708eab016df725cfc741c99dec46f0078a29162982431892e86e477 SHA512 0c7183e35a4b0ca2ddd092786ebdeb5b41a431adf918f0c2e541a5ef1c235066586a46a50fa29c25e5a522930824f8662fa2fa7eed8c3895f74d85bef93cecb4
diff --git a/www-client/firefox-bin/firefox-bin-105.0.1.ebuild b/www-client/firefox-bin/firefox-bin-105.0.2.ebuild
index 83f8bd1fe2e2..c4bcab437463 100644
--- a/www-client/firefox-bin/firefox-bin-105.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-105.0.2.ebuild
@@ -319,14 +319,6 @@ pkg_postinst() {
 		elog
 	fi
 
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
 	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
 
 	local show_doh_information show_normandy_information show_shortcut_information
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index 21884d9a9691..c6e27bc8d08b 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_105.0.1343.53-1_amd64.deb 134058304 BLAKE2B c8ed5af20796b714e4c5f53b0feb2b94abc3082d835fc34d85175752df67ebfb552373f75d2a2e44eed56c97771caa987993508f4e5ae01c284e9245a572e500 SHA512 7f77e0b1ec398d94a320f07aa29108b9be1e6aeb431c4b49c3e8b4dc7353820a0ea8363e4fd50a7b2de488b491b62b2c15d56ad036c19dcdc62b982963d47bab
-EBUILD microsoft-edge-105.0.1343.53.ebuild 2506 BLAKE2B eddd93a2a53ea870664ba12bd06ee4afa2695a28a87a49729daaf3da7318d82d3eac433bbc596006149d61f5e80198e2ad880d37e1d86b3c1fd2a0381687bb83 SHA512 087b90eb957080f73c8f2e66491f685d8bb5cc5610053fc87008506ebe350e75cb8050b3337a1db5ec86503ade114ee462995095c5c1d344c0e3ed9573b299c2
+DIST microsoft-edge-stable_106.0.1370.34-1_amd64.deb 136032948 BLAKE2B 3b0e6ceb7b518296c1dfca676f15aa8c8c163f41ef1d71853261fcd8ce49e7ac2f2fdae8057d98a635a55b92020aa0dc8c324beb4f47ed171519c3a6863ea813 SHA512 100dd0445e3b9c813c81bebf0f8a6e49b8e7b35393c485cf86a7392b534ceec70b4b4f5a0e049384a65574f7225fbfcf49e027a800d36298cc0d0a85ce9e4103
+EBUILD microsoft-edge-106.0.1370.34.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-105.0.1343.53.ebuild b/www-client/microsoft-edge/microsoft-edge-106.0.1370.34.ebuild
index 20a0a2b5bb94..3db12034b572 100644
--- a/www-client/microsoft-edge/microsoft-edge-105.0.1343.53.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-106.0.1370.34.ebuild
@@ -87,7 +87,7 @@ src_install() {
 	cd "${ED}" || die
 	unpacker
 
-	rm -f _gpgorigin || die
+	rm _gpgorigin || die
 
 	rm -r etc usr/share/menu || die
 	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index f279c52aa49a..8cd17c5e8172 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
 DIST vivaldi-snapshot_5.5.2805.21-1_amd64.deb 101019340 BLAKE2B 8b1d8e22fa504f20d74b8bc50deca198073e48379cfec8a882e2d00cd3f68bb8d816555e2d29edde6b715463998090178960f4af1c81f6ceae1021bb1cf6d545 SHA512 c6bd047fa2c940f9756dc89a3393696acca30ecd913e04ded36d24c534873417e122668441f7edc6843f58d05d32eac5009bc14f25b8abe03e40abdeebd4176f
 DIST vivaldi-snapshot_5.5.2805.21-1_arm64.deb 90957776 BLAKE2B 26165e16022932a451499acdc7c38d1250ad923ac35e50fed56df39f7fa9d8b2ef3ce4fe9bb7f5923d4b00cb7b564a7c0a534b9279a0fee619b4f6f481d22506 SHA512 eb80b86d4ccdf920f303fe5dcef95b46836e2c74cb1af160239c0662d23262d95d30f1a4c359711f81674476fc6a51d092482103a52f1f1f1897019d0f696f09
 DIST vivaldi-snapshot_5.5.2805.21-1_armhf.deb 90264704 BLAKE2B a507b99587d97fb101823dd2dede4e7c29ee8b77393cc6346008363da0eacd1755d6fab45e01d17528ef81e02cd4a3b1918e409cc272294bb550dbb5ef822e65 SHA512 b574f20e4527c7cc08bed2edbe9971f664100c5c045504fb25ec529980f9d148d38aa85daec8d7915510bde779173ecb9fe113e811433d6c166b1be38884f1b3
-DIST vivaldi-snapshot_5.5.2805.3-1_amd64.deb 101015264 BLAKE2B 1ed8a856222bf89c90b44176ee30462f975e80e2eb3e11e2373ac3b738f282597ee64acfe6d18093114ea02916e5ab53c35289776acf38fbfc3572894f2bf54b SHA512 3f3941cabecf324b7af512462c7d2fe115c90236887eb1f06843494d635d0e9d635eae0e5da00e80e85b457c1de0a776ef61a7ab26693be9c1956021f5d74421
-DIST vivaldi-snapshot_5.5.2805.3-1_arm64.deb 90942580 BLAKE2B 40364b3cc5fd7a6cd4f7ce5f11406606735f34811ff7edaf2a39804343d09ef9ac65934677ca076912a71f6795a83bc78221ffd0df30f4241fc736f696a75686 SHA512 9a3eee2eb7029548d21b2d0e6eb6f54874023cbf3c3e8a701aae4c41003dd949dbd6ec8cf600e78f9636bbd17aeebe32b60b2503e76b21ffaf7f4b4af4e9ea81
-DIST vivaldi-snapshot_5.5.2805.3-1_armhf.deb 90265272 BLAKE2B 36dec1016237205a34268ba1a5a77359d147510de5dbfb43119db67f2e24c60636bf5c0d65029dee23363448155818f350a98e778bb0d86c990a03c209151750 SHA512 da2af51abc332cb8b04117ce5e2463cb1e642413caf348fb27eed8bd5a977bf4e99400bad9bbaf522fbbc53bc50c1f9e027be67a8efe57bb8c29916d874fb1d8
+DIST vivaldi-snapshot_5.5.2805.26-1_amd64.deb 100998880 BLAKE2B 3620422abe96a36a8943659008a068d844455986c5775a67d4138f47540569f85b7fc0c0474b30a6b73477e3b2f494e845167d439ad95f64640b3898c4b37209 SHA512 a78b303a813af3564521dd334e587009701bea5f79165e553487b8aa384da321b543e65bd21d04c667f7dc1009d4b09ce0c87a67519172f60233025210cb0129
+DIST vivaldi-snapshot_5.5.2805.26-1_arm64.deb 90940052 BLAKE2B 89dc6743ba17246f85763372ddec755792fb9e5a711131c0a85d74889f761f64a23612272edfab4b9085ee76719afdbcb5dd6a7aec4fda910e5ab90fdb89fd73 SHA512 457be6137031db063c74c2e52b83929c1f68e2f325b94f5497d108e2255c4d1eae0e622f9303ef35394edc9954667809f65e1b8cd4e1bc520928273a3455700a
+DIST vivaldi-snapshot_5.5.2805.26-1_armhf.deb 90266572 BLAKE2B fd11978f6e431e72b4a5d7c76e3b88814da7cb2f9e106c6fb89ba4a00e40d6ff7e564a47b093c82baba8ebe903ca1033e57223ab2cffa2814cc33ee8c3b874eb SHA512 1d97e1b7a3dd680b3f141cca8a13092285f96f4ea7c01a41344f624397d0f8ffe2f60e26ab4f9676aec394433f8a32fe1c69dc189cf7a52aa831e5f3d13546d8
 EBUILD vivaldi-snapshot-5.5.2805.21.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
-EBUILD vivaldi-snapshot-5.5.2805.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+EBUILD vivaldi-snapshot-5.5.2805.26.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2805.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2805.26.ebuild
index cc815568ad94..cc815568ad94 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2805.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2805.26.ebuild
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 332065845acc..518eba4c29fc 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7b873f0b7cb5..0da219324a60 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -54,7 +54,7 @@ DIST open-gpu-kernel-modules-515.49.19.tar.gz 7417963 BLAKE2B 3dd1ce0f5577641369
 EBUILD nvidia-drivers-390.154.ebuild 17210 BLAKE2B a56978e6c439f386f010c04d32f3839cca1e8edcc970816921946e4ad3bdae122225f79c8c9dede83d9047281c2e9cebdab683b56f3b7208bb83c3263000fa48 SHA512 5089926b850d24ced3cec405f27c9e28231f29baee28eda381cd4b68a03896d9ee9a982357d3c0dbfcb697b5ecdab96d2b93e79341c67efe97d61d5ba026f4df
 EBUILD nvidia-drivers-470.141.03.ebuild 17858 BLAKE2B 4f266a76ebf82a71d56464b6875ed00daa311897459aa38de4d7d21ac2618bb91bb839b82ab63e7d944fbe727474a64e314cc8e5e5fcd809b3df78bc164c0d4a SHA512 6de157e4c403e80531ca8224c6081e455748b9c098aaa77a5406f05a9bcbac5db425251f00b601525e89e63a238ccabfe380d98e0a61728e052e9b8e73eaadd7
 EBUILD nvidia-drivers-510.85.02.ebuild 18188 BLAKE2B 8c762789fe8b562302a8a17a949183e8818b3e2ff6d4996384efbf4720d30bfe678526f14458def17ada748e241231e33324f38689ae72a248558f814a2feec0 SHA512 bde9c4e958394f80967b683d89a5c9d14f678bd905400b355fa2fc6ceb33c9278d2094cc2f37a83989123fb413af423f08fef86c6da3eadcad9225b35abb683c
-EBUILD nvidia-drivers-515.49.19.ebuild 19971 BLAKE2B 342ff77aefd7ca27c7ac37559c3fb7b281e1bb89fb6018148dd0b968d589741f54ec1a72ada76bd8118374175b0c69e688f66b132074b5f08f3b5dfa969c0774 SHA512 e6856335db260d3331139479a9b923c2719eccf5321c09dc3673ee2960c1a8a1e207b009282e424a324649979e1b1bda326eb5d748eb0b0964347e9513ecaf23
-EBUILD nvidia-drivers-515.65.01.ebuild 20217 BLAKE2B fff81b0371aa121fa63c3d8a3b2a7ae1200e9e9262671395236bfe427917bf81147912c1d85c87aaf77874537984232e70046da75f6db6e5db51e20bc55f236e SHA512 6e7b2b338eb8dba4a6b53fe6a9626cf9428de36233baf4d16d364978d8a7d384a4aa8b50eeea949deb1aa2e826b2bff71bf4e2960a27d8c04ffe112a8254e14c
-EBUILD nvidia-drivers-515.76.ebuild 19972 BLAKE2B 4c073171e8a066a27c4ce76b9695ba57a2f2cbaac36467c9d499ab3fbbfae61b05b0ace0333efd09ac63e14dd9041c13b684a55b861e0b9ae0567e540cd91581 SHA512 a1ee9076465a77c798c35f792cd8bff42d598001b2fcecfbafad4fde46e3c8130794e239f72f43deeec27a79cf8d40f4e35bb910e8abc295532f5695e3de04a5
+EBUILD nvidia-drivers-515.49.19.ebuild 19970 BLAKE2B 304cb9c8c25b0ea5bc4ffd8a16fe7c19917d26ece0d65487a98462df0d209527ffbedef17528231747f76f79fa16dfc00c3679461269690d9edc10986e680a0d SHA512 8789894af7ec7ce12d84f92a47beaa66a6953abdfda8a5d5ce1fb1b7cc51669f085f323fdd474fb53b92f16e7db896f76b89359b049118bbb4b7c390f48f245d
+EBUILD nvidia-drivers-515.65.01.ebuild 20216 BLAKE2B 0796e463a6522a8663e8f2a42c99fdbe3f12612f782c6b92530c8d186f839867d0971c0cd3bd5d78992d1b9f2a48e5864e164c8bcd12cb5d38d0ba5af0272df6 SHA512 325065f777d323c9543ae896a53725d2d929794e869affa4d1dc3ab045f8a0c8b24f54acdc7ac653584aa9592427c57df4a8a167afae5ab2562b9738fe5b940a
+EBUILD nvidia-drivers-515.76.ebuild 19971 BLAKE2B e30963729946416285019185b40ad34f986bc22360d3456ff76e36c54a8789e473b73ab202438e0c9483d16fa519cbf5e589242a51a7be9baa55df24a912aa67 SHA512 fe09ff116690d30465d65650f63127855414e4372142358e2be90a364e56ea72142126caaf0230360f9207e2e0ed70d68bbfb6d9990946bd7eaf14615de82031
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
index 5ef30011b5e6..799f3fc68a02 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
 	systemd toolchain-funcs unpacker user-info
 
-NV_KERNEL_MAX="5.19"
+NV_KERNEL_MAX="6.0"
 NV_PIN="515.65.01"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
index aa6b3fb34e9c..2cc2949182ef 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
 	systemd toolchain-funcs unpacker user-info
 
-NV_KERNEL_MAX="5.19"
+NV_KERNEL_MAX="6.0"
 NV_URI="https://download.nvidia.com/XFree86/"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild
index f8cf86775680..fe76e7f59697 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
 	systemd toolchain-funcs unpacker user-info
 
-NV_KERNEL_MAX="5.19"
+NV_KERNEL_MAX="6.0"
 NV_URI="https://download.nvidia.com/XFree86/"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ba3929bb1422..011bfd14e404 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index a276813212bd..eda426185c3d 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,3 +1,6 @@
+AUX libast-0.8-fix-implicit-func-decls.patch 300 BLAKE2B adea9472e364e890fea8a9a41d8677d4e3b0309e969e46f0a87c0e7797d032a3d6ce212340075010fd7c74a6f8ae48bae29c502516221fc14a2228d7be291130 SHA512 1a57db8cb30184dca9415c11f4570722e3ff2b54ae9cdf650553fe89696751f78cb320aa794bb02bfff5879cc6d6501903dbe837ef5391d52b9f57daddf63870
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
+DIST libast-0.8.tar.gz 254188 BLAKE2B 02fc2872218f11cb4083d451377fdc46369c2ef7d1f0e547831dfdf4ecec2cd6aaf3453e9e8ef8431fbd5e3cd75e828e3c5967a6311853e7e87f583ef2be72c8 SHA512 266a479fdbfc479e233675fa7623488135c633fed9cb236ec0cee578fc5be83b88a2dbda8a304ee3a27384c96e93a4bdf40f60597660e09841380e0930dd93d9
 EBUILD libast-0.7-r2.ebuild 874 BLAKE2B 67bd80db9c435a627497c57ba87ba5da08a675a8ee6d18911c69f215e0dad6af9535dfe91897d72ef9b254d163f59f9a22bbe39e1c2bb99d113a18d16e642d98 SHA512 3929b2100fc1149d860519b34eb42a36e05e9d5146d2b3ef2acb1173eb3265895526f7764699b4c02d21c1b20c627d506b475e5dc55be84d2c853248e9148c78
-MISC metadata.xml 737 BLAKE2B 9a8079635cfdf17d60cc75a0c8a28b61f5779a7bb8a3fdc5ef591df8caa670ca34f732e5ce601f11843e152d058c6a9e223cb30ea82e244c0ccd3adfb7d5d446 SHA512 630ec4769e0ee029af062b2087b0b288c89d49fef359e6b891614f5901087e115338dcd65be0eef51681f02a3b1c2b2504c79925c10bfc04e3d168f804502592
+EBUILD libast-0.8.ebuild 955 BLAKE2B 22dcbb6a97548918de58b473778042374cae59167c81a189c37b408a6e5ccb598edc3596939a2fd9ee664112094309538259f183d7aef04ac5e47eaac071d70f SHA512 30f84dbc64d8e9f187efa4e8c800e81de73ca694db761913b03af87b53dba2adc655aacb7b60f4b319b8ebf9d56354e60bd6e5083dfc511cef20734e8f87dbf3
+MISC metadata.xml 823 BLAKE2B 2b89b024a4867ac7dacd136f1aa57523f7d74947c8d93ce92231c9b0f58e73f2dbdc67bc82c40a9dacdab4722f37bdf002f766ff194f94b8c2245cee1cdf61f4 SHA512 ce3a1ed303a48743b3f419415a7ed1b0947865127ca75fc23f3e2155c21d7d9e63a7df782f69655d144c86631bcb26af910d5cba079ae6d0a71135061940dee6
diff --git a/x11-libs/libast/files/libast-0.8-fix-implicit-func-decls.patch b/x11-libs/libast/files/libast-0.8-fix-implicit-func-decls.patch
new file mode 100644
index 000000000000..34e55f7d43aa
--- /dev/null
+++ b/x11-libs/libast/files/libast-0.8-fix-implicit-func-decls.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/871705
+--- a/src/snprintf.c
++++ b/src/snprintf.c
+@@ -2,6 +2,11 @@
+ # include <config.h>
+ #endif
+ 
++#include <ctype.h>
++#include <stddef.h>
++#include <string.h>
++#include <stdio.h>
++
+ #include <errno.h>
+ #if defined(HAVE_STDARG_H) && (HAVE_STDARG_H != 0)
+ # include <stdarg.h>
diff --git a/x11-libs/libast/libast-0.8.ebuild b/x11-libs/libast/libast-0.8.ebuild
new file mode 100644
index 000000000000..396c0cb77b4d
--- /dev/null
+++ b/x11-libs/libast/libast-0.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="LIBrary of Assorted Spiffy Things"
+HOMEPAGE="http://www.eterm.org/download/"
+SRC_URI="https://github.com/mej/libast/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="imlib cpu_flags_x86_mmx pcre"
+
+RDEPEND="
+	!sci-astronomy/ast
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	media-libs/freetype
+	imlib? ( media-libs/imlib2 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with imlib) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		--with-regexp=$(usex pcre pcre posix)
+}
+
+src_install() {
+	default
+
+	dodoc DESIGN
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libast/metadata.xml b/x11-libs/libast/metadata.xml
index 5b5095039f39..542463f59189 100644
--- a/x11-libs/libast/metadata.xml
+++ b/x11-libs/libast/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-LibAST is the Library of Assorted Spiffy Things.  It contains many
-spiffy things, and it is a library.  Thus, the ever-so-creative name.
-LibAST has been previously known as libmej, the Eterm helper library
-which nobody really understood and certainly never used.  My current
-plan is to gradually remove some of the neat stuff from Eterm that
-could be made generic (things like the theme parsing engine, the
-command-line options parser, perhaps the event engine, ...) and place
-it here in the hopes that others will find them useful.
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription>
+	LibAST is the Library of Assorted Spiffy Things.  It contains many
+	spiffy things, and it is a library.  Thus, the ever-so-creative name.
+	LibAST has been previously known as libmej, the Eterm helper library
+	which nobody really understood and certainly never used.  My current
+	plan is to gradually remove some of the neat stuff from Eterm that
+	could be made generic (things like the theme parsing engine, the
+	command-line options parser, perhaps the event engine, ...) and place
+	it here in the hopes that others will find them useful.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mej/libast</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 0ea2e2d9a8c5..aa096138a987 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index ba2dc9a4ad01..a2c51a0513fc 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,4 +1,4 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
 EBUILD mlterm-3.9.2.ebuild 2980 BLAKE2B be6236f65bcb739ff477476586aa34eba1eebda0a7541cb53dab64f5115c0fe9bc86f079bb89a3ddb2cbd8f083c7940ae8d96df65478ef7c7bdd735a6b41b157 SHA512 ce2232186b250af4f1b1be0a30623a45efa2ecf95995dc5db68e3996ec53ecf816588e852e8fd2c5cd92a425ddff040b027e2d500d0cabf264ec57f21d516d9b
-MISC metadata.xml 1173 BLAKE2B 25a60316724dfd2c4738d7dd94a39e72888a373ba74c43c7e7c13abc1f492e58a04c9f537074567784e5bed66b5daf704813e23c1a22104cea636fa0a15bbbe4 SHA512 17b693aa9a6f0e6e4c8a6e025d1137164536cdbc2142faf6ce50edce139644463882340dd47c262d804e6087e0a6223c8185120483648edec8064738a204982e
+MISC metadata.xml 1228 BLAKE2B 600f0a03fd1aea37dbfc7d3fffdd79ec278b06c84970901ae0e4a134c2c7cc0402d01b4eb645e2f0a94e61324d7817af37f9abb2245dde812c2fe32b919f9c8e SHA512 0312bdacecfa2e168a0382dfe2575054941a77bb6d624f47d978802bf12659cda58b730c7315dbd87da8b372d22195d98e59379f59370a2a2f1f3da837bbff78
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 85677ce3c7d9..d37c8487f82b 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -20,5 +20,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mlterm</remote-id>
+		<remote-id type="github">arakiken/mlterm</remote-id>
 	</upstream>
 </pkgmetadata>