gentoo auto-resync : 27:10:2022 - 21:58:13

author: V3n3RiX <venerix@koprulu.sector> 2022-10-27 21:58:13 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-27 21:58:13 +0100
commit: 62082029157d2ef97a43e34ce34a55877afa8a58 (patch)
tree: 7ae84333ee590b9c0a99459888f508b3727849fe
parent: 3cafd803b6d89f6e823358a8d7f4a97e6d0629e1 (diff)
126 files changed, 679 insertions, 986 deletions
diff --git a/Manifest b/Manifest
index da908e9b18cf..0065180c2805 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29663 BLAKE2B 2ba5a30a84fe820fc49b6b9abb8198f27920afdfdb62ef17a83b32c4a6e8a43413800741ea5f20b24bdc13067e9df0da1fdd1754caa2093561d9900339e69e2d SHA512 3abffc8b547b964cb9b5d9583d3f0f259714f08be994fb55910f0214033ada2952b04d9ac949d72550234a694cfb6ec16d529722b5324cdc0238fc04fc906f62
-TIMESTAMP 2022-10-27T14:09:52Z
+MANIFEST Manifest.files.gz 29666 BLAKE2B fa3baa5d74062e0ab1adc20fb049214ab8735f1e3196967fce76a80283dd7f2060b87b06831586d5d33ef4602ea303bbda02958130478b512871ee1863d1223e SHA512 8e540e229ec313c08370075bb111fe3bb226a610566c962b75782383f3c9924c0c50befd99c13d08c9b65b30322bc1acb0ef92e5ef0a856540f3f675e34ab0dc
+TIMESTAMP 2022-10-27T20:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNakTBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNa5ZNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCA8BAAszkO5IjcnXeRiSb2j5ItgGUJTsJw1GGrrpAFjiTF/X5OYOdA5F6FIAAx
-SYEgqU2PRSv/SbQnIPDVWdWC7LmsBYvARIb+USk8+HODkIy6g/gerncfhL2j0XgY
-f47+hWiCIECkKtoJrRJRt/kVwyLs2/bMD9GCccLFTU7u0NtfdUo161HvDBILHu4V
-xG8nM0tCJWKMvs57G0W8vZLHe02Mb2rFv976yvje0jj8DXHswZhL4EvnvXwM+sBi
-9ucri/KRUO4ZShRJCpFsOHMYudnJD9EWlZRNIm/ExP/arQN6C/wn9GEzx04ffuzz
-0kg56mTwPcy3iCJbiW3IdXeNH2T8RolcyXsoN4fr8nmxPLMeV8x4x9wVXEoQegu7
-k18EqePm0OYowcwGtFwsp3/ngEgVRdGkJqbfzcdtKqydLcJmF7T831mVFZ1SBIPr
-8+aER/RFGz9hLhh4SbIvMX5EWN9nxcnqzNO0auyMsodqO1POO0bS/lW1hojfhehE
-NCsrhuveMKw76/1Ww6OU2HK4LSyfB+hs4mqiBJZG0EDGWzebr5SDdLL8Z9s75lzB
-7nfMEwmzqugIW5cJIm7/JCw2Svx4r5IB1IMBXMNxAxL9WUPPuCclxsnRfZ9RG60Z
-twgQckzVChvM9Z5nU2Zb5NntbbN48CHpyc9gmsMcqlYM1nwBFMo=
-=D+G2
+klDGvg//U/1O+PzdpEwQi26O6HMveykKYXiJsbGEEDIZCyw/l5L2Zostt+WElASn
+nSROO2TL8HA5dyeq2Rqak8QrNbBEBg5IoFpBfMgyRl2FEn2g1NrBYlY+XmoIWY5p
+nCOmuaHvHRSD3+A65rl0366A8ccOP2dR4+CwNu5g2I7m0Dz+5aze1O16amVIgjMb
+SqRYxOxpnNc8pZHN072fy9iWiWg5OHvpJ3pSK9Bo05gvoDFDosX44+UElvDPxO7X
+yjiMBi3RrZaS2cijVsmnYSS2cvPoaxZBuu0bmB2063hIXUH51BblIbYFoh0QEwq4
+rl3RqmoyQwxYcRP5f9CF9hVTDjeOzW6uJgUi+GiBCk/rku0mdv8FxbGkzdjQCVMD
+1tCzl/27FSlPtjnX095In3WWtHh3ZPlP1JlMoK1KFE8Pzt3YevfZcm26DYgh/bZi
+Ehl8w85iaZBYnIzeu9WOftB78ofbK65Mc1lGx9v/Fvvf4/8gvc9Olgk0peqtZ5ub
+2dxgshOpkJ8kBkRAewLfNxXbEO6U5nEH+IVtqBRvZcx7T1DjnqfFHdiXlZG26PXK
++XKTHKskJHX+BZQVaycHALPNN8gYJ+y9p5bm8vIVYlHWKRJdd8MDK63bDib9pu3O
+dpEyHMHYkZr+0cKZLO2c9piYm102gZlR1MxQeJr83yMebqyBSoU=
+=OzAh
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 80d0b2dcf107..8e19f814d384 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7216c81b5851..94748ea10a88 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 098092fcb7f4..a44190018497 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,4 @@
-DIST diskimage-builder-3.24.0.tar.gz 511917 BLAKE2B 4db5132d449c932202ede7a4d9e9f5711b667c39f3dad51dcd68ec81f49a71bafc4bfb09de363a5d16cac89942385a0b43b1adb31424581ccf0c903c0df5f80e SHA512 1e98e8c8886f2d046ccb2b02a647e294ba2d8bd691168678ef81ddab889f8945bae3c46e5e26ad03e0b2311c367bf3dd5d4bd2f07baab6e2002433ca1dfe0f74
 DIST diskimage-builder-3.25.0.tar.gz 512950 BLAKE2B 3a0c5658df5bc2498d4656b77c152dba9bedbbc342b53b20b88e89327cbb98e9c8e5dd8de97cc0b7b0bd31f01cd4d425e8e2f158bde24746b08a460db4ac79da SHA512 e602a9e8e3a8cef1c3cc62fcb3074183a4028c70f2b9e9c27416b6244773eb7cf2aa33a5bf38dca5f10dcfbee5d80eaffa9287e14beccb065cec3ddaf7a76ff7
-EBUILD diskimage-builder-3.24.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
 EBUILD diskimage-builder-3.25.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
 EBUILD diskimage-builder-9999.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild
deleted file mode 100644
index cfd2e2377172..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder"
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest
index 88bdef15f713..b6da3b825afc 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -1,7 +1,12 @@
-DIST vkd3d-proton-2.6-dxil-spirv.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
-DIST vkd3d-proton-2.6-spirv-headers.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
-DIST vkd3d-proton-2.6-vulkan-headers.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c
 DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1
-EBUILD vkd3d-proton-2.6.ebuild 6222 BLAKE2B 35304d00a22a7259ae44a727e89c173d88fe2d65103d86989c198206dba136947c16e8cd8d5097bfa65b4fb5b8a07bb5910b0fd87100a7db7654e145e3b555d0 SHA512 71bb81e8a9b270d5ec50d20896fce52a12c913cf7759e8598e33ba585533f9dac7472fcdec98d38e2f3368c951adabd538555f374a0e46bba7fb8a1dc211f338
-EBUILD vkd3d-proton-9999.ebuild 6222 BLAKE2B 35304d00a22a7259ae44a727e89c173d88fe2d65103d86989c198206dba136947c16e8cd8d5097bfa65b4fb5b8a07bb5910b0fd87100a7db7654e145e3b555d0 SHA512 71bb81e8a9b270d5ec50d20896fce52a12c913cf7759e8598e33ba585533f9dac7472fcdec98d38e2f3368c951adabd538555f374a0e46bba7fb8a1dc211f338
+DIST vkd3d-proton-2.7.tar.gz 1403317 BLAKE2B 4ae975537ac1f39d38155b106aed3fa5542925f0980c23ad2fa8f1f9cf168b104311d14b7ba68a539fd92ab131cc878d8822ff23b551ca6ba9b3b86ac580f927 SHA512 a8d055dc7bc1ecdd7edcb5dafe304804cd516623f6771b786778a2ef6a0e7ebc4ba6ce53897b2ee830eb6dc39da16805c638f1db56444385febedd13276aed18
+DIST vkd3d-proton-dxil-spirv-2166bc7ea0.tar.gz 688874 BLAKE2B 746dc8232ca0130f2b693ab7b9d3d93a4c514eacc473fa5d6fa91580e9daac48e9a51e63e93d3907f95c980e922ad3599190740dc280ef2ba1c96a4aea975416 SHA512 0a3308a10d3afc636e55c44fc4f2f3d067b5b828a6a93f3832698faf9a6ee26d53d25ad7eb0cbd6074b29395d073422434d63dd55004ce64e0aaf73334e4f5cc
+DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
+DIST vkd3d-proton-spirv-headers-87d5b782be.tar.gz 439180 BLAKE2B 9c64a1b7aa408172bb57b38ca0e3d31221c7dfecfcd9afc77449c14e76f60f7436f1a54a794bf4959f4575f177e1024621c6ff696f7fb19b545877e0a527031c SHA512 d6ce02e53c259e508d1d72d81cc6aa6b3019e7ecd6a8878d81d8681d9734756f66c762ebd4b8b1d0f9fbb7a8f1f18d72aeb27c56822d810aca5a3e53c51c1ef6
+DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c
+DIST vkd3d-proton-vulkan-headers-5177b119bb.tar.gz 1588963 BLAKE2B 3e973c9fc1fd8c8f725fbe8dbd67ca451aa7ffbb202d2395f3b26bbad9cb4e9e39514c7c78825be7ca122ccd5b434adb0b3fcce25cb7fff7c831dcc5909bbdc3 SHA512 3848e5b14f73dda60f133d396742a9a2aa2fc3914b8cbd8bde90e392437398321865ade63e81ec99a83af20a42424cf2c6d06e4dda0d7323486d59fbc4504a3b
+DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
+EBUILD vkd3d-proton-2.6.ebuild 6291 BLAKE2B 7cf336b17aa5f9f410ec9ecb3e1bb75fe54c87a4ebf78688da74d4274d8ab4a11625ccd8149b2eac85b8935425509cab95addc189d3f15750cd074b548f4e49f SHA512 ee2b4edb8bd1709401ae573bf7f4ace777a1c17b825da2584835b374057ae340213f6d471366bd209a390c5844d5501737708b3dc96d43f67a29c84be8861853
+EBUILD vkd3d-proton-2.7.ebuild 6622 BLAKE2B 3c4d1bfb7595d16c966dd5f3623b15a4b5a31b232af2e73c3d3d5da940c5142b42a065a514d84529e9015d28431a00d0d6c6a09d27d7665808e4e271ec1e2606 SHA512 f55c81899328714f0f5ad39463f3bb25190d21e79be241c94d360c7e0d5e919a424b2612a64c65e66b15ead943a88b508259ce293dcea9b633151380dcb61acc
+EBUILD vkd3d-proton-9999.ebuild 6724 BLAKE2B 77df1c27de16102d9a30a2ec5130012975c34405aba99c2b9801dfe14fa92ff69115ee3fa8ea4025bb36c4e74d027c35e10dd80de67863c6ec767aeba5379b02 SHA512 3c5743b7416ddfb24b1986f87ffef140147b06c860d9fbb9ab57456e21b10838b654dc023f37c2454ec1afd4479e137a3816d6cc1f171c86f01a94630c426d8c
 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
index 3f1242ee79f8..28c3a4f0432a 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
@@ -17,15 +17,15 @@ if [[ ${PV} == 9999 ]]; then
 		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
 	)
 else
-	VKD3D_HASH=3e5aab6fb3e18f81a71b339be4cb5cdf55140980 # match tag on bumps
-	DXIL_HASH=b537bbb91bccdbc695cb7e5211d608f8d1c205bd
-	SPIRV_HASH=ae217c17809fadb232ec94b29304b4afcd417bb4
-	VULKAN_HASH=83e1a9ed8ce289cebb1c02c8167d663dc1befb24
+	HASH_VKD3D=3e5aab6fb3e18f81a71b339be4cb5cdf55140980 # match tag on bumps
+	HASH_DXIL=b537bbb91bccdbc695cb7e5211d608f8d1c205bd
+	HASH_SPIRV=ae217c17809fadb232ec94b29304b4afcd417bb4
+	HASH_VULKAN=83e1a9ed8ce289cebb1c02c8167d663dc1befb24
 	SRC_URI="
 		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/HansKristian-Work/dxil-spirv/archive/${DXIL_HASH}.tar.gz -> ${P}-dxil-spirv.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HASH}.tar.gz -> ${P}-vulkan-headers.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HASH}.tar.gz -> ${P}-spirv-headers.tar.gz"
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -51,11 +51,11 @@ pkg_pretend() {
 				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
 				use abi_x86_32 && use abi_x86_64 &&
 					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is set but ${tool} was not found"
+				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
 			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
 				eerror "${PN} requires GCC to be built with --enable-threads=posix"
 				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
+				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
 			fi
 		done
 		tool=-w64-mingw32-widl
@@ -72,9 +72,9 @@ pkg_pretend() {
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die
-		mv ../dxil-spirv-${DXIL_HASH} subprojects/dxil-spirv || die
-		mv ../SPIRV-Headers-${SPIRV_HASH} subprojects/SPIRV-Headers || die
-		mv ../Vulkan-Headers-${VULKAN_HASH} subprojects/Vulkan-Headers || die
+		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
 		ln -s ../../../SPIRV-Headers/include \
 			subprojects/dxil-spirv/third_party/spirv-headers || die
 	fi
@@ -85,8 +85,8 @@ src_prepare() {
 
 	if [[ ${PV} != 9999 ]]; then
 		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
-		sed -i "s/@VCS_TAG@/${VKD3D_HASH::15}/" vkd3d_build.h.in || die
-		sed -i "s/@VCS_TAG@/${VKD3D_HASH::7}/" vkd3d_version.h.in || die
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
 	fi
 }
 
@@ -160,7 +160,7 @@ pkg_postinst() {
 	# don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning
 	local wine
 	for wine in app-emulation/wine-{vanilla,staging}; do
-		has_version ${wine} && ! has_version ${wine}[vulkan] &&
+		has_version ${wine} && ! has_version "${wine}[vulkan]" &&
 			ewarn "${wine} was not built with USE=vulkan, ${PN} will not be usable with it"
 	done
 }
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild
new file mode 100644
index 000000000000..05601ba66fda
--- /dev/null
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild
@@ -0,0 +1,171 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit flag-o-matic meson-multilib toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git"
+	EGIT_SUBMODULES=(
+		# uses hacks / recent features and easily breaks, keep bundled headers
+		# (also cross-compiled and -I/usr/include is troublesome)
+		subprojects/{SPIRV,Vulkan}-Headers
+		subprojects/dxil-spirv
+		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
+	)
+else
+	HASH_VKD3D=4df366172e025c23621c8df5a794de90de165d97 # match tag on bumps
+	HASH_DXIL=2166bc7ea0ceb2d7ff6d787d9b007f7eb7d4aaa8
+	HASH_SPIRV=ae217c17809fadb232ec94b29304b4afcd417bb4
+	HASH_SPIRV_DXIL=87d5b782bec60822aa878941e6b13c0a9a954c9b
+	HASH_VULKAN=5177b119bbdf463b7b909855a83230253c2d8b68
+	SRC_URI="
+		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
+HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/"
+
+LICENSE="LGPL-2.1+ Apache-2.0 MIT"
+SLOT="0"
+IUSE="+abi_x86_32 crossdev-mingw debug extras"
+
+BDEPEND="
+	dev-util/glslang
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local tool=-w64-mingw32-g++
+		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+			if ! type -P ${tool} >/dev/null; then
+				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
+				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
+				use abi_x86_32 && use abi_x86_64 &&
+					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
+				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
+			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
+				eerror "${PN} requires GCC to be built with --enable-threads=posix"
+				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
+				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
+			fi
+		done
+		tool=-w64-mingw32-widl
+		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+			if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then
+				eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either"
+				eerror "building crossdev mingw64-runtime with USE=tools or installing wine."
+				die "USE=crossdev-mingw is set but neither widl nor ${tool} were found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die
+		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
+
+		# dxil and vkd3d's spirv headers currently mismatch and incompatible
+		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
+		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
+			subprojects/dxil-spirv/third_party/spirv-headers || die
+	fi
+
+	default
+
+	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die
+
+	if [[ ${PV} != 9999 ]]; then
+		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
+	fi
+}
+
+src_configure() {
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	if [[ ${CHOST} != *-mingw* ]]; then
+		if [[ ! -v MINGW_BYPASS ]]; then
+			unset AR CC CXX RC STRIP WIDL
+			filter-flags '-fstack-clash-protection' #758914
+			filter-flags '-fstack-protector*' #870136
+			filter-flags '-fuse-ld=*'
+		fi
+
+		CHOST_amd64=x86_64-w64-mingw32
+		CHOST_x86=i686-w64-mingw32
+		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
+
+		# preferring meson eclass' cross file over upstream's but, unlike
+		# dxvk, we lose static options in the process (from build-win*.txt)
+		append-ldflags -static -static-libgcc -static-libstdc++
+
+		strip-unsupported-flags
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
+	# unset again so meson eclass will set ${CHOST}-gcc + others
+	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL
+
+	# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if
+	# possible, but eclasses don't handle that so setup machine files
+	local widl=$(tc-getPROG WIDL widl)
+	use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32"
+	printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die
+
+	local emesonargs=(
+		--prefix="${EPREFIX}"/usr/lib/${PN}
+		--{bin,lib}dir=x${ABI: -2}
+		--{cross,native}-file="${T}"/widl.${ABI}.ini
+		$(meson_use {,enable_}extras)
+		$(meson_use debug enable_trace)
+		$(usev !debug --strip) # portage won't strip .dll, so allow it here
+		-Denable_tests=false # needs wine/vulkan and is intended for manual use
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	dobin setup_vkd3d_proton.sh
+	einstalldocs
+
+	# unnecesasry files, see package-release.sh
+	rm "${ED}"/usr/lib/${PN}/x*/libvkd3d-proton-utils-3.dll || die
+	find "${ED}" -type f -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To enable ${PN} on a wine prefix, you can run the following command:"
+		elog
+		elog "	WINEPREFIX=/path/to/prefix setup_vkd3d_proton.sh install --symlink"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
+	fi
+
+	# don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning
+	local wine
+	for wine in app-emulation/wine-{vanilla,staging}; do
+		has_version ${wine} && ! has_version "${wine}[vulkan]" &&
+			ewarn "${wine} was not built with USE=vulkan, ${PN} will not be usable with it"
+	done
+}
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index 3f1242ee79f8..c03df3dfc0ee 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -17,15 +17,17 @@ if [[ ${PV} == 9999 ]]; then
 		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
 	)
 else
-	VKD3D_HASH=3e5aab6fb3e18f81a71b339be4cb5cdf55140980 # match tag on bumps
-	DXIL_HASH=b537bbb91bccdbc695cb7e5211d608f8d1c205bd
-	SPIRV_HASH=ae217c17809fadb232ec94b29304b4afcd417bb4
-	VULKAN_HASH=83e1a9ed8ce289cebb1c02c8167d663dc1befb24
+	HASH_VKD3D=4df366172e025c23621c8df5a794de90de165d97 # match tag on bumps
+	HASH_DXIL=2166bc7ea0ceb2d7ff6d787d9b007f7eb7d4aaa8
+	HASH_SPIRV=ae217c17809fadb232ec94b29304b4afcd417bb4
+	HASH_SPIRV_DXIL=87d5b782bec60822aa878941e6b13c0a9a954c9b
+	HASH_VULKAN=5177b119bbdf463b7b909855a83230253c2d8b68
 	SRC_URI="
 		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/HansKristian-Work/dxil-spirv/archive/${DXIL_HASH}.tar.gz -> ${P}-dxil-spirv.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HASH}.tar.gz -> ${P}-vulkan-headers.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HASH}.tar.gz -> ${P}-spirv-headers.tar.gz"
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -51,11 +53,11 @@ pkg_pretend() {
 				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
 				use abi_x86_32 && use abi_x86_64 &&
 					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is set but ${tool} was not found"
+				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
 			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
 				eerror "${PN} requires GCC to be built with --enable-threads=posix"
 				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
+				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
 			fi
 		done
 		tool=-w64-mingw32-widl
@@ -72,11 +74,16 @@ pkg_pretend() {
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die
-		mv ../dxil-spirv-${DXIL_HASH} subprojects/dxil-spirv || die
-		mv ../SPIRV-Headers-${SPIRV_HASH} subprojects/SPIRV-Headers || die
-		mv ../Vulkan-Headers-${VULKAN_HASH} subprojects/Vulkan-Headers || die
-		ln -s ../../../SPIRV-Headers/include \
+		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
+
+		# dxil and vkd3d's spirv headers currently mismatch and incompatible
+		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
+		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
 			subprojects/dxil-spirv/third_party/spirv-headers || die
+#		ln -s ../../../SPIRV-Headers/include \
+#			subprojects/dxil-spirv/third_party/spirv-headers || die
 	fi
 
 	default
@@ -85,8 +92,8 @@ src_prepare() {
 
 	if [[ ${PV} != 9999 ]]; then
 		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
-		sed -i "s/@VCS_TAG@/${VKD3D_HASH::15}/" vkd3d_build.h.in || die
-		sed -i "s/@VCS_TAG@/${VKD3D_HASH::7}/" vkd3d_version.h.in || die
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
 	fi
 }
 
@@ -160,7 +167,7 @@ pkg_postinst() {
 	# don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning
 	local wine
 	for wine in app-emulation/wine-{vanilla,staging}; do
-		has_version ${wine} && ! has_version ${wine}[vulkan] &&
+		has_version ${wine} && ! has_version "${wine}[vulkan]" &&
 			ewarn "${wine} was not built with USE=vulkan, ${PN} will not be usable with it"
 	done
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0fc2d5442243..7b80d5f4c52c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 9e1d16cf93f1..67d890b848a0 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,5 +1,5 @@
 AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-core-1.2.11-r1.ebuild 3486 BLAKE2B 1e3e93c9ff5023e4655e84c0938ed48506fb8034183640baeed41dd3f706cdbef30808aaa86eeb6ce9a9f84e59552a621a26a837edd2e6391fd61bf780c140d3 SHA512 d840f923583e522e1456a1d58fdab3814a3403c79f76118e83ffc94dfb19695a9b9ea6a298a667e9c879d8783f040701cdb0f467952c9a8debcf3836e8d00f35
+EBUILD logback-core-1.2.11-r1.ebuild 3484 BLAKE2B 70c1f1dffb64becdbd358f31f62d7b06043eab4a026c75dc321ad5940602ee18ba824d78f35656a0ad204c36afa78f0aac1aa7a9d75ae44e0956a06e2a8b5e78 SHA512 d60bd3576fb3978facf4e5eed7d98e85f9beccb551c97e095e1c93040b31fbafbffb2bf09e7c02af39d97160513caf5f9f12e440bae3f7f6041b7e702b8eaa6a
 EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
index f214fcd20181..a1ee6e640a7e 100644
--- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index cb894b7df570..13bf2dde667e 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1,5 +1,3 @@
 DIST msv-2022.7.tar.gz 2594951 BLAKE2B fce006f4b845efcd930b7999ac00eaab06c404888eb73a6eeab6cfad616b4922271d2d682abc82f3be4c4f6a791aa14681f6e6bfebd2118ac3aa2bcba41fd1f8 SHA512 315342628f79c561883be0d966211dd81daae66a414dcc9bb5a87d86f97121d38b5835e9a6d1ac7c21ccff46040e53d3cabd32e9ea677c9ca4335a86c5259949
-DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
-EBUILD msv-20130601.ebuild 1417 BLAKE2B 31e1f539d89c0c831d68bf983c7ea8fc7073969742dfba4c25275a3b18e9f879e0878f375daf18f663ff4ce030fa6efcca6d54be6e786aafaeb651d76e19711a SHA512 46a52e0e6769fd968f94143635282f7f5b758cae3ba6ccb38180f4bd954f4ad48c6cc3c27b013a76003d757ee942658dc60263edd64ef7c26fee98cfd275c676
 EBUILD msv-2022.7.ebuild 2114 BLAKE2B 9198d86583eb780ec4d5f3bb7a6d30ee7950242829fa5e57c731c7e7698b6862c2a1508aa0b10256871e139bd11b17dd6c9a1c16e05268b2b6095c531f059a97 SHA512 877248bf5626fd8f3fef6986b7cf091360f776fd94ab27d57972d875d08780cfcb7b4e7f0ebfd32a751266458e387ddaab23433312fa8bb9b275df09affdc744
 MISC metadata.xml 487 BLAKE2B e36790ebf85cccdda4aa092426060129c94c9b01032199e37811ea2b9debeb70013db2e6d34b132d9e9ef6ca14f5a03c3e1b66993ceba5620b68072787329aaa SHA512 8cef0d9e71f5e992dd4a33e020fbd4661d026d0230f7c9f99438c6f0fd6e431a20179842ba94527823264c166476d9cf64c9d7abb92b14316a65ee6a4efbfbfe
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
deleted file mode 100644
index a3e3eb88b963..000000000000
--- a/dev-java/msv/msv-20130601.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV:4:2}.${PV:6}"
-MY_PV="${PV:0:4}.${MY_PV//0}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.java.dev.msv:msv-core:2013.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
-HOMEPAGE="https://msv.java.net/"
-SRC_URI="https://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
-
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/iso-relax:0
-	dev-java/relaxng-datatype:0
-	dev-java/xml-commons-resolver:0
-	dev-java/xsdlib:0"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	dev-java/xerces:2
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-JAVAC_ARGS="-XDignore.symbol.file"
-JAVA_SRC_DIR="."
-JAVA_RESOURCE_DIRS="res"
-
-src_prepare() {
-	default
-	mkdir "res" || die
-	cp -r "com" "res" || die
-
-	# The only resources to have are '*.properties'
-	find res -type f ! -name '*.properties' -exec rm -rf {} + || die
-
-	sed -e '/resolver.tools.CatalogResolver/s/com.sun.org.apache.xml.internal/org.apache.xml/' \
-		-i com/sun/msv/driver/textui/Driver.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-dependency xerces-2
-	java-pkg_dolauncher "${PN}" --main com.sun.msv.driver.textui.Driver
-}
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 7ae296145c3e..5035b146df20 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,4 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
+DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa
 EBUILD qdox-1.12.1-r3.ebuild 2172 BLAKE2B e7394846ea89da75fab13d32256319a3ef57638002e82caf3ff2c79043f3a02df8534f126b36ab077d883aa216364285e1346baa54a4c4ba60e064d40cac9095 SHA512 03c0d7f9e4571ac4cca4d6b69b12666f73144a42605e98d497ca3545b4d1012233df2979bd8662049b1be49e49dc93a5d84b7b383901ee49a52830d2c88674e0
-MISC metadata.xml 490 BLAKE2B 0074cd0a7da6af8028ff8bc8eba4b26f86d4ae5ea55da7a6fe0bfbcc73e779a9a6deeed0e82f95abc28324dcd1a89634b504d02265dea16ac26e576b6f29ace8 SHA512 039a450284a930e163cd9cd4c39c5ee6dd0a2f5678b5f77db7f809bbe0a141a564fa7232cbe3a428b31170068b1377cb953a8ccda4ee3b14b5ddb4d313180496
+EBUILD qdox-2.0.1.ebuild 2824 BLAKE2B 6e1d4e8534d5f0d119bceb52ef24095b27deb95b0bfb44823382408d0fd4f04edb6473adb3d673132e139c8d7d0337f9ed7a5ca5c85e3ff3d2fb1ba08d15e6bc SHA512 77f458221b12c5048299d1b7045d1f2001e37398784d97f3f5b1ae01505a3d39804b582ce12b12f0a4aeb99b92fca557608cac240d6aed922d4e73e3172c28a4
+MISC metadata.xml 494 BLAKE2B 9d4eebdef42221ae522f9642dd022db253e2672a5f7d990bc1c1116c49ad5004dd5c9ffd2944927610bbd15652cca26899d89b3422e3876b9f7fedb98306d8bd SHA512 944cada2a9b4e35e48516eb9faf506a8045dd29d42dd3958df9cfe54c73d6e7b715c8074aa2707f6ca7a5e3efc7138650d56bd1f9629cb1843cdc2c78365a999
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index 441b6da52a6e..f00a4317cac4 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -10,6 +10,6 @@
 		definitions from source files complete with JavaDoc @tags.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">codehaus/qdox</remote-id>
+		<remote-id type="github">paul-hammant/qdox</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
new file mode 100644
index 000000000000..c6f38ed82de0
--- /dev/null
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.thoughtworks.qdox:qdox:2.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/paul-hammant/qdox"
+SRC_URI="https://github.com/paul-hammant/qdox/archive/qdox-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+DEPEND="
+	dev-java/jflex:0
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/junit:4
+		dev-java/mockito:0
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="dev-java/byaccj:0"
+
+S="${WORKDIR}/qdox-${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.thoughtworks.qdox"
+JAVA_SRC_DIR="src/main/java"
+JAVA_CLASSPATH_EXTRA="jflex"
+
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	mockito
+"
+
+src_compile() {
+	einfo "Running jflex"
+	jflex src/grammar/lexer.flex src/grammar/commentlexer.flex \
+		-d src/main/java/com/thoughtworks/qdox/parser/impl || die
+
+	einfo "Running byaccj for DefaultJavaCommentParser"
+	byaccj -v \
+		-Jnorun \
+		-Jnoconstruct \
+		-Jclass=DefaultJavaCommentParser \
+		-Jpackage=com.thoughtworks.qdox.parser.impl \
+		src/grammar/commentparser.y || die
+
+	einfo "Running byaccj for Parser"
+	byaccj -v \
+		-Jnorun \
+		-Jnoconstruct \
+		-Jclass=Parser \
+		-Jimplements=CommentHandler \
+		-Jsemantic=Value \
+		-Jpackage=com.thoughtworks.qdox.parser.impl \
+		src/grammar/parser.y || die
+
+	mv Parser.java src/main/java/com/thoughtworks/qdox/parser/impl/ || die
+	mv DefaultJavaCommentParser.java src/main/java/com/thoughtworks/qdox/parser/impl/ || die
+	mv DefaultJavaCommentParserVal.java src/main/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	einfo "Running java-pkg-simple_src_compile"
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	# Too many tests fail with Java 17.
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17 ; then
+		einfo "Tests only for Java < 17"
+	else
+		einfo "Running tests"
+		pushd src/test/java || die
+			local JAVA_TEST_RUN_ONLY=$(find * \
+				\( -wholename "**/*Test.java" \
+				-o -name 'TestMultipleLevelGenericInheritance.java' \)\
+				! -name "ClassLibraryBuilderTest.java" \
+				! -name "JavaClassTest.java" \
+				! -name "JavaConstructorTest.java" \
+				! -name "JavaFieldTest.java" \
+				! -name "JavaMethodTest.java" \
+				! -name "JavaPackageTest.java" \
+				! -name "JavaParameterTest.java" \
+				! -name "JavaSourceTest.java" \
+				! -name "JavaTypeTest.java" \
+				! -name "AbstractDocletTagTest.java" \
+				)
+		popd
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+		java-pkg-simple_src_test
+	fi
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 4de384bb114b..451a7a996231 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -27,6 +27,6 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
 EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254
 EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.67.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.67.ebuild 3011 BLAKE2B 9477cbd5985e55341e649f23edb358ade6923649c3eb59977243bf940f002065e3d40fb1ca3c5af092aa031157fa36fc2536d1053d56201d69e372c69beb908e SHA512 757721976e9795a360b2516e04a70a0280faa2595a43a63817ed3aed20932d1fefddf63648debf717a37cd79e7fe85a73fb626da2435e276c856a6a9001aa688
 EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
index 09fffd263372..c53c20eb8511 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 471a8c30f9ad..0fed308de063 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 2be0c22f9b54..0da736e38385 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -3,13 +3,8 @@ AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a
 AUX jsonnet-0.16.0-cp-var.patch 824 BLAKE2B 111fff8e8b897864e14defa677c1a9b8589ef6a859b2344b24e16a940d90cdeff1affde6cd53c0a1a443a82553ee90d554990160f07c49e98c15a5fc7ea3e03a SHA512 96ecfb8a6b49d31e6a827ed401566b5eef39deb8a3542a6f1b3a5df148bfd93479038468585dc47a76fbb9e7953bf9a6c7161abc7acaff7b81cb8dffe3de2f6d
 AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee02d9957b12997f629c9b4c8e543889658308868d48fe20e0bb9647848bd1b1fa2100c58426785bab1c9bfbbaa8bcb SHA512 9a85c5b8d80f6975ddd3e3c369adb44f6f49382a1e50e9848129c53f81846e69f60a44f401a8a1042657a03f94daaaeb5747632414fa7cb0dc9e2f014ec17a1d
 AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf
-DIST jsonnet-0.15.0.tar.gz 21826038 BLAKE2B 722a844c00ec31b662d932a4481a71197adad680181c6a56a49dfa3e9b63696d29320c5278024d44c0ab3d7d80569514792f815ac7fa3a3cc08c7756fb6f08ad SHA512 b63c1bf82e4fc9ba3f1009ed4e4ba1010e3e7f81bd816a234e48d35607eae3cba95cab57813d35daa9f024e316bae5256340a6f8d6d884f9136cdbf062a2b351
-DIST jsonnet-0.16.0.tar.gz 21828911 BLAKE2B d6e9648e259b94513507ba5a6e305f705541904d7755dc5521b7fc2940b761f413bfaba39521af54eb428337be2e75f07d12038edcf7e8a5ba95feccc8dd4a02 SHA512 80e0403ec8008cbacff8d9e8fe0e2b5d3bfa306d92c2c11d472e5721015ce4c11be745df10d25715f22f8d8594df69fabf2fe617bdded462ffc5b21f8923606f
-DIST jsonnet-0.17.0.tar.gz 21854054 BLAKE2B 91561f2cffb5c711d4ba58aceef90bbcd654997872936bcf475d397a7b831b833d349c828271e58795cca10c915ab4ec0a517dc0fc2f563673ba7a6e74cfea3f SHA512 d3ee6947163d8abced504ff37ecf365c0311164cbf243d4c635d34944f0831ca9fce2470acf00eb9a218f82a2e553b3f885db9bd21bb9dcefbd707fa0202925d
 DIST jsonnet-0.18.0.tar.gz 22472162 BLAKE2B 4f931a44b0cbeea0dc7705c28ca49817e2b3abe19ba4fdcd550d5df1ce9ad6b06b1b740a9306d36caa3970c88df9d31700373e4997dd52c6c2219cdd9bf125c1 SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1
-EBUILD jsonnet-0.15.0.ebuild 1351 BLAKE2B 70adc1ac64534dcf8d7ed647d81942b5918ab661061c88cc25dbe8c9c6c63478b96caa02a090695a66c120d826de5f34afc904c8c51aa37ff1a4b1dc5cb45397 SHA512 e5c234dd38eb5f13eebfa4842c214219a80e14bbc337fc4309dcef873cc4c37e326ea7867f60a68143849f7fc5e42dd98e9280c24e023ae0a6f71b1a9cc3b2e3
-EBUILD jsonnet-0.16.0-r2.ebuild 1601 BLAKE2B 2de253f42358c8258f7f38b53b6fb8f6ed9127b5407375b8f69306701c884efa3ce280713411eaba899a972441eb92ed404ca02575a611dfd997dda99adb8ba1 SHA512 264866ca79d21d8f5870db27f14993d8d86fec27b44190ce69acab8d597417004edfd4a018b9100a289ad49e0aac7d670c568196b604d0e4107220bfd91a1012
-EBUILD jsonnet-0.16.0.ebuild 1375 BLAKE2B 4990a4e9754dd0fbc96ce2d6b557b4f9d2325f705ead68db7c768a6942c77a2d235f2a7db961c41263c629a90c4d56633b07d66f26f610c1252a8613ebe9bbdc SHA512 34012d168676b6ad7b519c580085166e7c290e760bb3362003fffb509917d3496d4424f1beb067350d0da6f3a4197aeb87bcfcf84008c6937db63704249e2e16
-EBUILD jsonnet-0.17.0-r1.ebuild 1752 BLAKE2B 93381b8c8546fefefdda73e2940a95bcd8b7c5de6ea8f09b53c6012027f4a4c01903af0f27a48f086dcfc471ec848905c572529332d07e2a7ff43dd5c57daf60 SHA512 befcf6b7ec73933ca127413ecea98169f55aec5346bfa94d0bfce4c1303f582ed3625467f744e791da7521f085705f6636c95cfffd3f4de17a0f2d08e7174402
+DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
 EBUILD jsonnet-0.18.0-r1.ebuild 2076 BLAKE2B 84ce1cd4819f2fddfa26271f9311a1eb57e66936822c9e9dd94201935e985101a7e11e4a660db95178891053e99ba5079548a7584ef5f8896d15717bb03fff90 SHA512 41e4ddfc52a89de20852f91f0d615a1a01e47ea34f99a7ead2ad43a7e3e0210f67f8eb017a8922274db60334cfcd6681d8a023075dfc09a7508bf329da417350
+EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B a4ff0c29853483e5093b469bb811305f7955561bff84349682cce40fcf9e31c4d03d7b974bf3d0227f3e6fcd308ade37911271df1464190c01c973eba0df64f8 SHA512 574237bf6c1992845d83749d00fb7c74bb01c42ae02e7e2b3fd1872a8a9c453117ecab0e81a2a6ff5210a4156ad456797f524cd0da71f5cf7f1a9b3e7365e79b
 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/jsonnet-0.15.0.ebuild b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
deleted file mode 100644
index cddc02706e1b..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers"
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-BDEPEND="python? ( ${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		jsonnet \
-		libjsonnet.so \
-		libjsonnet++.so
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	dolib.so libjsonnet*.so
-	dobin jsonnet
-
-	use python && distutils-r1_src_install
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
deleted file mode 100644
index a985a044732b..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers"
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization doc examples python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
-	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	tc-export CC CXX
-	default
-}
-
-src_compile() {
-	emake bins libs
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	emake test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" \
-		CP="cp -d" LIBDIR="$(get_libdir)" install
-	use python && distutils-r1_src_install
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		docinto html
-		dodoc -r doc/.
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.16.0.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
deleted file mode 100644
index 5bdb8e5a4799..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers"
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		jsonnet \
-		libjsonnet.so \
-		libjsonnet++.so
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	dolib.so libjsonnet*.so
-	dobin jsonnet
-
-	use python && distutils-r1_src_install
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.19.0-r1.ebuild
index 496bc8c5c689..158665c276fc 100644
--- a/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.19.0-r1.ebuild
@@ -1,75 +1,100 @@
-# 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
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
-inherit toolchain-funcs flag-o-matic distutils-r1
+inherit cmake toolchain-funcs flag-o-matic distutils-r1
 
 DESCRIPTION="A data templating language for app and tool developers"
 HOMEPAGE="https://jsonnet.org/"
 SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization doc examples python"
+IUSE="custom-optimization doc examples python test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
+KEYWORDS="amd64 arm64 ppc64 x86"
 RDEPEND="
+	dev-cpp/rapidyaml:=
+	dev-cpp/nlohmann_json:=
 	python? ( ${PYTHON_DEPS} )
 "
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
 BDEPEND="
 	python? (
 		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
 	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
 	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
 	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
+	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
 )
 
 distutils_enable_tests unittest
 
 src_prepare() {
-	default
+	cmake_src_prepare
 	use python && distutils-r1_src_prepare
 }
 
 src_configure() {
 	use custom-optimization || replace-flags '-O*' -O3
 	tc-export CC CXX
-	default
+
+	local mycmakeargs=(
+		-DUSE_SYSTEM_JSON=ON
+		-DBUILD_STATIC_LIBS=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTS=ON
+			-DUSE_SYSTEM_GTEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
 }
 
 src_compile() {
-	emake bins libs
-	use python && distutils-r1_src_compile
+	cmake_src_compile
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile
 }
 
 src_test() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
-	use python && distutils-r1_src_test
+	cmake_src_test
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test
 }
 
 python_test() {
-	"${EPYTHON}" -m unittest python._jsonnet_test -v \
+	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \
 		|| die "Tests failed with ${EPYTHON}"
 }
 
 src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" \
-		CP="cp -d" LIBDIR="$(get_libdir)" install
+	cmake_src_install
 	use python && distutils-r1_src_install
+
 	if use doc; then
 		find doc -name '.gitignore' -delete || die
 		docinto html
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e324201ba6d4..8008e8e1efe7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b29b3060712e..9511e3660651 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,7 +1,6 @@
 AUX nspr-4.10.6-solaris.patch 973 BLAKE2B 8370bedb05c718d7b73d57b5ac5c720ca62499d6d7b7a039da608a9c514996c2d987ba0135b7dcac509d1b9363908f0c0cff6fe47e1f7ca94b7efbd8c19aeeca SHA512 d4e4c44d02be7aafe09e633f2ee747c323036f7438cb87864d91bcd9bb8ac072065353aa4e8a785e38724d33bfdc8adb0e460dbf44ff7fbd8c8dd32b569074f1
 AUX nspr-4.21-ipv6-musl-support.patch 1645 BLAKE2B 0b383804d5e66037041b91dcb7ddd52dd4533384ca5671ed1d36a71740b130863dd2b531867edab804fbb8cfab112282e17d607d7e298eb249ead620f99a55be SHA512 f241e607491d1192272221023d5f3e84b3e88957e7b66ce4d9ba1bcf2ab6639facc08eeb838a0e6753456f41dde4ced4fe99f923e0889030d844c23c62fad4e2
 AUX nspr-4.23-prtime.patch 814 BLAKE2B 2106a841b34445310cef07e15cb77ae4c9465cca9a7dc68acd68408a66383c90bee1fafeaaa144e1b8344d1edae27407714f193a452ffc3d425212e3b2c40fc5 SHA512 9f51a03852f0b3d4352c14ee849ec8af9b3dbef68eaa2755cb5a630018f91e3a2a4fce5742078b8be51e76995218a0cfc7ef8b0c013e8c47f746a61185795eae
-AUX nspr-4.33-loong.patch 2717 BLAKE2B eb0fd910a0177d14070d06946cd7ee0aa6d7d7fc2885b6b61f57789e3436ce6eb09eca542c6828bc36c980d3c6d469c303ad018d10a12d74d3915b76980019d6 SHA512 bbbfd96c48257c9ab19b5d282ef9e5b9013f185b46b2e03690a650985f391386162dc41f8b3b0dba0a383b53427f093d2b6b8b8ba387f42090d7bafa32fb78c2
 AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2555b9f264f0da7432fb0e7d5d69e1bbbb7adc9a448d88ca269be41943f2ee60e1cc8e115542e300c1d7c61185 SHA512 11bd4ab3f98cbad2586f999370291d387fe7a817bab9feda9f5493f284410a73318e90072c0052a8216d9ae1cdc5b2a862a99315e09b72560d9bad6ebc16eb79
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
diff --git a/dev-libs/nspr/files/nspr-4.33-loong.patch b/dev-libs/nspr/files/nspr-4.33-loong.patch
deleted file mode 100644
index 96772a2767c0..000000000000
--- a/dev-libs/nspr/files/nspr-4.33-loong.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-https://phabricator.services.mozilla.com/D142407
-
---- a/pr/include/md/_linux.h
-+++ b/pr/include/md/_linux.h
-@@ -71,10 +71,12 @@
- #define _PR_SI_ARCHITECTURE "microblaze"
- #elif defined(__nds32__)
- #define _PR_SI_ARCHITECTURE "nds32"
- #elif defined(__xtensa__)
- #define _PR_SI_ARCHITECTURE "xtensa"
-+#elif defined(__loongarch64)
-+#define _PR_SI_ARCHITECTURE "loongarch64"
- #else
- #error "Unknown CPU architecture"
- #endif
- #define PR_DLL_SUFFIX       ".so"
- 
-@@ -139,10 +141,22 @@
- #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
- extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
- #endif
- 
-+#if defined(__loongarch__)
-+#if defined(__GNUC__)
-+/* Use GCC built-in functions */
-+#define _PR_HAVE_ATOMIC_OPS
-+#define _MD_INIT_ATOMIC()
-+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
-+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
-+#endif
-+#endif
-+
- #if defined(__or1k__)
- #if defined(__GNUC__)
- /* Use GCC built-in functions */
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
---- a/pr/include/md/_linux.cfg
-+++ b/pr/include/md/_linux.cfg
-@@ -1253,10 +1253,56 @@
- #define PR_ALIGN_OF_WORD    8
- 
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__loongarch64)
-+
-+#undef  IS_BIG_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #else
- 
- #error "Unknown CPU architecture"
- 
- #endif
-
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 96ff559c867a..b6ce6babd5c1 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index c3d0e8a8efa8..051a5a36bfe6 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -3,5 +3,5 @@ DIST seq-0.2.tar.gz 12012 BLAKE2B 2321caabaefd98d4237d6ede034007ae5a4295765df4df
 DIST seq-0.3.tar.gz 12562 BLAKE2B 2ef68aac50cee1a6faa97cd408d231541f3b0a941896bfadd4503c7b26a554b95314bedfba6cf34c2253858f5e86660876a1635e87a861a7a54d8a805106f9be SHA512 3cbca9e771bc05350b5c6ffd41237fa12c6909a077f1090e28c4d0403711c137c96fccd670f074b1ea1a47bdcfd7a7618247bdad6ee71e52e9af75894e8cd974
 EBUILD seq-0.2.2.ebuild 411 BLAKE2B 95e47a75a66913b0f6f5b41179a9f26ce68f9dd6e7ee4c85c2222c723064e2586a79678d42d5ef2535d4b67a37ad65efd7c8bffea0f38e7f6618a5f21f499e64 SHA512 a59c08a76390ca909da275f1b13c633ad98029a66128ddf2ec50e7908e82f923e1ce664a986534f36fe09e112fa027a8663e5968e6a9f5f87c8f8bba9223385a
 EBUILD seq-0.2.ebuild 404 BLAKE2B 19af5fc56a282c807ba4ce03d45be9647642288f952316722629a7c06eef35db1c359719d2ace92ea139f0234fb5e99094e09f5aeaa042a5762aae72b55bf6a0 SHA512 c22d91c186dee6e9026f026e4de2b5587579d947786ee7722ff0c571c34b122eec3b9aace5b49b345e2eb3d70302f1080bad38cad2406469a9cd24f0e82436b8
-EBUILD seq-0.3.ebuild 417 BLAKE2B cd007c5d702aa654e0cd5e906a320a749a9571a7e6e6c5c71e433a5572f913b584cfffa05b17613205081ccbe2863566fc0eedadf4385ad0d1bbb2b851650b33 SHA512 b855bd826be578378c0f32dbd10765196600637c71ecadf0a7c979403e7b18b5aedc0f12dd38c297b59f1b6cff61efec4d913aaa7a509bca22feb04f664fca41
+EBUILD seq-0.3.ebuild 442 BLAKE2B d76ee718d7128d2615e23521f999567b632fb545bf8a10ce407abafb0df8f40ff7d65e15970f324cb6c04eac2f0e76686b22a6a36b4f88a38b934859800dfcb3 SHA512 36b4be138eab4910b9465c84314286ddb186a43b5a43cd07c051266a35842f2d9bda88d56855db6ec0b4d33a5397c31ae543b9adeaebb38fd505c0b967c37bff
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/seq/seq-0.3.ebuild b/dev-ml/seq/seq-0.3.ebuild
index 7f7482efb9b0..3ae37ac37172 100644
--- a/dev-ml/seq/seq-0.3.ebuild
+++ b/dev-ml/seq/seq-0.3.ebuild
@@ -11,5 +11,7 @@ SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
+
+RDEPEND="<dev-lang/ocaml-4.07"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0dd4091d3410..42fa37bc5702 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 5716da214382..8d8166f81c61 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -2,5 +2,5 @@ AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a
 DIST imageio-2.22.0.gh.tar.gz 394144 BLAKE2B 957edbeaad6be459ff865eed3159b0f7776e3dd0782e0380bfe2c40362d0c08ccc8f29a2f38a8427deb263554495b73cc4df641e569b9d33700fcc6ed1395396 SHA512 23d606e32ab2bdc306a4b9d17120e5eda8c8a4fd96d840181afecd6e35f6649621740608f0286d2a5462822acc7ef4e1e7f1e9076882ce975f1da717b136c8c4
 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
+EBUILD imageio-2.22.0-r1.ebuild 2023 BLAKE2B b88d99c08569f942c95c999d7a4d584851a31d6cfc46d477fa85f1f0f0d484451800ccc48d4f71f07ed4a4b866c841072c3be9abd33eee1c93f9072e4beaffda SHA512 92f6bf719f178e1ec7ec38f8d8175ace82538392415fc4cefd9b6ad09d22f7b52abd6629e0a2f0139dc08ce832f90d043621563cca476aa50214483ecad4ea28
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.22.0-r1.ebuild b/dev-python/imageio/imageio-2.22.0-r1.ebuild
index 20bd98f88e7f..3b03357eb4e7 100644
--- a/dev-python/imageio/imageio-2.22.0-r1.ebuild
+++ b/dev-python/imageio/imageio-2.22.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index f89b1e42a07f..3339e64cafea 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,5 @@
 DIST nbclient-0.6.8.gh.tar.gz 78431 BLAKE2B a59490a42af5fb6090b7e4ddd8c469ddce015ca47ceca51290d9b3b2173d93d2a2d13839b227a78cdd72afdada1f305f810337dcc7aa08818afa78bbc96c4a1d SHA512 2393085e52e2e34574b6f60cff82317caf3b636f8476af20765282f0ebf158104fed3bb7fc8e8f800ff42f7eddc226cf7d9575c2043628fd926708ef71306c04
 DIST nbclient-0.7.0.gh.tar.gz 78253 BLAKE2B 473dcef140c8e1fc8f1e97fa30859b9b9fc2dfd6f951ae52db8ab11febbb3de7f60d129424827983a2c05579cd2340e9d4e1a9d0e452a7678497fc1c7176ecf3 SHA512 93d22e2b4fe1740798b812bb4890bf2fe2c7fdd337e34b50eac3140ead73d443cdb326948b2e8511b6ccad61c7daf1efd8e7cc3664b6b1ad9dda0894ca84fff5
 EBUILD nbclient-0.6.8.ebuild 1205 BLAKE2B a759e50f5b501eb6529f103ef21f01e9ea248133691b90b62f3d10653b0e426f157934f65822ce09861a67e7caf0a632acdf1e661e99852c8a1b824661d2e70b SHA512 9cf636f9fa97979a7e7368898dcb91bf3fd4456e2f8d5bf638f06eeacea06abdc11e2d0d140ace8b445c689d576543e9707096c13f2ae839aae7c8262ca1027e
-EBUILD nbclient-0.7.0.ebuild 1445 BLAKE2B b5355da4d69eaec0fcb3ab4257647505b8c0f6b187e4095e5278b387b5b4ae1573f460843123adb6f2884c8ae522d81715b21eca7f056078723d6c90c1e07088 SHA512 6f1dbbb75f2cfa70057e0e347c8ebb446b9bb6c665fb2387f410afce59ef32a7f580a3385b614ffe145fafca6d929eb57d25ecd7dcf28994e6f4440a064bd65b
+EBUILD nbclient-0.7.0.ebuild 1486 BLAKE2B 5977ee80e529c099a96a6efcf204bba01c679313545760fe178e8ba3a9450eacbeb7965fb24d9729bd1ce2cf94eec2455ce2dfd23e4ccd86742687843dcc6a5a SHA512 9633194a719e28a2478f327ec4c566a42c49c288963519d460481334ecd0942b87cd9701f1dcd4dc947d895d7fbb39419eca4689caae9fce25d197fa60189e8c
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.7.0.ebuild b/dev-python/nbclient/nbclient-0.7.0.ebuild
index 90bf73d4d736..2f083a3c4f93 100644
--- a/dev-python/nbclient/nbclient-0.7.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.0.ebuild
@@ -34,6 +34,7 @@ BDEPEND="
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/nbconvert[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 		dev-python/xmltodict[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index aec2a0615f8f..27a4819d9db5 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,5 +1,5 @@
 DIST tifffile-2022.10.10.gh.tar.gz 315965 BLAKE2B 9f1d5c37062fd2fd2c30411b479d77977d387e4df19ae795fba085179f7ad0e3dfafa6068ccc895586f59a2437a1203748b3e1bbeb0f4a2d433728c2e79fc47a SHA512 7ccd6b4b802e63ca2646ea4f716fb16f02a091042c02d200c7a6756dc06a60d7d165aa5fefc63db954e60dcaf6bf8626349de7e4b836394b70df7ee71ec28790
 DIST tifffile-2022.8.12.gh.tar.gz 312278 BLAKE2B ac48e3071f94855762f40173ce422fca5a980a88e20f0ea232a4d9ffedf0918c21b452ec168a1fb1481e2cd54fd4ce38a5b971bb7987c098fa1bf0a6aeedbf94 SHA512 35d7e7387bb2c7bcf88e8dac12e13c836a009f9344c9ae0cb0ca80184a42e6018744f09bdaa0d12c436b0561dcd96b97b2e6ca8106c512912b1eae813c5c3902
-EBUILD tifffile-2022.10.10.ebuild 1423 BLAKE2B 36d965316db7e707e36c307079526d07ce599af25def338f7f1deb7ce5e01b9e0b13b074ad22b152989da30b2dbc52a05a4dcafc766d8d506975f70dc2f977f8 SHA512 9af34150cfaadc631efb859a60e4f8780db26198e24e751f130dbb04d47dbdbc174498b65ec96403ad8948c5a79e1a5c9edca5f09ab66a0d655bd6887080e82a
+EBUILD tifffile-2022.10.10.ebuild 1423 BLAKE2B b4ced7553115bcaed97d865253b1d4cce3f1c07da348a186d3f4a6c68838dbb283cdea148f3096d6f2f41b00ee4d6d65f06938b245698dd5bc52c61668b82dca SHA512 15ad933a3738a7ca176ba2f4cae6bf2955d7ec1d3d56d9375d9e66576bb4979f469f7a05316ad35ccf336432966f2dcd7e73603d57ab3147aaec20165973153d
 EBUILD tifffile-2022.8.12.ebuild 1423 BLAKE2B 36d965316db7e707e36c307079526d07ce599af25def338f7f1deb7ce5e01b9e0b13b074ad22b152989da30b2dbc52a05a4dcafc766d8d506975f70dc2f977f8 SHA512 9af34150cfaadc631efb859a60e4f8780db26198e24e751f130dbb04d47dbdbc174498b65ec96403ad8948c5a79e1a5c9edca5f09ab66a0d655bd6887080e82a
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2022.10.10.ebuild b/dev-python/tifffile/tifffile-2022.10.10.ebuild
index dcc5e51d8520..d80014ff6fe7 100644
--- a/dev-python/tifffile/tifffile-2022.10.10.ebuild
+++ b/dev-python/tifffile/tifffile-2022.10.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 736622390b02..389f6c75bdff 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -3,5 +3,5 @@ AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15
 AUX twisted-22.1.0-force-gtk3.patch 2634 BLAKE2B bf297589d56a59149e1a269aef416a9aef26dd2123cd9fc87358d19b279bd2924e84d3e9fffe5e6edb70f7268c19b4053cfdf6362b04dd6e91b3a2c997e0f92f SHA512 85b1678cf6c73e78004a015424f2e092b42bf4f5899ed607093b4c26ff1411fe22267df09c331f80086f9d46e5a6dadfad7fe62cbb04e3edeaaa05f40c96239a
 DIST twisted-22.8.0.gh.tar.gz 3937858 BLAKE2B de5f56f2ac92db3ccd29122f3c3bacc01de325e4b00b60a0ea9bcf13c5714487d596299990d292758821e242443d8c65cda03b895196df0a635b0739f08668fc SHA512 890a11ca55fd88636f404678c6fad3fcea9d0604b1b37681a4b92ea74952bc4d1b96a571dde39a4aa82d966121156801f6b42dbd0bb5a309503591a7a77c6d71
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-22.8.0.ebuild 4691 BLAKE2B a770a2a2169a5c6626e4bb7dda9826280c257b9615a0f37d84961026d862ca0dce0fd0f4aa800c350f1a797fdb608d3bfb56dcc99f3d68c9501827dfe566d492 SHA512 ef88fffd81b9d5b6b5d0ee2cd7f344db8766984443f6e39705ff7d650fd6fbcc659c639c490f848499e4faf6fe5f61fd3ed930b5383b04470b1db585bfb12f87
+EBUILD twisted-22.8.0-r1.ebuild 4744 BLAKE2B 8d3f302e0986fdedb54ff00141e097f2bf75199a88d9a727b6295ff36b9a7ebfd9fed616ac1de2a3f009dd9d03fa247bd63171b1d024054184332852882d3b0a SHA512 7a7a8da9b4818c40ae482171029866609e938b05f5684137f67989320e0d90d6d4fd3d74fc9099c8fdd4d3e96a247a067a64587c457f8316385c318d2c1c7070
 MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569
diff --git a/dev-python/twisted/twisted-22.8.0.ebuild b/dev-python/twisted/twisted-22.8.0-r1.ebuild
index cc8b055c6b38..eb99611e14b6 100644
--- a/dev-python/twisted/twisted-22.8.0.ebuild
+++ b/dev-python/twisted/twisted-22.8.0-r1.ebuild
@@ -25,30 +25,31 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
 	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
 	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
 	conch? (
 		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.6[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 	)
 	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
 		<dev-python/h2-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
 		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+	)
+	serial? (
+		>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
 	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
 	ssl? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
@@ -57,18 +58,19 @@ BDEPEND="
 		$(python_gen_cond_dep '
 			>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 			>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-			dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-			dev-python/idna[${PYTHON_USEDEP}]
+			>=dev-python/cython-test-exception-raiser-1.0.2[${PYTHON_USEDEP}]
+			>=dev-python/idna-2.4[${PYTHON_USEDEP}]
 			dev-python/pyasn1[${PYTHON_USEDEP}]
-			dev-python/pyserial[${PYTHON_USEDEP}]
+			>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+			>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
 			net-misc/openssh
 			conch? (
-				dev-python/bcrypt[${PYTHON_USEDEP}]
-				>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+				>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
+				>=dev-python/cryptography-2.6[${PYTHON_USEDEP}]
 			)
 			ssl? (
-				>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-				dev-python/service_identity[${PYTHON_USEDEP}]
+				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
+				>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
 			)
 		' python3_{8..10} pypy3)
 		$(python_gen_cond_dep '
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c95fe779a719..a9a782f0bdfc 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index cb1c0276a420..f08e679c09a4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 14:09:47 +0000
+Thu, 27 Oct 2022 20:09:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a125052471dd..43f958c9110f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-27T14:09:51Z
+TIMESTAMP 2022-10-27T20:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNakS9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNa5ZNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmvQ//VzUJK/5baEGZaNFVMI9Gn6LlO4VFBSmY0cM1U5CTwCulkGSpSULdtxF/
-38jHTCXr8hhhvvLfrS5JWzTtm+k+UYTjJku4pg2z3QhLeWUJ1/PQfY8naJXqCyE4
-+9yeSeH/yBCauljytyEYHexfopePb4zYLzkkDxquCW1iTuLXC7JCqIqE5ddZNWde
-uXrlUOG7GVrReGdJ+MetYat0lIAwJoTc5PXLARxIr01/lDh/MI8SGueRSdf9AVPv
-iMLzqJTJl9sEZskxpCIQZ2qTwImbtFEF7CvKBGBG5zRwgTaiqsgG6A4ZSu3l9MCH
-56tdZ/1pCUBYA8GHSTW4F4bXefS8jWAfUr4drT5CnIZEi413XPOPQZIsoaV8F2yN
-DED3N7tnJyUS5RpI+dWFOht2Agv6QGWxgsrAddIrN55sRCj0Huz2e8VuuCXG451o
-CnLh8Au0ZkGM1KHPZN1EZMX0CNW+1hUPCeZciTzLbr32QV2izT+ZrZNNyZ2WdPU5
-XjfFmKBVFeR+A3qKC+NS0nOJmYRThZWXC9uEISHwjgMiUMdz2E8PyRhOiXdDzOMW
-CGVK+B1/avHghqKhZOQtc4ahNLNrn5rZ328Zi5fbfO1phajdAxjBrGcB+zW0J32R
-s5EpDUx8b0Z6hcrMOYienA/i0TVeJMt4E0CbzPK9nvsNSEEV6aI=
-=VTrL
+klC2wQ/+NxeofL4wqKer6+D/Ruiz6tSo2PumFtj7ce6YuPduZolVQFDlagL/CQY0
+odVl41V8ny4aRuKYzkH6+cmXDYsYR8+15CJrps5FhlJYMAY4vVBQWQCjeHBEC0SV
+5ewnsTOQlqsJvirGSvrdWirJXxZ57eCl3p2s4GAbPLQksDTplpkkaaaIIRKxNnia
+/f3QrADKkx4GJc9bsn2yHCV8cNojNBRtxlP4Ui+RvGikx/HTol2jH+AQGQ3XXz3+
+CmE3dp1NHq16HVNnccRlzh+vzNloSArRwlRYnkI2CQk++zJ/kLWSeljanPa5dWSC
+ssAn36KmmVvnjCFs7w9nnGHlGOoqze/h3AmPguuOhiHYUq2W9qfdwyUcQ/VNIluZ
+fowLC1ZYUtTnPLNVZ/9CMEBZwDphCtTCRbiG+d/wQwmI9RBiVHjSfuoIydudjhtN
+wlAICxpr7gPzf2QAXK0ARP3c/gfc8oiTRQ+406jl/glK8OYC2G96ouduS/rShgzF
+vG5yHedo6iM+9O4so6lJuV5Cxop+o06bfF3EC8U4TSaGPLjsSbesKVPYRCcLoLYW
+vYvauCcYi4YGW3lT0/YyGmIcw7VgY+G+bmw87NGoIGIwtI2k4C6goHXjDc4ZWOcC
+JnUtsJb92Fr+saNTVD0mgR53g24P4ObhEnjtSCU8XgwEE7x+yT4=
+=cNZV
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cb1c0276a420..f08e679c09a4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 14:09:47 +0000
+Thu, 27 Oct 2022 20:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cb5b685a9723..182d36860ecb 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 29d4b1603e95..86090d14b160 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.24.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.24.0
deleted file mode 100644
index e51cf014e32a..000000000000
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Golden Disk Image builder
-EAPI=8
-HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.24.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e59bd285f0f5188e941534a617c82361
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.6 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
index 1e61368f3877..8c99e80f6d9c 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
@@ -9,6 +9,6 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1+ Apache-2.0 MIT
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
-SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.6.tar.gz -> vkd3d-proton-2.6.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/b537bbb91bccdbc695cb7e5211d608f8d1c205bd.tar.gz -> vkd3d-proton-2.6-dxil-spirv.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/ae217c17809fadb232ec94b29304b4afcd417bb4.tar.gz -> vkd3d-proton-2.6-vulkan-headers.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/83e1a9ed8ce289cebb1c02c8167d663dc1befb24.tar.gz -> vkd3d-proton-2.6-spirv-headers.tar.gz
+SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.6.tar.gz -> vkd3d-proton-2.6.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/b537bbb91bccdbc695cb7e5211d608f8d1c205bd.tar.gz -> vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/ae217c17809fadb232ec94b29304b4afcd417bb4.tar.gz -> vkd3d-proton-spirv-headers-ae217c1780.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/83e1a9ed8ce289cebb1c02c8167d663dc1befb24.tar.gz -> vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=66a210273e8542101627bf7ba1e40635
+_md5_=cd1512eebd38fba1fafad652c9bcc417
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.7 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.7
new file mode 100644
index 000000000000..d57c5f96efbc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-2.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glslang !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DESCRIPTION=Fork of VKD3D, development branches for Proton's Direct3D 12 implementation
+EAPI=8
+HOMEPAGE=https://github.com/HansKristian-Work/vkd3d-proton/
+INHERIT=flag-o-matic meson-multilib toolchain-funcs
+IUSE=+abi_x86_32 crossdev-mingw debug extras abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ Apache-2.0 MIT
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.7.tar.gz -> vkd3d-proton-2.7.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/2166bc7ea0ceb2d7ff6d787d9b007f7eb7d4aaa8.tar.gz -> vkd3d-proton-dxil-spirv-2166bc7ea0.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/ae217c17809fadb232ec94b29304b4afcd417bb4.tar.gz -> vkd3d-proton-spirv-headers-ae217c1780.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/87d5b782bec60822aa878941e6b13c0a9a954c9b.tar.gz -> vkd3d-proton-spirv-headers-87d5b782be.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/5177b119bbdf463b7b909855a83230253c2d8b68.tar.gz -> vkd3d-proton-vulkan-headers-5177b119bb.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0f0d6301c81a53e8ea6cb5628dee3347
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-9999 b/metadata/md5-cache/app-emulation/vkd3d-proton-9999
index 89a48a7163b2..82e603436f1a 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-9999
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=66a210273e8542101627bf7ba1e40635
+_md5_=2b32113c5425fad600782e07af773b4f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 41d4a781bcdd..6209873e6fdb 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/logback-core-1.2.11-r1 b/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
index 054d058bcf9a..dedd4d9d751c 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
+++ b/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logback.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/janino:0 dev-java/jansi:0 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=069c024421794c6d00b733f29133743e
+_md5_=406e3c397fb885d3ddb0a027b9bc35e0
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
deleted file mode 100644
index 9c1b83c2d741..000000000000
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
-EAPI=8
-HOMEPAGE=https://msv.java.net/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD Apache-2.0
-RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b88c98513deb1fa0d5a4475745e534a5
diff --git a/metadata/md5-cache/dev-java/qdox-2.0.1 b/metadata/md5-cache/dev-java/qdox-2.0.1
new file mode 100644
index 000000000000..2fc273b63d5e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/qdox-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-java/byaccj:0
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jflex:0 >=virtual/jdk-1.8:* test? ( dev-java/junit:4 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Parser for extracting class/interface/method definitions
+EAPI=8
+HOMEPAGE=https://github.com/paul-hammant/qdox
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+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
+SRC_URI=https://github.com/paul-hammant/qdox/archive/qdox-2.0.1.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=c84f711114f83875e5332f8537ab0570
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
index 04a13a946679..455375b90806 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.67/src/apache-tomcat-9.0.67-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_md5_=2e1c0367bb158cb4746a9296639c4a13
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b4d95539195e..ee7d0af62373 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.15.0 b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
deleted file mode 100644
index 5ec7ceeebd89..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) dev-python/setuptools[python_targets_python3_8(-)?] ) test? ( python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-INHERIT=toolchain-funcs flag-o-matic distutils-r1
-IUSE=custom-optimization python test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.15.0.tar.gz -> jsonnet-0.15.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2d888209c4ca6c6738024fe3adcf51e2
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.16.0 b/metadata/md5-cache/dev-lang/jsonnet-0.16.0
deleted file mode 100644
index 95b528e11a30..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) dev-python/setuptools[python_targets_python3_8(-)?] ) test? ( python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-INHERIT=toolchain-funcs flag-o-matic distutils-r1
-IUSE=custom-optimization python test python_targets_python3_8
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.16.0.tar.gz -> jsonnet-0.16.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f12798410b07f490a229195390583b4a
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2 b/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
deleted file mode 100644
index 3530c191c47c..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-INHERIT=toolchain-funcs flag-o-matic distutils-r1
-IUSE=custom-optimization doc examples python test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) )
-REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.16.0.tar.gz -> jsonnet-0.16.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d10d7c3f5aa6af8ddbdddd23555c4d94
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
deleted file mode 100644
index 006c9f637858..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-INHERIT=toolchain-funcs flag-o-matic distutils-r1
-IUSE=custom-optimization doc examples python test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) )
-REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.17.0.tar.gz -> jsonnet-0.17.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=49b4420882f2a56b83b28dd28d92dc95
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.19.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.19.0-r1
new file mode 100644
index 000000000000..34bc049f8dfd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.19.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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 ) ) test? ( dev-cpp/gtest )
+DESCRIPTION=A data templating language for app and tool developers
+EAPI=8
+HOMEPAGE=https://jsonnet.org/
+INHERIT=cmake toolchain-funcs flag-o-matic distutils-r1
+IUSE=custom-optimization doc examples python test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 arm64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/jsonnet/archive/v0.19.0.tar.gz -> jsonnet-0.19.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5437956809f19e71792493ffb98ccc79
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 9a47fe220548..b233a75dba5a 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/seq-0.3 b/metadata/md5-cache/dev-ml/seq-0.3
index 7b3c5b69d995..b859ec64506a 100644
--- a/metadata/md5-cache/dev-ml/seq-0.3
+++ b/metadata/md5-cache/dev-ml/seq-0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/c-cube/seq
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.07 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/v0.3.tar.gz -> seq-0.3.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=eca9cffc4730704d4b3e86b4d2c2b490
+_md5_=ac268bda86fe07d7ab0df3541cf283cb
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1d9777d45918..ab5f63cdaebf 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/imageio-2.22.0-r1 b/metadata/md5-cache/dev-python/imageio-2.22.0-r1
index 465a599b60af..06b2e83caa09 100644
--- a/metadata/md5-cache/dev-python/imageio-2.22.0-r1
+++ b/metadata/md5-cache/dev-python/imageio-2.22.0-r1
@@ -1,17 +1,17 @@
-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.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.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(-)?]
+BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imageio-ffmpeg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=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
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 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 )
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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 ) 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? ( test )
 SLOT=0
 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	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6d95d00bb5d2696b4019f41878206682
+_md5_=614cea04f67b217a03eafa74c84df39b
diff --git a/metadata/md5-cache/dev-python/nbclient-0.7.0 b/metadata/md5-cache/dev-python/nbclient-0.7.0
index be4ea7181955..59aa121e1195 100644
--- a/metadata/md5-cache/dev-python/nbclient-0.7.0
+++ b/metadata/md5-cache/dev-python/nbclient-0.7.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_client-6.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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(-)?]
+BDEPEND=test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_client-6.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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 client library for executing Jupyter notebooks
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbclient/archive/v0.7.0.tar.gz -> nbclient-0.7.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=af4b88a1c62255c053333a5ae509e1d9
+_md5_=6fd7f1b434ffd8388826179e21a115ad
diff --git a/metadata/md5-cache/dev-python/tifffile-2022.10.10 b/metadata/md5-cache/dev-python/tifffile-2022.10.10
index 8f1d441a91f2..dccb35a60554 100644
--- a/metadata/md5-cache/dev-python/tifffile-2022.10.10
+++ b/metadata/md5-cache/dev-python/tifffile-2022.10.10
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.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(-)?]
+BDEPEND=test? ( dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Read and write TIFF files
 EAPI=8
 HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.19.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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/numpy-1.19.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 )
+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=https://github.com/cgohlke/tifffile/archive/v2022.10.10.tar.gz -> tifffile-2022.10.10.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3638174842524c2707c2476088a2eae3
+_md5_=416d569db4f07b248fe32e8ccfb78862
diff --git a/metadata/md5-cache/dev-python/twisted-22.8.0 b/metadata/md5-cache/dev-python/twisted-22.8.0
deleted file mode 100644
index eec5fbe60444..000000000000
--- a/metadata/md5-cache/dev-python/twisted-22.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/incremental-21.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython-test-exception-raiser[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython-test-exception-raiser[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython-test-exception-raiser[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_10? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython-test-exception-raiser[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=8
-HOMEPAGE=https://www.twistedmatrix.com/trac/
-INHERIT=distutils-r1 virtualx
-IUSE=conch http2 serial ssl test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/automat-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hyperlink-17.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/incremental-21.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.6.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-1.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) http2? ( >=dev-python/h2-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h2-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/priority-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/priority-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ssl? ( >=dev-python/pyopenssl-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-0.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/twisted/twisted/archive/twisted-22.8.0.tar.gz -> twisted-22.8.0.gh.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=a6d2db08e7f27af85a529941e6320afa
diff --git a/metadata/md5-cache/dev-python/twisted-22.8.0-r1 b/metadata/md5-cache/dev-python/twisted-22.8.0-r1
new file mode 100644
index 000000000000..8599780733ec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-22.8.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/incremental-21.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( >=dev-python/bcrypt-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-21.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/service_identity-18.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( >=dev-python/bcrypt-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-21.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/service_identity-18.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( >=dev-python/bcrypt-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-21.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/service_identity-18.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_10? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh conch? ( >=dev-python/bcrypt-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( >=dev-python/pyopenssl-21.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/service_identity-18.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=An asynchronous networking framework written in Python
+EAPI=8
+HOMEPAGE=https://www.twistedmatrix.com/trac/
+INHERIT=distutils-r1 virtualx
+IUSE=conch http2 serial ssl test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/automat-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/constantly-15.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hyperlink-17.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/incremental-21.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.6.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/bcrypt-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) http2? ( <dev-python/h2-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h2-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/priority-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/priority-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ssl? ( >=dev-python/pyopenssl-21.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/service_identity-18.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/twisted/twisted/archive/twisted-22.8.0.tar.gz -> twisted-22.8.0.gh.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=b4266a0250e4177edba4e89650b7e5aa
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 75472cbb1dcd..89709bc953a6 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.1.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.1.0
deleted file mode 100644
index 1db1b979a508..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=8
-HOMEPAGE=https://desktop.telegram.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop optfeature xdg
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.1.0.tar.gz -> tdesktop-4.1.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.1.0.tar.xz )
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8c5b3662dbf775ac2ac2522054261d7f
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.0
deleted file mode 100644
index dc8ecf356f74..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=8
-HOMEPAGE=https://desktop.telegram.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop optfeature xdg
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.2.0.tar.gz -> tdesktop-4.2.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.2.0.tar.xz )
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8c5b3662dbf775ac2ac2522054261d7f
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4-r1
index 200ca1d051cd..a7b712ec6654 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4-r1
@@ -6,8 +6,8 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop optfeature xdg
 KEYWORDS=-* ~amd64
 LICENSE=GPL-3-with-openssl-exception
-RDEPEND=sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+RDEPEND=sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.2.4.tar.gz -> tdesktop-4.2.4.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.2.4.tar.xz )
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8c5b3662dbf775ac2ac2522054261d7f
+_md5_=688d05829a34c934d603b198f93c8eac
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5a22a2a228b6..b10136decb2d 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/memcached-1.6.15 b/metadata/md5-cache/net-misc/memcached-1.6.15
deleted file mode 100644
index 63bc8f914062..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.6.15
+++ /dev/null
@@ -1,16 +0,0 @@
-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/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )
-DESCRIPTION=High-performance, distributed memory object caching system
-EAPI=7
-HOMEPAGE=http://memcached.org/
-INHERIT=autotools flag-o-matic systemd
-IUSE=debug sasl seccomp selinux slabs-reassign ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.6.15.tar.gz https://www.memcached.org/files/old/memcached-1.6.15.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1e1f7ff0079b1fa4f571a37bfd80d3c1
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 4459f54ae4f3..3cb1591bacf1 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1 b/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1
index 24a4be1d5d76..2e6e9fa555d6 100644
--- a/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1
+++ b/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1
@@ -5,11 +5,11 @@ DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils
-IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test web
+IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.1.0:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/transmission/transmission/releases/download/4.0.0-beta.1/transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ffbf0165e634c92efad746b8fbe9297f
+_md5_=92c8a7e2334c5a95b0fa8d24452e43e4
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 727ffd3093b5..71a70fc2ea38 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -5,11 +5,11 @@ DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils git-r3
-IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test web
+IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libevent-2.1.0:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ffbf0165e634c92efad746b8fbe9297f
+_md5_=92c8a7e2334c5a95b0fa8d24452e43e4
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 56d2b88d7f2b..b263220b919e 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.32.2 b/metadata/md5-cache/net-vpn/tailscale-1.32.2
new file mode 100644
index 000000000000..1a65478c8c99
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tailscale-1.32.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Tailscale vpn client
+EAPI=8
+HOMEPAGE=https://tailscale.com
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=net-firewall/iptables virtual/tmpfiles
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/tailscale/tailscale/archive/v1.32.2.tar.gz -> tailscale-1.32.2.tar.gz https://dev.gentoo.org/~williamh/dist/tailscale-1.32.2-deps.tar.xz
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=68cfbd493acb0fcd3c8847729757d01e
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 7593eefabb06..26bb4707667b 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.19.3 b/metadata/md5-cache/sci-libs/scikit-image-0.19.3
index 094b7514e39e..cda9c1b5e2ec 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.19.3
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.19.3
@@ -1,17 +1,17 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),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(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.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(-)?]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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
-DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),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(-)?]
+DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Image processing routines for SciPy
 EAPI=8
 HOMEPAGE=https://scikit-image.org/
 INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),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(-)?] 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 )
+RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[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? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.19.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=479591b5e8fca01a08b5f88f7387d449
+_md5_=f92540f288ab738f3c14871be3f9797f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3407d31a7d03..ec04099dbf70 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.4.2 b/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1
index f95bdc26cdcc..5bf22d6d54f3 100644
--- a/metadata/md5-cache/sci-mathematics/cadabra-2.4.2
+++ b/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.2.tar.gz -> cadabra-2.4.2.tar.gz
+SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.2.1.tar.gz -> cadabra-2.4.2.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3c16ffaf125c1eb77c7b71c78bc63e58
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index cd7c449e8a8e..d837690756f7 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.16 b/metadata/md5-cache/sys-fs/lvm2-2.03.16
index 244f7390a211..b21be20d7b28 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.16
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.16
@@ -13,4 +13,4 @@ REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? (
 SLOT=0
 SRC_URI=https://sourceware.org/pub/lvm2/LVM2.2.03.16.tgz https://sourceware.org/pub/lvm2/old/LVM2.2.03.16.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1d8d382b8b52c50af631e8f02c3d409
+_md5_=c684d28de66eada8b88f0e7bdca72df0
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index a0ddcfa9595a..5e0cd3f35599 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/audit-3.0.9 b/metadata/md5-cache/sys-process/audit-3.0.9
index 7c8ec253c57b..9b9e909fb7f7 100644
--- a/metadata/md5-cache/sys-process/audit-3.0.9
+++ b/metadata/md5-cache/sys-process/audit-3.0.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 INHERIT=autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
 IUSE=gssapi ldap python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 split-usr
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) 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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) sys-libs/libcap-ng
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.9.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=33ab4f16de7ee1ba242f412d59fcfa2e
+_md5_=ba88dd3e3770e7451def90177c5b8641
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2bbc01d79422..e61d140b4706 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-27T14:09:51Z
+TIMESTAMP 2022-10-27T20:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNakS9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNa5ZNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDcrxAAmuOgz88RtpiVejAphvUewHaNIqv7l1Vjl0b+VtBOo3WuVCQb/C4s4bxX
-Vu/Qp0EUUIxPPw88VtxG+MHo7IQ/yFVGb0M+81T+4AJbWgYQGNG9vWOTEBm8w+gl
-tmIcgx4lIfkYlf7xfz1v82NYMxp+pkIaUBUIZPV7cHgPtKd9GHJ0xz9kb2DULbau
-sg7yLUKwfUsHf8vwwC/WhT3kkS2XfjdqdM8kaaKe4KxVn3kZkCrdxluVbMixrZEZ
-fi2aHPMA+yp8tRt292/nfMxCS8oMXbOzXYD1TUWhmiC11piMr0Q+VBsHDsLAhw3/
-NP8S9Gplt40/sQQqR7tBqi89INV9htuwNGmaE6FMasfnn2QLEFmhij45kYqHpX/+
-bLgF37h3RMVeZH5U91yTLMWi9olcolibDiNdAgNbOzwYlJ2Wuz7kOIe3hVzBMRRv
-i3VN4r6jNXCf8QiJdClgR5tKgiC7Gu9KKR0Mn+QOGTfPNfRxr9QIO4WN9RQLDdsO
-C8ubKZWsdXD+1Ob7r/80am4xW+t2Rg/Enuy6oja7Lf7hzRVz9Pbh2naeS/i20SHt
-jbxrwnpMqTMVGWoSL1rnKwXy14ddqFV6442fzRSwr89+eqUVBYwEu+0Csk//+5aQ
-wEP7IL42dXeoKiOvn1Tf/e1BS5VZZoejvR9YZoE7rUp0brtluT4=
-=YYJI
+klCDtw//YSM3k5PuVVaSJm37evdlcdLTjdazKPKX4rsUhiQgkr8t014Rlq6XaCGW
+ChQc1VE+I3X8qwbGltYd3pFwSn0FAR2oe1/7TtG3l7NN9DjmyHTV7ZSzymRnS9fz
+arx2oOEwqtu8RM6T7o3+xYfEIHULBcnJQBVPs8MCLJGjHlB3UIpB9PtNvmKePVVa
+WHJHw2lw0JB4GaTZ5cvfXCTS1Az0IlJ3Cgt8wCm6cS7T6xim3HDrSw3anpLX6LJ0
+JTBR3QBVJ78E85GJRkE58fvvj9AzedE5n3YK4gAiRU+QUga7k5+vQm0Rc5F6B0us
+qAP47cuVnV8u8OHZdWWVq/iux6a7NysRKkfmgvtimHTbGQFAFHt2sBRzdi+vCUZI
+Vkq6PdrsXGZxSqG99jUM2hjO17XK29cpucPkUmTOrTqR5GfThair2wRUfAVg+FwV
+81AfU7CSWYzK7fVxpOVIU4sqDx0f8N8cNwUJryvCwHlV3kC1rUFgl7/+cGi4dtMv
+7P3GF8fCKfsyi9rh8eePJ2PQjQwk8DtD9ebSeE4dPRzq/eMWysB0JBEOryt2xjFd
+ZbVrtseOT6l3V1cTX84sCnMooLEheNWyRRJulxb5ezzFleIqb4PypME1ybydu3Gu
+a3pLs+vIKqIQPX5dd0f/TcWQbVophk42Gy8V/7htpfrbRGYV5/Y=
+=9wrB
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cb1c0276a420..f08e679c09a4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 14:09:47 +0000
+Thu, 27 Oct 2022 20:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f6832fdcdfd9..1ed25fa853fb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct 27 02:09:47 PM UTC 2022
+Thu Oct 27 08:09:51 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8f25119e14bf..2ef06a0f084d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 14:15:01 +0000
+Thu, 27 Oct 2022 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3392000bb5a4..766e23b846c7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7735f199adcb271c09bdcf646f34fe431076f6cf 1666879516 2022-10-27T14:05:16+00:00
+1a996e19634a4f04cf05555a88f22af019975044 1666900945 2022-10-27T20:02:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5dbd4f38ebd8..9f915613f449 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666879801 Thu 27 Oct 2022 02:10:01 PM UTC
+1666901401 Thu 27 Oct 2022 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cb1c0276a420..f08e679c09a4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 14:09:47 +0000
+Thu, 27 Oct 2022 20:09:52 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 71df066be00d..8cfb593f4ca1 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index c4bd16fc7400..2c1b65aee02a 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,4 @@
-DIST tdesktop-4.1.0.tar.gz 16990380 BLAKE2B f037dbd8a3a7e30d906a8b4a1244b15fbad7304924033751dd89a0d7aa4db7d17d08821cfed53ff00977793d0974c675c7fea96e614d9a5cbf4d7026beac7ec1 SHA512 50c61a22d0953992cfd6a9eab0ca1ed87e2367e06cf47d51ce7339b93cd49a57ec6a6b5a4a4496f2e8ab71fdf968dc1850844e005eae48fb34ae35040225fbb1
-DIST tdesktop-4.2.0.tar.gz 17060742 BLAKE2B 3f85f903e07bf3a18357c7ec184f9a87863f50306715ad1c1dd03a88b6dff245b2bb7bdf7caf9d31e841f4dbee91be23dcd7d733f53c71b66ede5b9ec252d594 SHA512 48164145da0b6ff54260cfa9c07750da2461ff1c9b6abe0579f35e59dc16f87caa050a464c705b0f6afb186b8d7ee5d30e01be8033c777a4db4c0cd2dcd36382
 DIST tdesktop-4.2.4.tar.gz 17065673 BLAKE2B d2fd5db5d216b369902f697f8b2613fbb62ae7b788e08dc33f410a62547c335a8c20f2099989bb8eaaf92a81320e4fc24a3aaf266c6632b2264271e95c8b01ec SHA512 cc4cc3be490de750cb3a048a861d492bea1d2484160ee70b102979b8b446349333effe29f1b51fa014c7a65a4901779fa58f6b0d86ae12864f85d014e8f36d20
-DIST tsetup.4.1.0.tar.xz 43918764 BLAKE2B 05a34d44583aace5ae261d46a1c7382a63bb8a52f8ca07513011d6221b67f835a3f5a4f38a0c9036614cf8e944c71c9be16e344b24c5cf41b293f3b02bdd8170 SHA512 f226a98ea4ba97a3643adcbe2c883082dff72de25a5aa3a246beef78930eaed4e45fa1b4e46a179444660c7be06c124dbe27802271fa6ff0991ab3ac60f8e470
-DIST tsetup.4.2.0.tar.xz 44483976 BLAKE2B ca48fe1e4e92d4cfcfc7601a46ce72dbc3db3fb434ce5c04a4cfdaa6f6b9facc8d5973132798d456401125968a404a5f8b22f872dcb4f7ae07a925d6b8d68469 SHA512 e07f8db5eaa0c46a795887f0bf9ea96bd10c0d48fb1d4a496eb51beb487e92432512839466126067707f2314a6b9d021e15958271f8eeb2a9ad6db86780b997d
 DIST tsetup.4.2.4.tar.xz 46792948 BLAKE2B 20ebef199dc526de1e786ebd76dfd40d557f4211ae4c37d080f010738a710efe4ed2e5100c81249d49efb4902f7333f4548bff00a50eb284269dbd2aaff1bd21 SHA512 3397e480334605ebe7a8a3f3c6211adea8be0b759749e4beb579a6c4a75cb13accc3be5fa62c1d784fd6f0b92c66be15e986ed83c4fde29a38766b48a013b104
-EBUILD telegram-desktop-bin-4.1.0.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
-EBUILD telegram-desktop-bin-4.2.0.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
-EBUILD telegram-desktop-bin-4.2.4.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
+EBUILD telegram-desktop-bin-4.2.4-r1.ebuild 1213 BLAKE2B 55bb9674a3bdd7eed5af16a9e8d98e215cec27fa33b2a58bd6e965782d55c596e1fb2a8607179242cb531a8d0dd7f594c5559e21ae30e7007f4492271b6b0ebc SHA512 534f559d1a9b284beca02b575c32f9b28660a250e2f9b7bd320900ba55e01e7a6b69400db87f3613ccc9d050f49a99c4edbe6058af7d48b977244fab95e1a7d7
 MISC metadata.xml 501 BLAKE2B 94aa66404772e94f51d8c59e36d19e6454f37173aaac352fe3539bcc09e72c267e69001c41f8356f19ca2830107164144d907865ad7fb3ad1def8771f5ef6d9a SHA512 3cd8e818062cd40787f12c9530ed202ea23c3f60a70f1ab50c95a7b3310197590be5a75378c598dabe5a1fce310fa8acf409a36e7446b66c2046a109d59a5ff8
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.1.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.1.0.ebuild
deleted file mode 100644
index d0558b783945..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.1.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
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/bin/telegram-desktop"
-
-RDEPEND="
-	sys-libs/glibc
-	dev-libs/glib:2
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	virtual/opengl
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	newbin Telegram telegram-desktop
-
-	insinto /etc/tdesktop
-	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.0.ebuild
deleted file mode 100644
index d0558b783945..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.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
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/bin/telegram-desktop"
-
-RDEPEND="
-	sys-libs/glibc
-	dev-libs/glib:2
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	virtual/opengl
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	newbin Telegram telegram-desktop
-
-	insinto /etc/tdesktop
-	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4-r1.ebuild
index d0558b783945..6916ecaa22df 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	media-libs/freetype:2
 	virtual/opengl
 	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
+	>=x11-libs/libxcb-1.10
 "
 
 S="${WORKDIR}/Telegram"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 73755d6ed8d2..bbb098f0a54f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 4e0a5b075f67..1a08ff1d90ef 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -5,10 +5,8 @@ AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
-DIST memcached-1.6.15.tar.gz 1051109 BLAKE2B 96e931b2a513cc6717dbc3262e3c7d30a2293c7a1380e3bd961d82e3f24bb2f3fce20950a587e0588bf11c9606af230cad6ab1e749d438e62daf171cbaaf1853 SHA512 00ee15eb7932420a25f3ce973bc7fcc5ba77a514091883f8b4e58ea861073caa91c676c0020f03c768077e20c76f34bca96616be104af3fbc8e7e78303958f3d
 DIST memcached-1.6.16.tar.gz 1054877 BLAKE2B 6052153a0442df1e7fcd8a959184c6ef1ca5ca26ef8c145144f8d26d4ded971e19bfd7a310f80e7b1cded840ebe95626a8714b583e156111ba68ae4721bda0c2 SHA512 cacd71d11aaa575361b83b5c565b6d665cac7a6dc6768af209d5108620d6883a7b3159351b7eab6da034a15162fa71fefe8024e41a1f46911acd1ca3aa23b209
 DIST memcached-1.6.17.tar.gz 1713186 BLAKE2B 0dfb473448912b5ce87485ee813f7f026a5bbdc6570b0616a69551e3adeacb04461359d492d975283182e2b338fa32e416b25b5c874b8088a0836766728c05ae SHA512 90ddd1e0dac3eb27273c1ee0bf6a7f75248f0267bca37b88455ff48727ab4f9db07382484d1e0c9b4a0126198b147f53aea4c993259ac608e8de393e11dad673
-EBUILD memcached-1.6.15.ebuild 2975 BLAKE2B 99872c458f163b3b1a297776faaea7fd20834858c69e512e98d86f412359a4f9cae5111cad94ace6d6d1de1a3209594f0fcbdf22ee714f05c1edeef9add7e602 SHA512 accb543d702a6998989aee10cf7618fa7498aa2a87bc26541b428a9f29d12f9a7254aa243253d052490b402ce263c3cf233ea434163e9245f02ad590e669d466
 EBUILD memcached-1.6.16.ebuild 2968 BLAKE2B 11db0bb4474dadd025567ed123d266010f7539a413cf990b32076f7c5318b172edebd6e94e3cb2590960791ed19514bbeb3191a07b52ddddfc1d71a55edfb079 SHA512 3ad0834a66a56d188df9b3a197974339c40f3c4726ff4aa216df1e27d7f052dee3c61f55038ffa2397f355530a2414e84b57b9f0fca4a0383442f0baa618004e
 EBUILD memcached-1.6.17.ebuild 2975 BLAKE2B a0000c4a13a61e47b05cfb184220ef6a2a3a69d517874e1029d45394fb07ae0d72a0b0ff98f44c31e66055b069cdad063701e2f2a6263802fbd102fb2e53e353 SHA512 c7358d602d710e7b3501f93ab6f4738585eb5a3306ef56fc223cecc38e55f9493ecc316884fcd6ec3af4bb81736e4379602b8f9f5a1eaf6c66df30b51d95e5e0
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.15.ebuild b/net-misc/memcached/memcached-1.6.15.ebuild
deleted file mode 100644
index 39801d79547c..000000000000
--- a/net-misc/memcached/memcached-1.6.15.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )
-	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-
-	eautoreconf
-
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl) \
-		$(use_enable ssl tls)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 86c834ffb23b..4bff86c97e54 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 32a10db7c75f..cae9c630741d 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -9,6 +9,6 @@ DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156e
 DIST transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz 9481044 BLAKE2B 99d287645f4c28a9f021c0923712ca2b0246be53c26b2654a50e00dc7b3db51b7de304280f6ae2d57c879d96ebe811163af3c38a29e64764712d926fa5c3fb0f SHA512 1bd4265e708070577a5624ee33ab8b0a71baa6d12d121974be6c104078289892f35cab6ddb22070c749d8c1333996ad83eb6f08adf96ea492d96104cab550d60
 EBUILD transmission-3.00-r1.ebuild 3115 BLAKE2B 127e0f735cf5790d6a836ad732c3e8e414211d8d299ce90f244011ad8dc4e96bd1a5e69f735b0442cc7192415016fab5c7e81bb5cc37bf6c388c03a54b8c5d89 SHA512 3a867649911e8937c120f890c7a69dd01ef56e3e718212e5d5514308683e514049f4afe975e76340c78a1c389df076822ce02e1f2b36e6ec42fe4753ad8acfda
 EBUILD transmission-3.00-r5.ebuild 3200 BLAKE2B 02c6c6cb69cc5ada8c52a67f5d9128707eb84fd9ac91a218430b3a30cc9ff775c328d0b26c561c6696ba0f6e649d0cdcd04f87c23040547742c9e4e48743df93 SHA512 c3ae60e20c1e35b91e9538446620a65603cf2d42682f8215178f549a0cecae8fafd626ccd7db77e6472a638430c723e082f80ce55bcf3c9d3aa736c396d929d7
-EBUILD transmission-4.0.0_beta1.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
-EBUILD transmission-9999.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
-MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
+EBUILD transmission-4.0.0_beta1.ebuild 3452 BLAKE2B dbb6053f8d4b01a72d9f35dc7f0ae8594066139b2dd581975b238467eaf35de3caff4f5368c421534869834ac01c06542b1b94332b58ea2a4476626810ee5945 SHA512 e59c2838394c939aea685a0fa35cb46674e704fec0aa45acf5239396e419e8089faa3a5a65c4cb395f77c8c3ae7f39acdf8b0e6ac434b0e1286f883b94a996d1
+EBUILD transmission-9999.ebuild 3452 BLAKE2B dbb6053f8d4b01a72d9f35dc7f0ae8594066139b2dd581975b238467eaf35de3caff4f5368c421534869834ac01c06542b1b94332b58ea2a4476626810ee5945 SHA512 e59c2838394c939aea685a0fa35cb46674e704fec0aa45acf5239396e419e8089faa3a5a65c4cb395f77c8c3ae7f39acdf8b0e6ac434b0e1286f883b94a996d1
+MISC metadata.xml 521 BLAKE2B db648a0b6ddc014b568aa5a14ce5da9a9e519756264110b58ddd36bdced1a06a1db0c662cd619e2ea74c56b7ef3f8ceaedb729fb3822816c6a42014208e02184 SHA512 ae4d1791d7c5a44482367ecba5b5b1b9d38521d834d9bacd7f69978895bdf2a18db09eeb892364b73b4cd2516c67759d9b1472e1899ec3151dbcf23638ef24fb
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 0ecfb8ca30dc..6e518af5a187 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="cli">Build command-line client</flag>
 		<flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
 		<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
-		<flag name="web">Build Web client</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-p2p/transmission/transmission-4.0.0_beta1.ebuild b/net-p2p/transmission/transmission-4.0.0_beta1.ebuild
index 6809675fbe91..8ce1105ef889 100644
--- a/net-p2p/transmission/transmission-4.0.0_beta1.ebuild
+++ b/net-p2p/transmission/transmission-4.0.0_beta1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test web"
+IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -82,7 +82,7 @@ src_configure() {
 		-DENABLE_GTK=$(usex gtk ON OFF)
 		-DENABLE_QT=$(usex qt5 ON OFF)
 		-DENABLE_MAC=OFF
-		-DENABLE_WEB=$(usex web ON OFF)
+		-DENABLE_WEB=OFF
 		-DENABLE_CLI=$(usex cli ON OFF)
 		-DENABLE_TESTS=$(usex test ON OFF)
 		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 6809675fbe91..8ce1105ef889 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test web"
+IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -82,7 +82,7 @@ src_configure() {
 		-DENABLE_GTK=$(usex gtk ON OFF)
 		-DENABLE_QT=$(usex qt5 ON OFF)
 		-DENABLE_MAC=OFF
-		-DENABLE_WEB=$(usex web ON OFF)
+		-DENABLE_WEB=OFF
 		-DENABLE_CLI=$(usex cli ON OFF)
 		-DENABLE_TESTS=$(usex test ON OFF)
 		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 4a9a4dfc7569..82159689ae2d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index bad20bd085a5..0b216a59fa73 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -11,9 +11,12 @@ DIST tailscale-1.26.2-deps.tar.xz 134312708 BLAKE2B d7a2cafb7c806b01982970dbb1d4
 DIST tailscale-1.26.2.tar.gz 1139290 BLAKE2B f9424d91e8a09874941b1a351b0a600e705d117afcf2d60787b1950a295cee5e9e4926034235804824e59c8fe09abd830e2cdfe2b6389134c37ac2f0be6eb82b SHA512 a0d235660b6266d73b415ff1701ba949a7d84cd6a204870f41b16bf66ae27aebf82ffb06a4ec4a695b18c5b3c63f45a990167dc41d617a4718e5e3511daf49a3
 DIST tailscale-1.32.0-deps.tar.xz 136965688 BLAKE2B d8d8859c99184d0dee335ff169c88ea86c700a471c92bdd28636a2200c2702174564609707fdca880c2ababa7433eea328a171cb18f1e47498cdfcbcd41e55cc SHA512 5c9a29ac51b80bb1833285b0527f8ae7419b60a205027b9562b162f064f3b772f7757ef9dce1dbc0697b6ec039b91df31c8f18b887ca82323e4be87bfe2e7e88
 DIST tailscale-1.32.0.tar.gz 1355487 BLAKE2B 894f42ec967ddce78c93776041285b53c9587b4ef5ca909e9bdebbb590ee6803fb7ec3cd9727c5c8ce7bd0757388c6f1f2a98224b08cdd0f2fd5b86d8c9ceb5b SHA512 a6014102f059b6e88fdb6c5d4228263cc01f03f26c5dc862cfe0b3e0e74d8756e2c854c7916fbfece6295231b4f95363fa2f9664211a6d2a27277e44a6a8cb6b
+DIST tailscale-1.32.2-deps.tar.xz 136970924 BLAKE2B 7fef3626e0ffe2b789a5da3cee0493eb83037a624f71ae8f512b8bfe21cd0965f4c94abd1423f6f57a5f3467d049d19ee50545c39cdff8d00172c35bded0daae SHA512 8b3fe5ec443341633c4c1619d63462051cf4f39dfc4fe20631dffac075b5ee27e6902d3f0a04604f87dd0cf581bc1ddb6585c6236ec4a3fc2d5241a8d0c06ebb
+DIST tailscale-1.32.2.tar.gz 1359648 BLAKE2B 91380e61c263c8f46f4a2b74aac5b103a6d8fcf26dc144eb24ffc8ec01fcc680bd5229ca998ec6ae2cba5fedfaf761dfcb3c498f5fe7edfe6e2931ddcb8d6fff SHA512 8f4d898e3b4503d9988124333fee2621e6d048eb7df60a5eff60c328b338432c7b22245ff0cbf0e5214154eccdac2bed652ea924d56ed1d071dd6345fdf1a477
 EBUILD tailscale-1.22.0.ebuild 1537 BLAKE2B 706a20b904c62b312f27db2a7dea4e0733ed4128411be567144c15e589510a21c13c42b1c45439b2a9607fe586bb326774908cec2081456eeb63136ea23e2403 SHA512 9fd8723a270dcbe5de04e8a87be1122def8fd919c35cf45c25f5f965510f1fd2e482321be71adab7d2c15ae48e46be51d08e2ebd4317d7e790405d4a3cf08977
 EBUILD tailscale-1.22.2.ebuild 1507 BLAKE2B f3d02d089c1a3ca81f2a9ddef631e6bd08e1ca9416dca922444897898cc51e63311244477d8938f3ccfe3e58be2a0e79959b3358511bb5c7b381c5ab6d9ce66a SHA512 62463e45fa45d62b3f07f3a2562dd9dc68185cb94633af3af8600f14923f23095fe3f708f1573e8b2788bf1a0034b87d42c9db0fa3a245c89fbc4d21b79fca7b
 EBUILD tailscale-1.24.2.ebuild 1507 BLAKE2B ea6632ca64c449f9c562d4832979186a8a23a9e0814385cfdce63a104f77579f5186d833233c065d1a498531539d33b51ac9c321b58930fcc9d3d9c81f17e96a SHA512 730ffb55615a538439a65852e3bae895ce75ee51d2454a282b6aa8104e2a9045b94e2baa7baf40fd825b340b43fd8e51b68f1c1189443f2fea1bbe0a60f51a48
 EBUILD tailscale-1.26.2.ebuild 1507 BLAKE2B ce4f053192abff40fa94515adf83e4903bdf4338ce59005f2c0c21cbf665e92154de67ed68a0c9fc490364e99789c5a6f26f563607acc5933c70533a0a59f3b9 SHA512 1e71ab041d76f19fcaca8b3f256cbc9bf3019564929bb84f4d242fd9484718c25da85468c6044c3934e0ba14fb925e23d888520095705de09431dccd74504be6
 EBUILD tailscale-1.32.0.ebuild 1524 BLAKE2B 96c2286060f4c288b5176b830254176453ebcb2738801263ef2dee37e7ddd49523e1f9b21722f1a74a4a614e78bb94502af3c632d3330c99e81119725c591083 SHA512 e8c192e229b9e864f79b81a3f65fd5abddd12978b2483888e5742b31cd4ec692908aaae964fe2396733836ac5e4a9365c5fe7101139baef6e22f64423a6a91b6
+EBUILD tailscale-1.32.2.ebuild 1524 BLAKE2B 05e3edb4e237beb7e1146ec7a6f26bc13ee077906abc834fbcb67443abceceab1fe1736d9fbbb3c7d99a23047606b63b5b5781381c23dc276eb7016a4d860037 SHA512 ab79cde6a9f2130644cf22bd44c31c6ba7c7f330c50899c124f2b29d02ceabc946757165da295bb39ec7955bc7131993a3019b2c7c834cb145ee50a54da203df
 MISC metadata.xml 359 BLAKE2B 59954b06b03a7ce9134eafcf4e325c7e383e886887ac0baf678414e7790d81f2233d3993657570fbea7eb93cc1f3ccf63452155f204f4f56f56d9e81f1641144 SHA512 edab61fe9050781abcdd5b1a4cdd4bd78376a331c3560cb0d9f153c1300f5be24be3951bc9e64dc8c2edcc1b264518e7ffba48906183b11a17938735331219e5
diff --git a/net-vpn/tailscale/tailscale-1.32.2.ebuild b/net-vpn/tailscale/tailscale-1.32.2.ebuild
new file mode 100644
index 000000000000..0694acc85291
--- /dev/null
+++ b/net-vpn/tailscale/tailscale-1.32.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# These settings are obtained by running ./build_dist.sh shellvars` in
+# the upstream repo.
+VERSION_MINOR="1.32"
+VERSION_SHORT="1.32.2"
+VERSION_LONG="1.32.2-t54e8fa172"
+VERSION_GIT_HASH="54e8fa172b725b354598daaa7007d261fd932d10"
+
+DESCRIPTION="Tailscale vpn client"
+HOMEPAGE="https://tailscale.com"
+SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="net-firewall/iptables"
+
+RESTRICT="test"
+
+# This translates the build command from upstream's build_dist.sh to an
+# ebuild equivalent.
+build_dist() {
+	ego build -tags xversion -ldflags "
+		-X tailscale.com/version.Long=${VERSION_LONG}
+		-X tailscale.com/version.Short=${VERSION_SHORT}
+		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
+}
+
+src_compile() {
+	build_dist ./cmd/tailscale
+	build_dist ./cmd/tailscaled
+}
+
+src_install() {
+	dosbin tailscaled
+	dobin tailscale
+
+	systemd_dounit cmd/tailscaled/tailscaled.service
+	insinto /etc/default
+	newins cmd/tailscaled/tailscaled.defaults tailscaled
+	keepdir /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7ca12a10529d..e5b58bf31d45 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 76a3bc65c5ea..d0877ad6f7ee 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6795,7 +6795,6 @@ net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr
 net-p2p/transmission:cli - Build command-line client
 net-p2p/transmission:lightweight - Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)
 net-p2p/transmission:mbedtls - Use mbed TLS instead of OpenSSL
-net-p2p/transmission:web - Build Web client
 net-p2p/transmission-remote-gtk:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration.
 net-print/cups:openssl - Use dev-libs/openssl instead of net-libs/gnutls for TLS support
 net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 82c6154fc7ca..c78e37b40845 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 3ce089bef856..ab24a56baf96 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -5,5 +5,5 @@ DIST scikit-image-0.19.3.tar.gz 22232287 BLAKE2B 855584be0e69ac6e0dc7a17a68a1bca
 EBUILD scikit-image-0.17.2-r2.ebuild 1190 BLAKE2B bd547b16a54f47a427abf98f3889f2107845096933943344f75e891a7d99aa6793095a737df712347f8ac9ed2b608848b92fcf4d32c30f79ecb6c4059c9496e6 SHA512 8014e83b3886a8e1eb8cea4619c0fba915cfc25059c48cfb3d7de575ff5e8c29a6f082b91f970c87bd057c703ce9c336a438d3d85de07a4714d737cf53e85f8f
 EBUILD scikit-image-0.19.1-r1.ebuild 1438 BLAKE2B 947b537c720abbb59f27add33cc4e606e4f5c952668dd6fe66a1fe95f6355ebaf1d95668d3a93ecf0a322c60365cafe8a70d73fe995a109b5af5bdc8605694e3 SHA512 5d8132437fd683f38a0f94cdbb282752ad02c60e6cee2c63b3c788123318707c82e02845a10bf0de8b0f4826bb53c141d28b587773ddfa1830582735221af661
 EBUILD scikit-image-0.19.2-r1.ebuild 1637 BLAKE2B d7ecf954d87a6d1434aa3d249342da3661897cfb1e2918e30a1f9da54a6ce8015d753f6821e612a7f699b792a2a4a99ed9827af11d65fecca8cc2f8de0092273 SHA512 3e75dfdc71edce96fb312440ae986b97b85363c999164cf0bc85bc37a3e7a221b8e1fa7eff705702f0b7b3116bb42249c7ad660026d5b2b109c8e130272844d2
-EBUILD scikit-image-0.19.3.ebuild 1637 BLAKE2B d7ecf954d87a6d1434aa3d249342da3661897cfb1e2918e30a1f9da54a6ce8015d753f6821e612a7f699b792a2a4a99ed9827af11d65fecca8cc2f8de0092273 SHA512 3e75dfdc71edce96fb312440ae986b97b85363c999164cf0bc85bc37a3e7a221b8e1fa7eff705702f0b7b3116bb42249c7ad660026d5b2b109c8e130272844d2
+EBUILD scikit-image-0.19.3.ebuild 1637 BLAKE2B 6dd25750f6bb8528b6e748e6cc27f1f11c3a0ec0de2a57c8ed1b7c5a47eeba057d2e3ba47bdcf12517bf0c278b58fb59f076ade6cc8caadc7df00ae56e68be43 SHA512 d9a79abef882b791f4f76eb3c4d942f6018eee1637f253d3833d2c77dd5e5b72dce6382c0e17ca781a6cc740f94cbc837eab84c49a3828066b5232ebd1e1ac78
 MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/sci-libs/scikit-image/scikit-image-0.19.3.ebuild b/sci-libs/scikit-image/scikit-image-0.19.3.ebuild
index 870f5cb3d753..b55f82ccbe64 100644
--- a/sci-libs/scikit-image/scikit-image-0.19.3.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.19.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 optfeature
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index be76f598b09c..96ad0af6f122 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index 1bc9616d95e5..f32d40153797 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,8 +1,8 @@
 AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
 DIST cadabra-2.3.9.3.tar.gz 24685603 BLAKE2B eb76f65898be499eb5abbbaf8ac478a056ffe5801bcf7124be60d1b034f4e88e9999d76354f03e7a2de9b7f7561a32e82699c882be135fb5966614da37526933 SHA512 9a5cdc6a7d824350ef3929c9f21647588891c1376103a57d231c2f5160971e3373b0efb9e050c574ebd51921a3f7d9f230f533a88a44e0dd8e645bf2395a95fe
 DIST cadabra-2.4.0.2.tar.gz 24688084 BLAKE2B 4bc1e00ab87bbdc43dae261e1948b41a6372f90ad394e5208b65b993210ff42e84ed098ad4fcf6d056fc42947b75f970f18a92b67859fd69c8ea3cc18ffb2e9a SHA512 2545f7ba3238944902b413bfbed91d87594d87afe99d1fb61061115b354a6fa29ffb7b71017d790e54080da33aa905d0f9afe0546fb1397144fe7b135e906274
-DIST cadabra-2.4.2.tar.gz 25145250 BLAKE2B d6824f4819922cd1c37af6a393123ac7398d0adb5c551e278ca983cc7ec51c9fb1f5319ddbef74165cfe8743a8138f4cf2d011065ca90e300c103ad53daabef2 SHA512 a5b2ee3eee6911440eeb85dd720cc72eca21a889a409bb0a360ac674f926dc82b3d30f5fca4d46528216c6a3ad7c164a576435e0647ce2eddf187ba840dd59db
+DIST cadabra-2.4.2.1.tar.gz 25154623 BLAKE2B 99c24728c80c5909df338b9214774123c2aac63e475138b5059c0c7824685827765d7906c17200ab3bad63e08b3637c7eb67b2f25bb3477eab4ca02fcbedbb56 SHA512 9dd280dfaca3cf1def268bca7884b0d00287bba5bfb7b80e8bdf4759f91c83117d146af2a24e05d2a8bdc8a5be412529a805713861a56a7186c35fe07ff8d0db
 EBUILD cadabra-2.3.9.3.ebuild 2339 BLAKE2B 9f37b9ff707ff93a4ffe6560a8e82eda1b0e776f235983b2d9f968a42361f575f5a9f50a20f9a17fc113c1763002abec4fdec091d54491066f0d5cd4ec4e9379 SHA512 dd5577c563207ccb7d903cd1b64b51518c1e665772d1f8f6ab15e2ddf22b51013936d349a07284d775c861c542b99b5caaf7ef0b3ab0b1bf4c1269996fa1ce80
 EBUILD cadabra-2.4.0.2.ebuild 2366 BLAKE2B c9422fb15e1f2893e314203e638adba06322fefe27cc64b836eb019b61d3a8b6b0d6507c0bb727690beecc5108bde9278e14f3508c4b461203600f6510ab2d38 SHA512 0269554029c028cb97d6bcbd9d8cb65e45d178fe57b7d69ac0ec0b7ac91b472e6c782c7d661a0196e156f7c61c7015053c02fe5578f309090491931915c62f2d
-EBUILD cadabra-2.4.2.ebuild 2366 BLAKE2B c9422fb15e1f2893e314203e638adba06322fefe27cc64b836eb019b61d3a8b6b0d6507c0bb727690beecc5108bde9278e14f3508c4b461203600f6510ab2d38 SHA512 0269554029c028cb97d6bcbd9d8cb65e45d178fe57b7d69ac0ec0b7ac91b472e6c782c7d661a0196e156f7c61c7015053c02fe5578f309090491931915c62f2d
+EBUILD cadabra-2.4.2.1.ebuild 2366 BLAKE2B c9422fb15e1f2893e314203e638adba06322fefe27cc64b836eb019b61d3a8b6b0d6507c0bb727690beecc5108bde9278e14f3508c4b461203600f6510ab2d38 SHA512 0269554029c028cb97d6bcbd9d8cb65e45d178fe57b7d69ac0ec0b7ac91b472e6c782c7d661a0196e156f7c61c7015053c02fe5578f309090491931915c62f2d
 MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.4.2.ebuild b/sci-mathematics/cadabra/cadabra-2.4.2.1.ebuild
index c3b86c9b872e..c3b86c9b872e 100644
--- a/sci-mathematics/cadabra/cadabra-2.4.2.ebuild
+++ b/sci-mathematics/cadabra/cadabra-2.4.2.1.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 3ebe891a571a..eb576f758989 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 435936ad24da..aab9e30e7d9f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -23,11 +23,12 @@ AUX lvm2-2.03.14-r1-fopen-to-freopen.patch 1306 BLAKE2B bba58efc587529f30e187c35
 AUX lvm2-2.03.14-r1-mallinfo.patch 665 BLAKE2B 2fdec28a0f889fe8f64b4c134c0b4a86a55a7d2a0dce90f7ed5e314dc89c4b94ec17764aea9307d5b45b89b700e5a89bf905ebdb4b7480d50610b26504cd7c32 SHA512 09ef2e8b3c6019d87e59dce2dcc00bcf243402c92559b38966e800a38ff24028962fcb96bbb1cb22228deb1a2c95ecfc079b1387523799daf477641f43669fec
 AUX lvm2-2.03.14-static-pkgconfig-libs.patch 4600 BLAKE2B 18fb5d69fb77625189539a64d4189b8ec5bc783ddb10e6e38033633b9a7049203264f0cd7b6c4b6c999c9767130f5da3526a805ffdb187c7aff98de592c11b35 SHA512 c2bc3b7b92bdfed028703a5bb57873c976978a6c84a409098828b96258b0fa349715bd2f140d6d41cbbacbfc34fc7c7901428e21716e04bfbf2d58847653c34e
 AUX lvm2-2.03.16-dm_lvm_rules_no_systemd.patch 780 BLAKE2B 8340f71fdf0c934dd8f6192628a58b9b2da5c27c5de48119dda7ce20c5ab9e4d3896e3412177f5e01a47a0db4bf58fc8fec5cfa7011690906bb749e989c268d4 SHA512 84f2612d17aa03ebbae55b7227a0ac934e94ad67341fee177ed3737c7a5e2e2a441773f4c3d7d8917c4a48bfac3ff385616c9eeaebfcca15d5c8d3fdb3b1899d
+AUX lvm2-2.03.16-readelf.patch 921 BLAKE2B 2d7d6f69d40ded9825b11cae265b5afada6124fbe8826afb4cacaa2a49b999f60a2ddb39fc86e238cda3a4dfba739b92f5e0fbf79dc154a44ee6158f3c8ec268 SHA512 6e20b4e438cc08f4027878feb011fcfc4c78391eeda56d0e93d056736378c824f4220910be70b83e4b69cf517c58ef3b078892cb5a82110e9e16bc7d5c68131d
 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
 DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
 EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e
-EBUILD lvm2-2.03.16.ebuild 9875 BLAKE2B cc65d8be2c66b54df3ce8c51f891556c5dcb553d676e34ffec85e73b1c02759846effb97ad31a7d075ab9f6e1ef85e93035235fd1d799e8a5ded90d397f37de5 SHA512 8a2a242615f9a26ff8e4e22e84fe61e366d64ec58ee9237c8422ddd76b6bb6920c698be82f00bfda4526bc79db8b8bdb1a9408a660e27f1e5de5f2700a332e45
+EBUILD lvm2-2.03.16.ebuild 9976 BLAKE2B 294ebc6d761ecd23a6f7f01c3ab782f8788b5a005a681d40c5cd294e109e2b850479acc62db04191e61c20f7c4cd44a9812071e8502b7294df87e3b1299fc256 SHA512 91fee7f723b24d1886db8f29b762a77e1eb5e67d2cb53f199b82b5a86624bf5511fdde1901363096b1a3f52921aa4742a636dc7959df07d5ee5aa640bfe35a24
 MISC metadata.xml 924 BLAKE2B f8999a0d015771eab5a4f84adac00267d7bd04b5890838e155e75208eb4ba0d8440db090b6fd877c34528fd89fd25bc68051f127a43c75af978f2fedcc9d787a SHA512 670cc840de3818ee976269902fc4ef8e7b57c38960475f702e9340c9e847a2121f92fcd58ea506e2907e4939b5596cdf72207a3a276dcfa1374be14530268c00
diff --git a/sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch b/sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch
new file mode 100644
index 000000000000..b4d60c5825db
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch
@@ -0,0 +1,25 @@
+diff -Nuar LVM2.2.03.16.orig/libdm/Makefile.in LVM2.2.03.16/libdm/Makefile.in
+--- LVM2.2.03.16.orig/libdm/Makefile.in	2022-05-18 09:24:20.000000000 -0700
++++ LVM2.2.03.16/libdm/Makefile.in	2022-10-27 10:09:29.283631020 -0700
+@@ -59,6 +59,10 @@
+ 
+ PROGS_CFLAGS = $(UDEV_CFLAGS)
+ 
++ifeq ($(strip $(READELF)),)
++READELF := readelf
++endif
++
+ device-mapper: $(TARGETS)
+ 
+ dm-tools.device-mapper: device-mapper
+@@ -71,8 +75,8 @@
+ # also the older symbol is built-in
+ .symver_check: $(LIB_SHARED)
+ 	@echo "    [CHECK] $<"
+-	$(Q) if readelf -Ws $< | grep -q dm_stats_create_region@@; then \
+-	SYM=$$(readelf -Ws $< | grep dm_stats_create_region@DM_1_02_106); \
++	$(Q) if $(READELF) -Ws $< | grep -q dm_stats_create_region@@; then \
++	SYM=$$( $(READELF) -Ws $< | grep dm_stats_create_region@DM_1_02_106); \
+ 	if test -n "$$SYM"; then touch $@; \
+ 	else echo >&2 "Missing versioned symbols in $<"; false; fi; \
+ 	else touch $@; fi
diff --git a/sys-fs/lvm2/lvm2-2.03.16.ebuild b/sys-fs/lvm2/lvm2-2.03.16.ebuild
index 30a41a0a959c..d3922e5152cf 100644
--- a/sys-fs/lvm2/lvm2-2.03.16.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.16.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch
 	"${FILESDIR}"/${PN}-2.03.14-r1-mallinfo.patch
 	"${FILESDIR}"/${PN}-2.03.14-freopen_n2.patch
+	"${FILESDIR}"/${PN}-2.03.16-readelf.patch
 )
 
 pkg_setup() {
@@ -162,6 +163,7 @@ src_configure() {
 		myeconfargs+=( --with-thin=none --with-cache=none )
 	fi
 
+	export READELF="$(tc-getREADELF)"
 	myeconfargs+=(
 		$(use_enable readline)
 		$(use_enable selinux)
@@ -184,6 +186,7 @@ src_configure() {
 		$(use_enable systemd notify-dbus)
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		CLDFLAGS="${LDFLAGS}"
+		READELF="${READELF}"
 	)
 	# Hard-wire this to bash as some shells (dash) don't know
 	# "-o pipefail" #682404
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 615820434853..2577826bd1f9 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index c6da6418ea0d..290a66c32346 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -14,5 +14,5 @@ EBUILD audit-3.0-r1.ebuild 4193 BLAKE2B b80c5342026738e6ca0c6cd3fc15970a636d78b5
 EBUILD audit-3.0.6-r1.ebuild 4134 BLAKE2B c66951f7b6352064199e019ddd3c3a1c4579866105839478ad361b3aa4109b1449aa7e3c38fbdaf14806c16a359154d6e8df1662558623c82e38c1bfd1ced8aa SHA512 17953316937cd12d5d37cfc37d5e58159f183ab422489c48859f586e675df806b9508eaa5a4166629d0a303fdf163b2a84f071c795501a9d9839b2ba02abc9ea
 EBUILD audit-3.0.7-r1.ebuild 4162 BLAKE2B 5bed15175ff989f34cc1a65981dda6e8550f1e395ddedf07d90b4f74e1ad2264c6f4d42b7881d295327152f59ee77422f036d9cd442e643fce8a94f10774564c SHA512 51fa4a90fbdd49c7c1d102a57caa8925551efc3ea87ae9f50326ee4f8ff71be500889f9657444ffe82eaefde6da4a9511d993090253b0aa77e8e30b2f1da55a1
 EBUILD audit-3.0.8.ebuild 4599 BLAKE2B efff1705308c4becea3333796ef1c9b3f95bcc10df383085b7faf4867f43e4d5ac75f324109a475893eedcf24cd0691e5154ff06dc9f828b7ed6b00d93b03206 SHA512 9de53cd51187216f01efedb8f0701630fe8bb292359a5aa649745bcbb5c71fe23a032c1b54d9804c3ac0c9fc36b724c37b71d638600f7355d0ab7b12df891905
-EBUILD audit-3.0.9.ebuild 4604 BLAKE2B 6af96e8d798c8381908230070fb3a8a5bf3f657afb8f70a5bf0e79f3fad5315abea66a79ec4b20ca96ead4d989bbda8b239360a611ff23178aa81766d9090cda SHA512 53bdfe078c72cb197a7831e905b114fac417abea473f3c754786636c48acfec492a5a45667c7a7265e4c7cfcbc1b5bc0096c18020fd1c154ec3b0c8ed5fce584
+EBUILD audit-3.0.9.ebuild 4598 BLAKE2B 9450e469eb6c89626936f1718b7ac3a4f7235d5b7dcc47e6326466891626266f21d10e3ffbf253b36296753bafdf102304ea603ab99153653514b1bc5b230352 SHA512 468d7beeb88984949e5395e2d74c3b7489c4047129f226b4a4ff8fa21fc42269c00ba8dd1096ecfce11d58472109263bc7054e2fce971e1b471f83d361763988
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0.9.ebuild b/sys-process/audit/audit-3.0.9.ebuild
index f681e7805fbb..7fde297d24f0 100644
--- a/sys-process/audit/audit-3.0.9.ebuild
+++ b/sys-process/audit/audit-3.0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="gssapi ldap python static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
author	V3n3RiX <venerix@koprulu.sector>	2022-10-27 21:58:13 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-27 21:58:13 +0100
commit	62082029157d2ef97a43e34ce34a55877afa8a58 (patch)
tree	7ae84333ee590b9c0a99459888f508b3727849fe
parent	3cafd803b6d89f6e823358a8d7f4a97e6d0629e1 (diff)