gentoo auto-resync : 02:09:2022 - 16:16:41

178 files changed, 1649 insertions, 907 deletions

diff --git a/Manifest b/Manifest
index a1c5a3c1fec3..1a89d26acbad 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29610 BLAKE2B 1963953e8e9b79e9df196689fd78e9fe2f9a43b62eecda85046fdc62d9e11a32bf2989d6bff8af650f8d1ceb86a9b1144f0f3623583fa6e944c7bfc165131048 SHA512 a893ec5df957b2b4032bfdb0d584b04e5ec789f5f3d4ddb7c1d4bb0c2dfaca100660303b5fc051475cf4b95d547260d66bf575c40c49c77ccb0eb5257403bc4e
-TIMESTAMP 2022-09-02T08:39:48Z
+MANIFEST Manifest.files.gz 29636 BLAKE2B e169a7e427c07284818fe6c84fabff5b96b7c3ba4e578d5a56b563c00eea90361441fc32ccb049f993f5250318e21c7bf5ff132bd1a17d07d30d1038e7086a8f SHA512 91ff2e10475fd6b523d5ac1b278bb008c43aa4f96a2651379916f02e9badaa3444ddc6bafc9e0c882d6848a0da3f44dd71915a090a0a37e2b2ee341940bc4be6
+TIMESTAMP 2022-09-02T14:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMRwVRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMSFbRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDf+Q/6A9O9vJXGed0RspcaD40QZueHmFoIJntwpmDtgZwc2kN7uPW8a81njL9k
-Q0VH+c6fK2nffS0xvfnFGkamjbc3NULm34IGXCS6tPYXj0mvMNebd+TkGdjEuMso
-e3FcVbIBEW5FIwRYxBXxRF6Iao7nzdD/Ck12QN2GGoOdrIwRui10k7dYWhni6DlR
-gueTrxdO2UjOiDRkfDPoB+kIFTVSOnmJr57v4LYANWCaFEVX/gVsju7vGEk+jzbp
-/c4Mi9to3Dj8676QKnd4QaJNvtyUMoaM6V17OTCnR6WGo61WDgFDfZBumNW628FB
-tETMBYMn/CuQzdAUT/PCQEog/oCdAFuKO5Lfjxs8UxdrDqoXwjpYLqhU1CoBvPXP
-OR9zVMm3XAEi+NG3rgu9vNQ0ldLLNGqfNuFJLuRzYA3sFvwkNtF8aQ0bmg9GakcZ
-+VoUq/ttoaX5vX/ehp2vUPUTia0EDlvkeN4AVCaWYStLPJ538gkphf/0ag3EAowo
-7asEM9BolDC81XDeuIw4Acwz68A3Iq1oH3HrY1i75JYcgyN4bDh7Xt+8EbCIFpXQ
-AIPMks0W4laHK19UJff8JIeE+ZC5TQMP7SIwPZ2VbJb9Zf+SKnpANe5mgCBl4T3V
-+2fCQWylF/CN6QilYSn/QvmtycIlfzcg1cGZ9nCRYaD0u9a9pt4=
-=8ZCd
+klDsyA/+Npex8MBYQUUgvzmbdRA04NlGoGVJsSkWvQXwyG6vHKHHDPW/T3W717Y6
+r81taOypFRnaQ7AB0Hk2ug7yS2VHi/1wD7uNeXENoHGzy5obLWj06q/AHdYoqv2X
+8AIUpw/9o0dTf3WUyBTZktLw7un2TWLpz/ZiIOkS+eNlO9tiBeNVJZPjAdfBLg8D
+vQI3n+NtqRrhBa17w5OgZUT2AXmrJX6jCQI9LLBTaPh2fnmJGJ0wHyR7fKDByFJ8
+14PKv8GhDU58IFfIteE7tpacpmuR1oubRQHyoxZR8cegKNjNqwa/110LsPDI1u85
+cssaZOlxmQ9ebTVuFw4WoZ38wPXrgd8hahXdA19HkGtVLwUm/5/H5yJnoER3hNc9
+3EuPZSQr5J8eRQcXmIlMl8g1LPz34G6qEvWZC/qkVQnSofqZaG7tydv0htM1LNj/
+k/oN3Nu6iEZbvacNV6MHaqw/ZY7Tv8gxx750d2tfUw2ro+ebCnoOL3d6Tu9LG+iA
+2XX54bDdF9bB6J1a7zbpS9uJB2w8kBn6UqQku85YAwx3PgjjGpjFydsLGnIzT5LO
+DRfPYogh3UFhPahPDu/t9DSklmGGU+W6xfc8z00bX7NTaZ/z1ps7ix9IXAke0VWr
+XtTyg9K/dRXqMrMYI2PvOXEug4wHmUGhLFZiRKRZM7lQp4gK+ro=
+=n6Ya
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d872283c8e4a..964e663736cb 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b57c1b37b5ca..5ff5b9bf9bed 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
deleted file mode 100644
index 7be189e72ede..000000000000
--- a/app-admin/ansible-base/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
-DIST ansible-core-2.12.7.tar.gz 7756456 BLAKE2B e9c5b446fbd80524572646667875afa26a28cd6f8a0c138383ef2af7fe2e51ba5dcbb19bdbb00e7e367ba78f9667be0b03320f887367dc5cc3d18cfc33ebf89b SHA512 15b29bc52cbcd690d442e4923bad23c2b4db34b1d9af9a7e3a73fbad6b4d775795a44df80c739ad409206767f6bc9efc3d5abdab593fb2abd6ba991ca8cbee67
-DIST ansible-core-2.12.8.tar.gz 7760983 BLAKE2B 9050033ca76f7f3bb6d5043d58e7a4b2473ee1eb21b5665654e5a571e8ebe408897661ad0f13c4f4b0d1569c1df904434cc4911e1b561b229d8ab16109127930 SHA512 1bb30dba44f11b0655000350b54cae30b85258dccc130d5cd2b1a5c70e0ebe93abd8fe41d5830da34b6fe622276f69f18a0f47bf9d0b0269338a7efbd5820e44
-DIST ansible-core-2.13.2.tar.gz 13332205 BLAKE2B 446421a6ab86e1edd1087506c48b8d7eceaaa594a0c866fc3639c4b5a3809b4e5a7d39feb94a56be112dda585994291e07194f7e3392d0dbe6e088cf7327b9be SHA512 a57cf0388c0866b30513a84733208b85b5d352755e884021ec5120f32b5b76d751f9f03320336744d925f69f6b35064eb58081029f49f7987b9a877913c3c29b
-DIST ansible-core-2.13.3.tar.gz 13924100 BLAKE2B aabb87a327f2cd4b3a8f8a30d00b09d50ddf05bbd8720e446275004ba98e87bc1de513dfaedf9ee617c77235c92f171b590295ca8a92d03f47829eacf39e7cb8 SHA512 9be80d0dcd10d012c871b5c95b2357430dfa6809bff794158a4ae06a40761c01db60a966115d7a9141028c96d79a1d99d6bfb191788dc1c467dd0107dba7058c
-EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
-EBUILD ansible-base-2.12.7.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
-EBUILD ansible-base-2.12.8.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
-EBUILD ansible-base-2.13.2.ebuild 1649 BLAKE2B 1da2acd0074a8055f58bbc07ef6db49b8901f9261fb6466a6c37c229111a74513bbe1f21c2d22ecc4d2c0a7554fec997845df268b3eb8572830a25775ba493cf SHA512 ff174eea7a471f473a8c8d6ff7ace6bfcc877e0b1903628657909ebbd16477f410bb2a386e30ab1aa3897ebcdf76be1a4ab7f38314ff8c54450cf777ff537786
-EBUILD ansible-base-2.13.3.ebuild 1652 BLAKE2B 4d62ebd585cd7226ce888c7042bb256b3bde16d22af4b61a25004c0a68fb21fea5f1d781e1e779de93a767263b01e33d78d1c73c57c1c85517f46dce4a5c5e57 SHA512 1654e03cade0cdf01b8294590e4bcb589a019d031b3f5278f05945e87a0b2dcca5c5000873de5ddba870230380085d95fe1a017be8649b725ffb0ce5e2db9975
-EBUILD ansible-base-9999.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
-MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
new file mode 100644
index 000000000000..c4ccca171659
--- /dev/null
+++ b/app-admin/ansible-core/Manifest
@@ -0,0 +1,12 @@
+DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
+DIST ansible-core-2.12.7.tar.gz 7756456 BLAKE2B e9c5b446fbd80524572646667875afa26a28cd6f8a0c138383ef2af7fe2e51ba5dcbb19bdbb00e7e367ba78f9667be0b03320f887367dc5cc3d18cfc33ebf89b SHA512 15b29bc52cbcd690d442e4923bad23c2b4db34b1d9af9a7e3a73fbad6b4d775795a44df80c739ad409206767f6bc9efc3d5abdab593fb2abd6ba991ca8cbee67
+DIST ansible-core-2.12.8.tar.gz 7760983 BLAKE2B 9050033ca76f7f3bb6d5043d58e7a4b2473ee1eb21b5665654e5a571e8ebe408897661ad0f13c4f4b0d1569c1df904434cc4911e1b561b229d8ab16109127930 SHA512 1bb30dba44f11b0655000350b54cae30b85258dccc130d5cd2b1a5c70e0ebe93abd8fe41d5830da34b6fe622276f69f18a0f47bf9d0b0269338a7efbd5820e44
+DIST ansible-core-2.13.2.tar.gz 13332205 BLAKE2B 446421a6ab86e1edd1087506c48b8d7eceaaa594a0c866fc3639c4b5a3809b4e5a7d39feb94a56be112dda585994291e07194f7e3392d0dbe6e088cf7327b9be SHA512 a57cf0388c0866b30513a84733208b85b5d352755e884021ec5120f32b5b76d751f9f03320336744d925f69f6b35064eb58081029f49f7987b9a877913c3c29b
+DIST ansible-core-2.13.3.tar.gz 13924100 BLAKE2B aabb87a327f2cd4b3a8f8a30d00b09d50ddf05bbd8720e446275004ba98e87bc1de513dfaedf9ee617c77235c92f171b590295ca8a92d03f47829eacf39e7cb8 SHA512 9be80d0dcd10d012c871b5c95b2357430dfa6809bff794158a4ae06a40761c01db60a966115d7a9141028c96d79a1d99d6bfb191788dc1c467dd0107dba7058c
+EBUILD ansible-core-2.11.7.ebuild 1565 BLAKE2B 5d203f0e9ab504055997f86ef7b74139d2e667c937d33c6e50bf9a9b807ca509f3c3238f77b75cb95c22a806be53e947f2dcaebdc1f2427219a427916580301c SHA512 c0ee9fa9ddf8a6986c70ca68fd098df44fe82dc9cfe1529b18ca147f823a0f0bb882a852c80de7477d3591993fa43af94a8803b8a5c0f9591f18654cde3c2175
+EBUILD ansible-core-2.12.7.ebuild 1566 BLAKE2B 4b333bc88f164266edcd445d164e6922391ead51481dff3bc2513c573dd5abda37ebf6fc10cca09252b596aa67b617c8ef39b5e7e2fdda4349a85eb4d6014a58 SHA512 1182c8ae87094dea4aace7814de9f81829c65368b14ef1adcbf302190a65d2c1b7569b29a96b2ee402cbf11d833e2c59c4368206cfb7503193e6aece3be54b02
+EBUILD ansible-core-2.12.8.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
+EBUILD ansible-core-2.13.2.ebuild 1566 BLAKE2B 333dd45925b7d542a746ea2a1a05d80ef7f291d78c896d962560a12c3ab3035f08394d322fed3eb5f23282d90e6d6019fad54143f2a30be9d709329b91fe35fc SHA512 39af1ac9400fb71dcb7a1a19bb6daf388da14112f9e4119efd4d05a6207bee63bb85e005d70e30caa885fa0953aa32ca5ab0dd22fc26d63acd233955e9e30446
+EBUILD ansible-core-2.13.3.ebuild 1327 BLAKE2B 4d44adf3a972103182afd5b227ccbd839b79a2f40f911c0c724b925c0051f2b99bcf0781d9f1f46f621b37639d91d69869bb4b38c42499b3fdaac6a02bafa2af SHA512 cbb0678d3bbbf7cd7a0040bd2836a948bc076bc460bcee5ee01286e89b3512f80f5bfad8280ace7732ddc0a215db5a9baee9a96d192adb43a538a26a22faacf6
+EBUILD ansible-core-9999.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
+MISC metadata.xml 1040 BLAKE2B 35be7c8b41af8b3620c1d14191642ead43cf9b581bf4e9c903618c7644d1552400628759b50cb87174c29efbeaf5ad6948b93ec0e48048723b86dd411c545a9d SHA512 28dbbf4db72f0c97b7e95f1cdef8e8f08d0f1eb36b7c045991364aa0deeb93cc422a55922bd8ca3f86551dcf24b8dd5532c5a083ff4e88b4eaf579c706039214
diff --git a/app-admin/ansible-base/ansible-base-2.11.7.ebuild b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
index 3b6b3c0d41e6..e84226ab4437 100644
--- a/app-admin/ansible-base/ansible-base-2.11.7.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.12.7.ebuild b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
index e8c2a3cb1c45..aebbfcec8b52 100644
--- a/app-admin/ansible-base/ansible-base-2.12.7.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.12.8.ebuild b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
index 06d9ba54c027..10e608c937a9 100644
--- a/app-admin/ansible-base/ansible-base-2.12.8.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.13.2.ebuild b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
index 20a3a7eaa8dd..49cb6548905c 100644
--- a/app-admin/ansible-base/ansible-base-2.13.2.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.13.3.ebuild b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
index 87c538eaf16d..3655837bc68d 100644
--- a/app-admin/ansible-base/ansible-base-2.13.3.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
@@ -16,16 +16,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
 RESTRICT="test"
 
 RDEPEND="
@@ -42,23 +38,16 @@ RDEPEND="
 	net-misc/sshpass
 	virtual/ssh
 "
-DEPEND="
+BDEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+
 python_compile() {
 	export ANSIBLE_SKIP_CONFLICT_CHECK=1
 	distutils-r1_python_compile
 }
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
index caee1ffe1113..10e608c937a9 100644
--- a/app-admin/ansible-base/ansible-base-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/metadata.xml b/app-admin/ansible-core/metadata.xml
index 3f94edf04c28..92fba0212508 100644
--- a/app-admin/ansible-base/metadata.xml
+++ b/app-admin/ansible-core/metadata.xml
@@ -10,7 +10,7 @@
     <name>Patrice Clement</name>
   </maintainer>
   <upstream>
-  <remote-id type="pypi">ansible-base</remote-id>
+  <remote-id type="pypi">ansible-core</remote-id>
     <remote-id type="github">ansible/ansible</remote-id>
     <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
   </upstream>
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 01e4f271393b..c0382d9f31e0 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -2,6 +2,6 @@ AUX ansible-lint-6.0.2_test-module-check.patch 689 BLAKE2B 69152c8799165f8efcf44
 AUX ansible-lint-6.5.2_test-module-check.patch 1090 BLAKE2B 1fa06ac57a978c75744224f20e5dad1917a96c7716273daff72b025bd8696cb8ed960c1c7ef464278da0f8b2e99146d99e0194fdba3fdde8fff62b6bd86ff2f3 SHA512 8f6cc1a3b9522a1584fd7ae5b1f2d7b1d1295f4cd0fa286d3d917bdada355f06b5eb46cf3f7fb5f6e7410c489e1de56ac4b2f10553734a2e592bcc2594b60336
 DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df
 DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
-EBUILD ansible-lint-6.4.0.ebuild 2627 BLAKE2B 87d358b1580e5bc7586a9860c01df38d5e1f6ef4d3e9d880db97b114a3b66a4896b1b2edaf8fc9116f395d637866b6b21e4da1527cf084a5c481639e469fc0b7 SHA512 270a28e69675fb39c85f1b927ed4a7998de4f4725b9d6ebb5e5a1e570bbeca06d2886c76d6993f74254ea8885166521c07be59043929160b8318b3d38ca42f9f
-EBUILD ansible-lint-6.5.2.ebuild 2713 BLAKE2B b0cfafaa7112750c0a29cf26d9b3ba49a8893df7b1b37a05d21ad5ee9d736670722009b03756a6a4068d4a3d1b64e3190fe759ff9485b96bff587542132fa4b3 SHA512 2e09635aaf037757012370a8ed935b53598a3d3ea2b42cec547a4623673f061cd823357ec2e4ce2d6111e9a07119836fc43a0d83b043be19ae44617e9fb50cf3
+EBUILD ansible-lint-6.4.0.ebuild 2627 BLAKE2B 950efcc8376d6619ed27c8c95e07f805039356e625bf0eb4a3eb3ec7c620ffac19bfc383bd1441f84c5b7df042603a2ce104f633484f4abc7a3c12064c10327a SHA512 0cfbe711a7eb278d9db6b38295e07768fbf90e8fc23206c5f1aaf4ccbef33fa06fb233227ff1f82386746837682a9b6c07112d60e6551cdaf4f08326267c4341
+EBUILD ansible-lint-6.5.2.ebuild 2749 BLAKE2B eb63cfb774f451e410ad1c5ae5fa3be86f5d63a59fc7524262816150bfadd7378aa901a65d91b63cfc1f20f87acc9c1b537cb8bcbf4c7568541a4034d400c192 SHA512 2d33e1edb4d6c7bf69724689fb3787edcfe4d117a420dda3bdb187e91df3f0d32e522854b59f4ce3a5ef632b7d711ae0e13d8f1557d54c400455728536954364
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
index 071feb3061bb..bc3e252daa8c 100644
--- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
 	>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.8.0[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
index ba4605d1720d..71e510a4133d 100644
--- a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
@@ -18,8 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
 	>=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
+	dev-python/black[${PYTHON_USEDEP}]
 	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
 	dev-python/filelock[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.9.0[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index fd43be82ac17..5fa028d6b975 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -3,9 +3,9 @@ DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd
 DIST ansible-5.9.0.tar.gz 36756162 BLAKE2B 4c713f0a45536aadbd20451c5b5ac37b474cb1d1f9fbfa6031b228a549bfd65e1ae0ee76d6fcd08a0de43d7d07eaebf90d08d00764acad438bcffcdb09c5d58b SHA512 88b26b1ba59a39370ee4a27eedda441d6e6ce8ba8eb857353572c692e49b189e95ed80e5063917c52799fb15bc3608d4c1ada013a7d650909714ca8ea5dd3bbb
 DIST ansible-6.1.0.tar.gz 35074113 BLAKE2B 4468b7f2ecb93229c92f2d32ce2821c836164ae5281f69c2fef01026a3424ba13e1a0bcefb7c658857546e7bb96f58377b613c4b4eee1828e005bb7328bdf796 SHA512 795d3534d6993bfbf5d4cabed758f9370760e14e851123b4578c3aaf34f104a52f6d57d641ccbe6f18ba036bd9245b0898e76a21671ce95ddceda9fa5305e2dc
 DIST ansible-6.2.0.tar.gz 35390078 BLAKE2B 1e7a5f69e837fe3ec383ee3f1d631ad7ecbd502e582752edef85b3e2841b38ba78af1e7f080b4da007283291d487e481141bc4261b351f48be45874a3399789f SHA512 7e0751fdedef6bd92a01c06e23dd482bb4b4795ef5a17754eea8f8297cebddb84b4d20041affec6589297214cd820cddaea4618d2f3a158daebb556c4a87bdb0
-EBUILD ansible-4.6.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
-EBUILD ansible-5.10.0.ebuild 705 BLAKE2B 3aff5e97267d1d1bfeb1c51ea3c1bf6602434de0695fb7da8c995146e626fb4c817c6a86bedd5328ac25665ed511668408af652d54c25b50e4b9f55090960ae8 SHA512 3adcec18ad42c9d3edbad2ef586ea45eb15216072eb6ad9a90ec0aeed6c5001e73f43a73b0cb74138e0eb2481485a01440ceae22ec666f4cd97d5bcd067e3ca4
-EBUILD ansible-5.9.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
-EBUILD ansible-6.1.0.ebuild 702 BLAKE2B a584b2c5b9bd2e2d724e3d712f057b1f2412ae946e13be2b2a31d5e84936ba7cdf606978f776e916fbac0bad0f7f83d3dc0b105707238d9baa03747d32df663f SHA512 b33993cfc1acea190319e1f37136dfaf11f29c8625b90f3710062c3df4c3d3fbe1dba91a946511ceab755e709d697649c14a34522956457cd6c142a2ae9356e4
-EBUILD ansible-6.2.0.ebuild 705 BLAKE2B 09a68de4d26fef9b7bae56b435b64aed0c28ba9ee5c45aa56e2a9b314124b9fb14af0b6d3c9acb6a986c07902aed68a7ea93e092f1b862e61d00cec1ce13c1fb SHA512 23566e58957aaf63da622a5cf7b92c4f289910710c0d2a326993e90011e31245665a4d26787fea38a5f298c0ec4064f4d4594e0986ea404e765b95b267ff1279
+EBUILD ansible-4.6.0.ebuild 701 BLAKE2B d484948763f9511dd75724514873b3b0823855ce3c05e136ebe72d0dbdda4297faff6f8c1c4be0219b373683cc0e208413888b29469daf018e94730cca7bfa4c SHA512 6f5d5560e0fa042bf889ca44a59346184a11e44c7488ff73d04f4c71f7b95e35a5032732fc08ea9b1e0c76f0ed68a2c844fd00a994d4712369e9afcda415e3ec
+EBUILD ansible-5.10.0.ebuild 705 BLAKE2B 8dea9f4d826f3ad9a800baf85fb260f108292363aa36baced586a93ee8fe3ab8f1c10b70930af5f76a587b850352be02cd673316125e1835b106ba0d16cc81cb SHA512 0cd934d03aa4ff05fe2ebdb8acbd57511dc7e203a8d8c1c4095e32281774419f48ae17698b8d9e0bce3c6ab624dd56ba194b1dcf410309980067e3c849884af5
+EBUILD ansible-5.9.0.ebuild 702 BLAKE2B 3d91e2541f6063cb2e6df89ecfec63e64609eaf9e3fc9fb08e0076d73899551734a05a64ca04234caa4bacf2ca95e3c766a2af5005c79c496af2a46020c7110e SHA512 5236c7ab0cce12706e5346084ba71e2fbf49d8be58b6164ed9b7312dcf1027826b6ceafcc22f380b08c4f180df2eb93a2f84d734af92272b2b246111cf1fe507
+EBUILD ansible-6.1.0.ebuild 702 BLAKE2B dc067c720b6c3d45410c5b6424732b0e19252df632d4dbbcd91161002f513bd8d0dde1b584e7a1c1866d96143ebb82e32178a20ae92ce59e1ce0f18ecd909af1 SHA512 813cfac12fa7b23a466d5ee20d12cfac0cd95181e4b58d80a2bd228e624d7ab921de521324bb5aa72c73fc409d8067dd3c6daaed24aac014dd4cc8195d2180ef
+EBUILD ansible-6.2.0.ebuild 705 BLAKE2B c01b5eecd57078d7c34c1992a5ade3d72f941bc14ee3bb1a88d3731f72aba08643bb53df826cc6c184100d404d2331f136d52a0299c1df7b1bce7cc692ef6842 SHA512 813a49b0388a0560e828a1bf26d9093dafaa5faf71317b0f60dfe1f044ff96b0acaedfbe086bb017b0199b0f1770a2f9d307a212633524ab6f17d00c02f84ea4
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
diff --git a/app-admin/ansible/ansible-4.6.0.ebuild b/app-admin/ansible/ansible-4.6.0.ebuild
index d96231433bb4..a932683ff21d 100644
--- a/app-admin/ansible/ansible-4.6.0.ebuild
+++ b/app-admin/ansible/ansible-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.11.1
-	<app-admin/ansible-base-2.12"
+RDEPEND=">=app-admin/ansible-core-2.11.1
+	<app-admin/ansible-core-2.12"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-5.10.0.ebuild b/app-admin/ansible/ansible-5.10.0.ebuild
index 999bc1a1edb8..10da86624659 100644
--- a/app-admin/ansible/ansible-5.10.0.ebuild
+++ b/app-admin/ansible/ansible-5.10.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
+RDEPEND=">=app-admin/ansible-core-2.12.0
+	<app-admin/ansible-core-2.13"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-5.9.0.ebuild b/app-admin/ansible/ansible-5.9.0.ebuild
index 21e85e45cd01..187c0ab3cccb 100644
--- a/app-admin/ansible/ansible-5.9.0.ebuild
+++ b/app-admin/ansible/ansible-5.9.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
+RDEPEND=">=app-admin/ansible-core-2.12.0
+	<app-admin/ansible-core-2.13"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-6.1.0.ebuild b/app-admin/ansible/ansible-6.1.0.ebuild
index 162e798cc5b4..2117a72eafcb 100644
--- a/app-admin/ansible/ansible-6.1.0.ebuild
+++ b/app-admin/ansible/ansible-6.1.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.13.0
-	<app-admin/ansible-base-2.14"
+RDEPEND=">=app-admin/ansible-core-2.13.0
+	<app-admin/ansible-core-2.14"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-6.2.0.ebuild b/app-admin/ansible/ansible-6.2.0.ebuild
index 6edb26b0dbf7..cf0da827da5f 100644
--- a/app-admin/ansible/ansible-6.2.0.ebuild
+++ b/app-admin/ansible/ansible-6.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.13.0
-	<app-admin/ansible-base-2.14"
+RDEPEND=">=app-admin/ansible-core-2.13.0
+	<app-admin/ansible-core-2.14"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e929fab2ce9a..a1d1f73b0166 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 6f8e6d7f2b55..f789f2bbe310 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -22,11 +22,13 @@ DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
 DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
+DIST xen-4.16.2.tar.gz 44995249 BLAKE2B a221d1e4578ab6eb3250754b3b0f36fb30133c1c83246532ebb9648c3d025b3f5132227371b5d3dd82099594f4ee738227480528ee944b8de6231d9c89892d15 SHA512 b6cd036c1073798dffa167ca14c954fbdfb4c0ef99662f7c435e7e5de687d1bde8856ff6bd030d0d2e661bd17ab631551f01b2cc728cad7e70b59aaa6e692783
 DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
 DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
 EBUILD xen-tools-4.15.3.ebuild 16673 BLAKE2B 5564ae42258c6eb413b4b29730d6fa5823f4479dd8b483d2ef093ab1d1ae9e234d3b42bcfd1fdb1667f0584604cc54fcef76be6f2bb03e862fc8302053e89999 SHA512 9c774445827cca9995f488e1bd5ae37a6a3402774e45c62a984fc3331ba53f5546f664504fb487474e4dd856f541263dc1de1ffbd909b6a1318db24916e0dc65
 EBUILD xen-tools-4.15.4_pre.ebuild 16707 BLAKE2B abed0efd8aeafa933f1a94edefa27dcb0b0e4ff9537639742a4d492174ab14dd612329b125cdd561c5ff0b72d710c6d553ef8f1dde39824d24840271c9197bd1 SHA512 8c90c61f52e76b8d4ad2db5eb43a98f61868cf8dbb49bfb5bef3148368166191066c1874c7889ab5db6c92520b99fb7ac7fbe604592cd5025c08cf2677933ad7
+EBUILD xen-tools-4.16.2.ebuild 16190 BLAKE2B 834bdebc9fa33ff472f464f43fcdcd5d79702d0dd2763198e3edcfdb365f91c9cba4fae40f7a7dcefded1cc5f878b86b970d028859d5172bc07c6a495a3b91a5 SHA512 703947a7722cd40f8cbb7e9fffdca6f08c9042302aa179c78360cce7a39a47e118c5c4400a60f3b135f9a1c12922022524b07ecfa4b015507843e5cf2c99484d
 EBUILD xen-tools-4.16.2_pre2-r1.ebuild 16148 BLAKE2B d53626119e8f6f6efc44635783acafeeea3ed1ada6ead928abac6a0444bc2b47c45c521d4690c4c42829ba54db008fe9f0fbfc71b3084a3e091ced94ff7157a3 SHA512 08c2b6cac8fabe23073e519a8168178b7b60661222792b3556c12817612b40bdcb7376ea228b9b848fb765ff8865af36b8eced1e14f97ac7ae616e722bb4bf20
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2.ebuild b/app-emulation/xen-tools/xen-tools-4.16.2.ebuild
new file mode 100644
index 000000000000..d11d5925ee1d
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.16.2.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+	SEABIOS_VER="1.14.0"
+	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
+	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
+
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_GENTOO_PATCHSET_BASE=4.16.1
+	XEN_PRE_PATCHSET_NUM=
+	XEN_PRE_VERSION_BASE=
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="
+	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+	)
+	"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org"
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	lzma? ( app-arch/xz-utils )
+	qemu? (
+		dev-libs/glib:2
+		sys-libs/pam
+	)
+	zstd? ( app-arch/zstd )
+	app-arch/bzip2
+	app-arch/zstd
+	dev-libs/libnl:3
+	dev-libs/lzo:2
+	dev-libs/yajl
+	sys-apps/util-linux
+	sys-fs/e2fsprogs
+	sys-libs/ncurses
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	arm64? ( sys-power/iasl
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		dev-util/meson
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		dev-lang/ocaml[ocamlopt] )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+	# collisions with app-emulation/qemu.
+	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+		tools/qemu-xen/include/net/net.h \
+		tools/qemu-xen/meson.build \
+		tools/qemu-xen/qemu-bridge-helper.c \
+		tools/qemu-xen/qemu-options.hx \
+		|| die
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	if use ovmf; then
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+
+		# Bug #816987
+		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
+			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
+			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
+
+		# gcc 11
+		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
+		-i config/Paths.mk.in || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	# disable jpeg automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
+		-i tools/Makefile || die
+
+	# disable png automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
+		-i tools/Makefile || die
+
+	# disable docker (Bug #732970)
+	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+		-i tools/Makefile || die
+
+	# disable abi-dumper (Bug #791172)
+	sed -e 's/$(ABI_DUMPER) /echo /g' \
+		-i tools/libs/libs.mk || die
+
+	# Remove -Werror
+	find . -type f \( -name Makefile -o -name "*.mk" \) \
+		 -exec sed -i \
+		 -e 's/-Werror //g' \
+		 -e '/^CFLAGS *+= -Werror$/d' \
+		 -e 's/, "-Werror"//' \
+		 {} + || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libexecdir="${EPREFIX}/usr/libexec"
+		--localstatedir="${EPREFIX}/var"
+		--disable-golang
+		--disable-werror
+		--disable-xen
+		--enable-tools
+		--enable-docs
+		$(use_enable api xenapi)
+		$(use_enable ipxe)
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
+		$(use_enable ocaml ocamltools)
+		$(use_enable ovmf)
+		$(use_enable rombios)
+		$(use_enable systemd)
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
+	)
+
+	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
+	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
+	use amd64 && myconf+=( $(use_enable qemu-traditional) )
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	# bug #845099
+	if use ipxe; then
+		local -x NO_WERROR=1
+	fi
+
+	emake \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		RANLIB="$(tc-getRANLIB)" \
+		build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 8cef782a9ea8..f0d7d7fa0c0d 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,10 +2,12 @@ AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf
 AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441
 DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
 DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
+DIST xen-4.16.2.tar.gz 44995249 BLAKE2B a221d1e4578ab6eb3250754b3b0f36fb30133c1c83246532ebb9648c3d025b3f5132227371b5d3dd82099594f4ee738227480528ee944b8de6231d9c89892d15 SHA512 b6cd036c1073798dffa167ca14c954fbdfb4c0ef99662f7c435e7e5de687d1bde8856ff6bd030d0d2e661bd17ab631551f01b2cc728cad7e70b59aaa6e692783
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
 DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
 EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
 EBUILD xen-4.15.4_pre.ebuild 4679 BLAKE2B 8315ca4a195503e25c8ee6dfb693dae124e100285841ead6779a56cfb99500736a0ea53601fd6fc34d2e9381c9dc663452a95cb6370f8784cd45c877dea443a5 SHA512 352f9732a7f9181a52e3ba3296129142c3810325bc1322251afd08111cc4b4aac6b7a8e1ef87d80da83a9cf0d09e0f20a329338db9479051524829ba97a81bfd
+EBUILD xen-4.16.2.ebuild 4413 BLAKE2B b9603ec01227513d2c281cebe0e5bc645a3b420490b509ef55e6ce8c3b33296405e32ca6db3b575bdc613554eaca97a2f226f0a63bf9ee60c3df8fb114f474f8 SHA512 25c4c54bfe07f913c3b33b22ea58bb415b6dcb7729c823e649f3a6870caa3268059630554a26bb31de5ab7c47155491aaf96bf39b216822d362c3486caf6a012
 EBUILD xen-4.16.2_pre2.ebuild 4374 BLAKE2B aabd1a33483bf9594e5c101a20f070357926abb4ac489c3767f0e2412371cfa9937d5c0eba0a061a8c9e3aee74a37022e5bb235e821982fea02f848ac06f3035 SHA512 62a2817fa2ca7a0dc7732db48322e29ed54a81ebeb4a21745b34200ca6b83514b428a5970761f1519559b6045885c8912f452908a451352b42b421caacd9cf06
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.16.2.ebuild b/app-emulation/xen/xen-4.16.2.ebuild
new file mode 100644
index 000000000000..108e94c663c3
--- /dev/null
+++ b/app-emulation/xen/xen-4.16.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_GENTOO_PATCHSET_BASE=4.16.1
+	XEN_PRE_PATCHSET_NUM=
+	XEN_PRE_VERSION_BASE=
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+boot-symlinks debug efi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )
+	flask? ( sys-apps/checkpolicy )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Symlinks do not work on fat32 volumes # 829765
+	if ! use boot-symlinks || use efi; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
+	fi
+
+	# Workaround new gcc-11 options
+	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+xen_make() {
+	# Setting clang to either 'y' or 'n' tells Xen's build system
+	# whether or not clang is used.
+	local clang=n
+	if tc-is-clang; then
+		clang=y
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake \
+		V=1 \
+		LDFLAGS="$(raw-ldflags)" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		RANLIB="$(tc-getRANLIB)" \
+		clang="${clang}" \
+		"$@"
+}
+
+src_configure() {
+	cd xen || die
+
+	touch gentoo-config || die
+	if use arm; then
+	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
+	fi
+	if use debug; then
+		cat <<-EOF >> gentoo-config || die
+		CONFIG_DEBUG=y
+		CONFIG_CRASH_DEBUG=y
+EOF
+	fi
+	if use flask; then
+		echo "CONFIG_XSM=y" >> gentoo-config || die
+	fi
+
+	# remove flags
+	unset CFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+
+	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
+}
+
+src_compile() {
+	xen_make -C xen
+}
+
+src_install() {
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	xen_make DESTDIR="${D}" -C xen install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 4899d379e0fc..358779361bb7 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
index 98f2570180a5..db46c7727cf3 100644
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -1,3 +1,3 @@
 DIST tuxedo-keyboard-3.0.10.tar.gz 50759 BLAKE2B 08fec486f6555ff5b8de6b1ea49ce504747238284fda31b05686fd5955bf3bb3fc48b49c40b50c1bbdfcbf4af2f206a99f645b294ebceafec4c87751fd460090 SHA512 a3c5b74fc5587763f131a66f507c0b33d462ed87c8e05391152c09d1425b5e1771bfb08cc2d1e3bb73b02074f503d866ea463fd44fb06d00b38c6ac4cfcd4e3b
-EBUILD tuxedo-keyboard-3.0.10.ebuild 699 BLAKE2B 43a60c7b4ef5d0f19de6504eb319efda50b2ce8007633d0f968c0aff1b748e538b3f48cb26f2462aecbbca552a82b0abd63a582545b462b8a9e734df08e731d5 SHA512 0be648314f9042881a55109862e97a176de2bc68320706d310b6cf00e9f47f2c4bbe835962ab89a1c73b7e9bd16fe2b11e10596bc32deea45977c9ad5670fdf7
+EBUILD tuxedo-keyboard-3.0.10-r1.ebuild 716 BLAKE2B 98d7426db5f05bbb0d4cc17a7fbc0935530411564439167a942c6a8d21c5e17a9b4733ea387cee8d6e4e9028d4122971087e5e2f3aee11487ce0c4558a710e07 SHA512 ca0f9a4dc06b5b98e10bcabf3bdc9d9b923d25ad2e6a08662580391711ae99b345b0ddfb58407ea353de1236609e7d0d195b1ae8b98b4a9f96f88fee662ab602
 MISC metadata.xml 257 BLAKE2B 65c73e9c8dcc3e61188ef911f456b2ae23c9f2a0a207c7e3075566177dd9ea14b0b2da755fe8b864552179ebc17ff35a12a824c1eae0d52d3ecacf2a5aacf438 SHA512 89f76751a66c20c3d723ab5eb4a547baae7aa155ed5cc0e82c9c78ce6a26a8b51a2025c25b3a2df8e0b67b41e5c7479b8d162111fbd2f0949adecdeb44b5a750
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10-r1.ebuild
index 996e6ff34e24..45910306dcb3 100644
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10.ebuild
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CONFIG_CHECK="ACPI_WMI"
+CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
 
 inherit linux-mod toolchain-funcs
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6f61eeada376..8b0e3e4501cf 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 29dd941523c0..2cc5ebb803b1 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,4 +1,3 @@
 DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090
-EBUILD bibletime-3.0.3-r2.ebuild 1177 BLAKE2B c4439532a0737dfa783782157c3e174fbe66d74dab171bc779b0f6fee97ecd9b43dd9968f060beb5f32c791f979ef4d0320d888f40db515349cd3ece7b6609d4 SHA512 f51a7fbdd70a4cd1a735cfdb77af5ab9b1adae262d64cb1b9e6c2c86eda6d7362e48d08d8a08ed5109073cd8a98173c88f767d11c25349dfb7883b0a2077dd4d
-EBUILD bibletime-3.0.3.ebuild 1168 BLAKE2B 22689d994789740bab58092a0aad50c5e5e4a662900b80cc845e5fef488c899aadeff6dc99e1a9ba8c5b81708ec1ce054b5ec05b3e80e402bad5632cd941d5d6 SHA512 263a0bff2fe4ef3680705e809e9c3ff8e01f8832494c9e24bcbfb20f97e347cc0890c1faf9c767791f51c95ed627d2bfd6e306ce453cbe054b81960bffb3c393
+EBUILD bibletime-3.0.3-r2.ebuild 1176 BLAKE2B 08bdfb05292ea3585124507e679616dae31825cfa05901d275c339bd0a5e76a9fa44834a66c89909d0dd1092d55f66cc8a3470f4ff3e210270969c9139594b77 SHA512 c12406d49f2dd42ad6d7a225c9f25df7e9ee7693861bd75036166c6895b1da0e925c01b8a1df46fe412e5d7ad0d35cf98ea334938fbd74358695d34325776d21
 MISC metadata.xml 657 BLAKE2B d60c79c16a34ae0cbd43eb5de895cd675727712be5cc5b5a7f969a6d7e222e5cf1f1583308a2dbf3fee604f3bebdaa85ec97e94fcb0230ee856a988ad14ee175 SHA512 ce660bf9ad657a9f7409620d823655c4021492f4f9eb7f9621696600590a81a70c2e41a7e4a9ec156b3c7e75e2a427c0fa2cb183732efed5a9032fecb23664db
diff --git a/app-text/bibletime/bibletime-3.0.3-r2.ebuild b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
index 810bcbf14e96..8ab6bbf45a4a 100644
--- a/app-text/bibletime/bibletime-3.0.3-r2.ebuild
+++ b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=app-text/sword-1.8.1
 	dev-cpp/clucene
diff --git a/app-text/bibletime/bibletime-3.0.3.ebuild b/app-text/bibletime/bibletime-3.0.3.ebuild
deleted file mode 100644
index 08049be9d0ac..000000000000
--- a/app-text/bibletime/bibletime-3.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Bible-study application using the SWORD library"
-HOMEPAGE="https://bibletime.info/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=app-text/sword-1.8.1
-	dev-cpp/clucene
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/icu:=
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	net-misc/curl
-	sys-libs/zlib"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HANDBOOK_HTML=no
-		-DBUILD_HANDBOOK_PDF=no
-		-DBUILD_HOWTO_HTML=no
-		-DBUILD_HOWTO_PDF=no
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 22aec36b1789..08bf2c2438d3 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,3 @@
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1.ebuild 1437 BLAKE2B df2690179781bbc9ac32ad4bd3d2c8d258652436ad5370bd04e5d2a4a7588b7b8d3ea7491168ba98b46aaab1d40084c6814e03e757ae554f1e5efa304289f92e SHA512 bbb8800b2c6a7929f3e9fa410edbf98dc247d787c976e06a496f821ea89b75dac684d09fec86e12a5b135fb6308302ee1ca490e544130b186fc6f573d4ab4f95
+EBUILD xmlstarlet-1.6.1.ebuild 1490 BLAKE2B 21cd7c4ae62e4cc78a2c74d14d1b06da3293cfd3c11cf615b5b58724e511f718cfe33e6d6b1001beb354122386c432cef7296769a4a4c7e24e4dbedc942ec8c3 SHA512 8e0d96ce3caf405f01a37f3fb753d60b6fc387e101c8e8a0d4271ab8d96a1234d3afc3af0718197897703affce680760931fed97d12bac79b3149847a20d5f2c
 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 37ed9694ee5f..a234631ef8b8 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -28,9 +28,11 @@ src_prepare() {
 	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
 	# The grep sandwich acts as a regression test so that a future
 	# version bump cannot break patching without noticing.
-	grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
-	sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
-	grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+	if [[ $(get_libdir) != lib ]]; then
+	    grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+	    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+	    grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+	fi
 
 	eautoreconf
 }
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3b8dda960a6b..aa165ba1153a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index f06fa5ae1ff1..9226501e7621 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,5 +1,5 @@
 DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
 DIST benchmark-1.7.0.tar.gz 194165 BLAKE2B 2a5ae10fb1fd1d05da60287591a5ba16d9bf8f7c77d1f332a6482cba32841a00b1350bf83238d52e051bcf2f628ed8ffc9e1899c75337b8cd12d9fb1800fd5b0 SHA512 25f81930ce210e298d9cc67c965cc8937f66c53427b18a672338b86424eef32df877ec6b7a7106417464b29c5048b014fcc82cfa773168ed701aa47d01f39f82
 EBUILD benchmark-1.6.1.ebuild 912 BLAKE2B 4fa13b2ec4ce003a8dbc3d30a7e565e64a3397cf04b9a0fc97a306c97e3fe30079519735d50138fafc2fffa700543b72da6971b203626ab9fe060945f993a688 SHA512 5a0cdc46d1e9710a59f8d971bd1549796c7eb3df45c92b270c0719ca3fbb49f43bbb87cbdfd265f2d6e5a3ba34a2c2c5a48eb98ae20c6eaeabfd04023bdd6228
-EBUILD benchmark-1.7.0.ebuild 917 BLAKE2B da88887ddfb23f042f92148c22791bdd540992c1b545e4d91666374a25a8feeb5c236f7e8acec41488681ae3ff27a81ca6beb457b61482bea0f385d5a41dc9ce SHA512 903570dbe93163207afa70b6e06cc9e3f52a2ea9136d38b6136f568234946ac5b7fa08f074eda1dd56d62885989de355cfdaba659bc26e98960caa44156ab8cb
+EBUILD benchmark-1.7.0.ebuild 915 BLAKE2B 052132b9c33a27cb837db8153bb52ddfe6424884a8fb1706213e40e0e691bf20f203f270797ab37124f4eaca8c7a47e2b11e92035550c263f9c7a4ebd469caa9 SHA512 1c3912b987308af9d4f4aef16b6c23155f23f505615dbe76cf2e4b21ec6cbe34ee285f5068dda9508a30dd964534d8c4ba6f1a9d896949414ba45d43f126a6f8
 MISC metadata.xml 563 BLAKE2B 2c825b6895d64a3e5e4ea6b61a707e03e14873bc5fbe9f67a756a56c8edd0dd04dd8f3aa1d1a80bf8b4921f25aad19320222b3607494ab512d3713152b1ce41e SHA512 09856cb99c18336b143b725f8acd7fce84d7cce2aea22f03f80934f6681161fcf667f084af236fd654051acf4a261c7e25026822ce3ab79d6fef0ea3212a601d
diff --git a/dev-cpp/benchmark/benchmark-1.7.0.ebuild b/dev-cpp/benchmark/benchmark-1.7.0.ebuild
index fdf73017860e..2117d73a2f02 100644
--- a/dev-cpp/benchmark/benchmark-1.7.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86"
 IUSE="debug doc lto test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9fa0f3d4ea2f..4ae5e8cf5d39 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
index 34f41c62a35f..95b1c2a8e000 100644
--- a/dev-libs/libtraceevent/Manifest
+++ b/dev-libs/libtraceevent/Manifest
@@ -1,3 +1,5 @@
 DIST libtraceevent-1.5.2.tar.gz 135283 BLAKE2B e4202fc3c9b09d20bed375bc1833a4f49b63cf484e63ecf3cc5f1f3950a1de7607464e6c2ae194085e78978e5f480a7ae392a4cde739c3a244367eaf1000f70d SHA512 3804a84d2a4771335ba14a7383f977d641e6437f055837c2faece811b8ef931cfa9d38082bef48d96092aeae8cdcb543222a3042b2c11c41749dddbbb4813d94
+DIST libtraceevent-1.6.2.tar.gz 135857 BLAKE2B c5384d9bb8dc5977cfb412c22d9692ed757f94dcd01b6a93e8368cd3368bf2731c0c4eff764fd81b4627925e0fd370acd509710b538842708836b5d0ce777003 SHA512 8e951f66c339de2bc78c7c7f347f9283553ae62adc9e2bb96de1ed0aaadf91d59b2e93785c5030b0dd6d946488dc5e688d504eba54d674454c808c320127cfbf
 EBUILD libtraceevent-1.5.2-r1.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
-MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
+EBUILD libtraceevent-1.6.2.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
+MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtraceevent/libtraceevent-1.6.2.ebuild b/dev-libs/libtraceevent/libtraceevent-1.6.2.ebuild
new file mode 100644
index 000000000000..b9bb4041b4e1
--- /dev/null
+++ b/dev-libs/libtraceevent/libtraceevent-1.6.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace event library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	!<dev-util/trace-cmd-3.0
+"
+BDEPEND="
+	doc? ( app-text/xmlto app-text/asciidoc )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+}
diff --git a/dev-libs/libtraceevent/metadata.xml b/dev-libs/libtraceevent/metadata.xml
index 7c1651eba3e0..5d7fd0571329 100644
--- a/dev-libs/libtraceevent/metadata.xml
+++ b/dev-libs/libtraceevent/metadata.xml
@@ -5,4 +5,8 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index bbf43267b039..2d9bb9a2fdb9 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -4,4 +4,4 @@ DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e4
 DIST libtracefs-1.4.2.tar.gz 178382 BLAKE2B a956423370077613417812ad18da284521e8798701d558f4e419af6c43bd8a06c489525bbab26e6bc5d5d5e8fd0e6a7322d34f976a4ea560670eb594818d07fc SHA512 4a66c3cf8050de5acc4c63996cbcfa2c014e26ad6011eb89b0cff47ffbd6343637009354edf6bb173b9fd08103012774376c33fd6f642741f7990f2d6de3ea0c
 EBUILD libtracefs-1.3.1.ebuild 1391 BLAKE2B 28d81702b711190ddfa0b62a322ab222566c1ecd7185df38e1c30a57910e976f5c7fa42aa32b322934585cdb35d9936a0736e00c5674107ee58629dada2db684 SHA512 566dbbba263d368be4c3ddcc406025bde03f92555d1717bf958a6b71d3833bffea0bb68b3dfe4b50a542108522663e4fc549473379e7447061c2ddd90ea1bbb2
 EBUILD libtracefs-1.4.2.ebuild 1387 BLAKE2B b81fac4348de3bc92044a17bca680c836902a935804d8062156962bb5f9db5125631c28c61d11afe62a6349b34365a8918c1c78f4c419ff1bb34443b6699e0b9 SHA512 f7ed18ce5665c6d37a7148ff4ce3e9ac550f448c8a5699f9c346490c1624ed0ff584943c13cab52f2a2f29929a21d58abf8248db60c6f9aa57edb8f21ebf4b75
-MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
+MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtracefs/metadata.xml b/dev-libs/libtracefs/metadata.xml
index 7c1651eba3e0..5d7fd0571329 100644
--- a/dev-libs/libtracefs/metadata.xml
+++ b/dev-libs/libtracefs/metadata.xml
@@ -5,4 +5,8 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 51b4f6c79457..43be4b1bed89 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 99815f089c54..47ded91790eb 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
 DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136
-EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 429e761c9a8dc220ef53274cba9f0da1a1647ee483e6afb0bf98fe14e25507d907b4515d4fc266ddbd53cc96cb105c172fc800c98c2a1becbc85c43900f64be6 SHA512 8c299014a4005e2a6e199e848e8829b792368c1862311c07b77d8df258ef6b16ec2bca27c2cf3a78f879052aa883267f37f91b2ac725a53787bb84923d1d7e62
-EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 18b983fbaa4703f3cb6722af2ca267892a1976af3a12bdb8032a1844a0d9f24e2f1e746a610590cc865d0b4e0df64d2cb31d32ff952c0b6dce3067a08d945c6c SHA512 42df422e2736d933b1f54a3af171c9e40ad45a5df57e91b8da1b5255a6de7777e840a3cdb6f983cb16f255ac324935d5d69f86ee8f351ce1f048a3b59486b6bf
+EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 631de4e8e8071eed1197c11e500cf4108e879a6e4912417d66bf793e8dce0a28af76a4da7666aac77631f869d0f0eeb763b399c81de0bd08171891b1c0e7df89 SHA512 36d1c856bacbecf6eda95f0f603269a716e9e29090a92cf4c10f6bbd38ab3a7d045258cb2cf7f1ba4dc31b25d03b64b45968817fefe402b4ff15344b71d72d19
+EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 9d81f9b4041f034954511e547812e6c1e3c702e691c175f7b3e4eef461a65602bf24ae37a696ea4619b2071bc9eb25d2bf4f064187bed74f4e19e2259433b394 SHA512 5541bc05ef4ce9299242feda4305b17ac250aa98a3b9d277c020a2f211128b93c30c2a5775a593d112436c76e9dbf64f1fa8efa6ad60cd916cf898eed67b6abb
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
index 7f566730059f..438acfa7dc99 100644
--- a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
index 36ec1e075135..5abc44e6b8de 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 197b0fdca605..c927800e0b83 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -5,5 +5,5 @@ DIST black-22.8.0.gh.tar.gz 1173503 BLAKE2B 851e2dedf35871dc07caaafbffa15aa91e18
 EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
 EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
 EBUILD black-22.6.0.ebuild 1418 BLAKE2B 54fd1498fd0e3f558e6be4c3e96100ea5695f7f7ea43c38e5965d06f96b34159d6370e1a20382e8f5ecca3c5b62ec1c1e3167936aaf728098de0199f3206eb8f SHA512 c17b8d301f47a5dffae1460978d91bd127448f6903428c7b0c16e0bb6f13943c973f32c71349135cda43bd7cf26ae6151be3c185a2f5ac9fafe3a044e20f387b
-EBUILD black-22.8.0.ebuild 1426 BLAKE2B 2ebb1dd3fb8ec09ff3a4c541a6b71cc182c5a49133a302fba561a63fdc9fad9a5727bc551470cd6415cff9dff090d5452482b76ec34a7b3e456ae5b77248a2f8 SHA512 9f86c1727b2c1e51ee21fc694230d9c4976e6c536186f85c1768442f7f77810c7cafcfefc5656d57f28d6a3fcd90904b222b6f3b81af612497166e2a2ba81d3f
+EBUILD black-22.8.0.ebuild 1462 BLAKE2B 8439e1bf0945e21da74bab15cd206d7ffcd1ebbecc038be0b457a1586b140b6b36da624aba00dd05ce0c098a846a6d2159758b3deb47cc0cc8bca21ce3cd8dc1 SHA512 aa90449db553a55712a7a847093ea78a05099175d6bd951a169d8d5c969a1f7f440ae3ab37c3b233852f6beea8cdca7607a691288e5bf64d0552c28a3b9b84db
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.8.0.ebuild b/dev-python/black/black-22.8.0.ebuild
index 2136bb8644c5..b5ab550c3625 100644
--- a/dev-python/black/black-22.8.0.ebuild
+++ b/dev-python/black/black-22.8.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+# py3.11 blocked by mypy_extensions
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
diff --git a/dev-python/cons/Manifest b/dev-python/cons/Manifest
index a30f3bf52baa..13cdba41ceef 100644
--- a/dev-python/cons/Manifest
+++ b/dev-python/cons/Manifest
@@ -1,3 +1,3 @@
 DIST cons-0.4.5.gh.tar.gz 40318 BLAKE2B c01f195c4f29ffe42e08fba6b57806b96263f7ebbc1cc859b8d146cd94e257829506502f2bc81f5665f4caf3bb8725ec556b70b951ede2b8117ba50fdb4388e5 SHA512 fea3af6b7198760f36194793a32a87f17729877f75baca6fd9627c32c4602e640cf667bb106624e9d756aece57053974e90e32329de484619a14b3500bea26e7
-EBUILD cons-0.4.5.ebuild 603 BLAKE2B 008f4da29c6f233285c86aaeaf318d7b40bbced36a497711364bc3bed9d18d052ce81003728dc83e1d877e87da31fae61422e2170279b2ac9fdac2ccc35f71e5 SHA512 902ffde4dc9580e7cf0704c1c9184eba65c4f86a4fce58618831fc6eb89f096bbfce7e0102f6f986485272dd5c78f89dec1c585cf0b991010f7d6fbeab8e693b
+EBUILD cons-0.4.5.ebuild 603 BLAKE2B 85602f7e57ee717d7f471c0da23977c524cadc23bbbf8c2d28ca7ea3fb4deef96cf4936b17c2219ad853db320182528e113248e5d191bd77350614ce99a0a51f SHA512 41ba83cf304f41c2d486bc1dcc6a089a7676e738d0736219ea4be52442dd171b1edce97d31f03addd9fc6d5b62a2319c32359b2c7c40ac5a31a8e3726d0a334d
 MISC metadata.xml 396 BLAKE2B 9ba9a455c02e9ac43a4930f43b79db507f4f501c1b67b3ac88cc3446fb4a65707880e526c8ec140ec6df597e2e9d71f9f7c8add8bd0a3a30505367a442c4e3a1 SHA512 df6579314a49aec9ea574112a6d9cf0e4cf8a0bace10617ef6bfeb1916e38c6de20966800ad1bcc66e45d5526f43da46c1616438c283f17aa9f54b8ab8b973e5
diff --git a/dev-python/cons/cons-0.4.5.ebuild b/dev-python/cons/cons-0.4.5.ebuild
index 3cd56c917c71..d56476d73e0f 100644
--- a/dev-python/cons/cons-0.4.5.ebuild
+++ b/dev-python/cons/cons-0.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Implementation of Lisp/Scheme-like cons in Python"
diff --git a/dev-python/etuples/Manifest b/dev-python/etuples/Manifest
index 1785c0097744..fd0db35d8de0 100644
--- a/dev-python/etuples/Manifest
+++ b/dev-python/etuples/Manifest
@@ -1,3 +1,5 @@
 DIST etuples-0.3.5.gh.tar.gz 44924 BLAKE2B 81b603c851b89b3ec3556246d7dfc12a533632f4e99f8b784c4b9f46c3ee51fe7d370556e376a957e52c980b6e16fc93d85c597d31cee371fa2e5cbeec962c9e SHA512 df51ff42609a341c42009b650dadac2a6fb8ea85c3ccc6145ee2bdf6270ed9509d73196f8b0b789091918e93492f766d5fc242e2d5acc30074c171a2334a42fa
+DIST etuples-0.3.6.gh.tar.gz 45115 BLAKE2B 5fc88a46433d8074e019f97de1845732ce088e08098f8fd72b9ad0af2d869420805f753cd4a70c24f309d37115a36d9a634c8d3a1837506f781e4b6771e8cee8 SHA512 285d56c291f765c5364a53c7746bdab8aaad71bdc40607f10f0fb9570f22c66352737ba0543d447d83ecc60f7cdfd4e7b406efea7ff9b15d72818f31a10ba4e9
 EBUILD etuples-0.3.5.ebuild 648 BLAKE2B fa1abeb31d8373111424ed3df50d103f5ddb0e9fbdb2f397869117d445e4469b4cfce00f12258c6915bd3b5d85528193558465bcb9bde07c7ee48b48fab1b2fd SHA512 c00105b401cba5ec3f55ddffa5bd6d8b4fd29bd1e55862af1e9b0f515244c6cedc6df92ceec98b90aa6e34acff520027b70fd1dfb824925c8db2c6068d62cc4d
+EBUILD etuples-0.3.6.ebuild 650 BLAKE2B d3d65d7c2ff9005f6f2370c9c5cfbe43326226c168141472f8ee04bed59ee7c961e343b911873e3ae9a1574498175fd2ee47a08350faf8e10a510d9f52b2fda1 SHA512 3141b84014bf57313644ee53520284f913268408289805c86e99fc912c3df21d18167d2ce8af4b9c14f2db36b9c3ee6ccae51085461b86d3fe4ab9f5d0d06799
 MISC metadata.xml 395 BLAKE2B 1f931fb8859a01cebd9dc3b94c11d2105552e7b371f8dddf1028d1cb45b7db6e2b138bb753b631399c885f463cc7d7ba76ad1d43f2d70babbc01c70913191c85 SHA512 a7dc4d5a713c5ecd58ee2fb371962fff65488966a968316e4415e19e2db08381c7d5aea0997e062667123eed86c8d6bbaddadea61872e6f07726fedee463802a
diff --git a/dev-python/etuples/etuples-0.3.6.ebuild b/dev-python/etuples/etuples-0.3.6.ebuild
new file mode 100644
index 000000000000..bf565f12b12c
--- /dev/null
+++ b/dev-python/etuples/etuples-0.3.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python S-expression emulation using tuple-like objects"
+HOMEPAGE="
+	https://pypi.org/project/etuples/
+	https://github.com/pythological/etuples/
+"
+SRC_URI="
+	https://github.com/pythological/etuples/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/multipledispatch[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/logical-unification/Manifest b/dev-python/logical-unification/Manifest
index 7236b25f4ef7..56e0375580dc 100644
--- a/dev-python/logical-unification/Manifest
+++ b/dev-python/logical-unification/Manifest
@@ -1,3 +1,3 @@
 DIST logical-unification-0.4.5.gh.tar.gz 47003 BLAKE2B 9f7e119a69b15b460ce66af137a3f0c3dd3da154173ac196a94d4894aafc67eeaa31d69c5ca8bdd6e264a3f7599f9e301dad103510c77e60ff14cc8af1c86ce8 SHA512 42af33ac7da6013d48d26ab49b84b40146f494963f1eee06256a219e8d0517b04cc3fe86f51cf19729fc64ad765e75a4890b278c2dbbf34eb7e1ef65f3014784
-EBUILD logical-unification-0.4.5.ebuild 685 BLAKE2B fd6346c4dbb21e03ca59832ca3da07a720e7eda88c77ea9a22b8cb0f9f277cab4294721d81082a178f25b76afed5e99cbb5c9708b45007b89a634b6cd6034c3e SHA512 2bbd9f143ffdab5254e01afd9802c0b3d584d1824d55c3220e8840fc7c59bb1fb5a83d4b185dcaeaeed7719ef262358d0370137dd43becd2a0f3f57e3d5123d1
+EBUILD logical-unification-0.4.5.ebuild 685 BLAKE2B 5f411cf85f715d23392f6207ab2c5d77a57b59f64d5e3bf48eb794800439415d1248bf153b2947d5c15e4fc324a0b9b559dadc38b78e017e3fe75014fa91394f SHA512 53c6cb42f7cea06b734fe52d78f59ee805638aa17113d5cbc26f5b24121386ca173c6206e977c855d3e2733b6ea28920ce688c1892c074956c004d2ee6debd0a
 MISC metadata.xml 411 BLAKE2B 41b22447e02d0d7cb7b13523abafe18bf4c01033ffe561c022d32c9896fe85272a1357682b678e0d679d01d992cdef1e445358280c581dcc1071a6e7b1f7e587 SHA512 21e61a22962dd3b4eb70efa40e2dd74660c540f79e13a3d9015494681432361f660003b3fa533fdd82faeb1e76bd4486c40478c99076e65997da14de1c0d8315
diff --git a/dev-python/logical-unification/logical-unification-0.4.5.ebuild b/dev-python/logical-unification/logical-unification-0.4.5.ebuild
index 5b8af95e8cbb..bf7ef4a32810 100644
--- a/dev-python/logical-unification/logical-unification-0.4.5.ebuild
+++ b/dev-python/logical-unification/logical-unification-0.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Logical unification in Python"
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index e23627c81777..2d295b54647e 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 593 BLAKE2B 82cd8faf3518d6754a3e837139fb95e542ab2ff02a4f60cf092c84883ac5536012772b1fd1ccb91682b0ac511ae90d00312a3369fa9bc2d3d340315a6a272b33 SHA512 ab559fc1536aa2f35cda3903b55d725e9443651af319e0fd2a0d47ed10aa880967c21faf5d112c2e5974983ce619caaa10481d1e7918d0b8c8207012eb498c52
+EBUILD mypy_extensions-0.4.3-r1.ebuild 633 BLAKE2B 97db0e85dcb30db647590dd2403d11992bb5168e307b924307236c288d7624ae5f15bf124fe22b1bd2be10dc2bfb644cecc4c1210bdf8a84995790391bda8e12 SHA512 acfce99b6982a1b158fb393b70e52b0e163fd71a29c80a9cf09a11d06b63f218b6f2ec7ba3984b602388a8a0ad2c48cf3466e7d164f3b7dd369560eb5cde7d69
 MISC metadata.xml 405 BLAKE2B eaf484f8baf4a4353f55fc7a84a40057c70adc6a5403e5f2e22f84d804f63774b60c52ddcdb4cc59fa21f3c350ea772f7eeb12112610d611c053ef82340a1e92 SHA512 26bd5e50dd2d591c6bcc803d27e85fa0508921c688d798e208868b7c9a77bee999ef12732038af42dc62fdbec75b7cfbbd6ff33256756736bcc783893aeaf586
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index d3b1859e996a..cc8dc65b7e0d 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+# fails test_typeddict_errors on py3.11
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index fc47fe9b7a69..2939b1ffdaad 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,7 @@
 DIST pathspec-0.10.0.tar.gz 41552 BLAKE2B 28f53bc760f2ad474223f80c46f8be473e3723898b7ea923fe86f25a46c71d9f69687fdb4a7962b1922e2e35595d0b6134c97d29c60b08fd7e0b6cb2ca75ec14 SHA512 5a02de5b55ff58185e9821de09d9f7b6acb494eb65e73c7340b0c91fb06badcfc93a6804cf5a77a37be3ecfe7b76afa1ed42fd364c3384e193f4ef7488ba33b3
+DIST pathspec-0.10.1.tar.gz 43155 BLAKE2B 5a690b6ec5215932074e54bf7c9dac2097261ca421421e86f9a90733fc2fbbbbf6ae8735c685de682919349bbe4bca6b1abce2d572871ba4111cc143b9637491 SHA512 886c16ba9a221720a9fbac6a2aead5a16de62988afbf0ed976f28c312fe524f41ccfb139e0b9699942ca32aa90f183e20656986ed631cf2435818c082d58115d
 DIST pathspec-0.9.0.tar.gz 29483 BLAKE2B 00b48f6987a074e23ac6f344a44ac8f265463bdd87907cb8a602c690a739d1a9a673182fc4d61a6e2ffc02acb6632591b873e435f9fc3893e1cc48015e120a16 SHA512 660f13525325c27b598048a3576fd704c3843e0b07770187d005f0e93996a90cee44e9a0725b6bf775982f586ed3b4ba7cccee966d7149e71e2b95d48030b2f2
 EBUILD pathspec-0.10.0.ebuild 606 BLAKE2B 4d55a1279cfbe7f2587387495db87f2363b0a78c0d505e4fe7fd61b4dd768370820550c34a17d2046c34260d258d9b2a635717bf0af0531ae116cda932aee4ee SHA512 779fa20394d80260954dc61b97df7b86f013459fe23858f3148ff59182ce59e7e617ee79ef3f0e93a08c37d10eab1dfb1f4c3b0fa164edfe2279b2c7b7bb2a4f
+EBUILD pathspec-0.10.1.ebuild 606 BLAKE2B 4d55a1279cfbe7f2587387495db87f2363b0a78c0d505e4fe7fd61b4dd768370820550c34a17d2046c34260d258d9b2a635717bf0af0531ae116cda932aee4ee SHA512 779fa20394d80260954dc61b97df7b86f013459fe23858f3148ff59182ce59e7e617ee79ef3f0e93a08c37d10eab1dfb1f4c3b0fa164edfe2279b2c7b7bb2a4f
 EBUILD pathspec-0.9.0-r1.ebuild 608 BLAKE2B 65de979b7d88a665e2ab51969be988d080ef194f6be788826a53e42f399e5b36fd8002ad8ecdf93ba274b31d996281053400cbdee391a7688fcb5497de99ec03 SHA512 a1f9d69dd08e69a00af73d0c8a87c2e4616e5fef174b38fd82ff66b97f16a78ffd86a27850a9a721d0a6d94cd93bf9fa0a619f4d310901b7d332c4d3cc4bba66
 MISC metadata.xml 412 BLAKE2B 145cc9a575db3e6097a04e456acad82441f9f0e4d73b4184aeb1eb94d67b998c47a41f6015b646c6275322a30e187c8f3082f3d2fd749250f15a0f79e9cee9aa SHA512 f3ac82f97d8506ecf7fd2bd5eb7105a12588b6694bb2fc0a797cefaa1d9844d2982a80d11202b275e160db27a342e84670abacb3322c82eb76fb3a70fc8e9c23
diff --git a/dev-python/pathspec/pathspec-0.10.1.ebuild b/dev-python/pathspec/pathspec-0.10.1.ebuild
new file mode 100644
index 000000000000..a69ad1fd06dd
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.10.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths"
+HOMEPAGE="
+	https://github.com/cpburnz/python-pathspec/
+	https://pypi.org/project/pathspec/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index c64844115fe1..9a979aa5c0a8 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -5,5 +5,5 @@ DIST pikepdf-5.6.1.gh.tar.gz 2905150 BLAKE2B 35c06251debb935b88f13e27f42f80b3627
 EBUILD pikepdf-5.4.2.ebuild 1540 BLAKE2B a18382fd9aca786167af7ee89ca7fbd17baa0c4e8d0f070581b0b84e21a97a14cff5b706110300493f87a50a0893877741007dc8a59c16db56a988b632a23ac3 SHA512 f0dc8845062d30016a9850ccdc8971c7ec9861d277cdd089926b6a275dfba1d33d4a8e666fe2ce335391f864f4341640bbe79279ed17329d4e91f374482f206c
 EBUILD pikepdf-5.5.0.ebuild 1541 BLAKE2B 56ecc778d49fecd927ccb693ecdf58fb41dc8c9bebb1763e81e6c3ea650c91573ac2ca1fe5b72282fa8e2a9649e3421817a55cfd6883f4ea8cc80a292cb322a4 SHA512 7864f4fbde7cf5fad575091d13e37def859f9ef9cf89050df9add0e395e64f19eedca4cc0503c4310f53056d8d87b8378c6ef89ca39c3e573c4e491a442e01d5
 EBUILD pikepdf-5.6.0.ebuild 1541 BLAKE2B 56ecc778d49fecd927ccb693ecdf58fb41dc8c9bebb1763e81e6c3ea650c91573ac2ca1fe5b72282fa8e2a9649e3421817a55cfd6883f4ea8cc80a292cb322a4 SHA512 7864f4fbde7cf5fad575091d13e37def859f9ef9cf89050df9add0e395e64f19eedca4cc0503c4310f53056d8d87b8378c6ef89ca39c3e573c4e491a442e01d5
-EBUILD pikepdf-5.6.1.ebuild 1541 BLAKE2B 56ecc778d49fecd927ccb693ecdf58fb41dc8c9bebb1763e81e6c3ea650c91573ac2ca1fe5b72282fa8e2a9649e3421817a55cfd6883f4ea8cc80a292cb322a4 SHA512 7864f4fbde7cf5fad575091d13e37def859f9ef9cf89050df9add0e395e64f19eedca4cc0503c4310f53056d8d87b8378c6ef89ca39c3e573c4e491a442e01d5
+EBUILD pikepdf-5.6.1.ebuild 1598 BLAKE2B f7191dda799b549a49be5ca55c7cf404af5a52a2be9b68bf7df0cc35e1546117cf433cc17207188954ac2b2856f611abf0447548ebe89553da676e7957e0d6a1 SHA512 d46bd02a44433d50ae1c57cd8fcf031b6987b5aa3727512a3bf883555ab883379377df4ed2825e3c0087e289363f482d13bfe0f9980df13bc820ce7884ec79eb
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-5.6.1.ebuild b/dev-python/pikepdf/pikepdf-5.6.1.ebuild
index 0dcfce946c36..07aa1b9bcb83 100644
--- a/dev-python/pikepdf/pikepdf-5.6.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.6.1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index cedc1bacb95c..41b3267f4b57 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST prompt_toolkit-3.0.30.tar.gz 418985 BLAKE2B 2edc5024e22ccf60ab68afef9958eead5711b88f4f2abfde387e626893778eda5203f855a5590776b25efb3fccea87012d01e39551d192861841dab188d149e8 SHA512 cb0b9d71b09c353f2674052d75ec16a1803e0868ff5dd5625eefae767d45699b1b6bb99e4d98d3bca7ced7b60f52806ec10ed7ccab8a830c62d51baeeace23f7
+DIST prompt_toolkit-3.0.31.tar.gz 418926 BLAKE2B 881aabcdf2d944e5b198533b1ec597945ff90a9a83f13aeaac3cf8ba5632c38aff23405fd0b4e30426151824041c5e3dffd1f5331a4101a1054a6f2ebf7e4afd SHA512 dccb0df339a498befbc756b40d5140662f20bf594f7b6a9314a156a1d16704f329b43a329cf979f8317a800363875aebe95569be69727b598b6e3f2af86eb591
 EBUILD prompt_toolkit-3.0.30.ebuild 624 BLAKE2B 55f6792522d0e9060e8450a4a746773f224fd920d63330ab4f1a926ec1f2f84384451d9602819dcf16f95924aef7987aec9fdcb619e937d5038c627d76f30e38 SHA512 29e465000f016239bddbca6ac3c9f880ccc670f812d3a9c58ff8b1e17d288bf61464a2d23c33331f472e66ba870a7adb87c7f4be01d11de4d8040374b8f73141
+EBUILD prompt_toolkit-3.0.31.ebuild 632 BLAKE2B 39797963edd09eb2b760df5a940bded40aeb978dad95643bff7c25e9ba2652ac0454c7abcda5ee6b7acb09403b90ade888273d78474eba3d2170ee8d45924920 SHA512 20f369e8817ca6228878e0663d44f4f127c29e49caca1fda69242a156f91dd3498502fa6a1cc5bf99664b04de135977ec71c605cb2dbac0c926a713311cd0da2
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
new file mode 100644
index 000000000000..daef0b2a5e76
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 9ffadcbfc244..4627c581447c 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,3 @@
-DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
 DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
-EBUILD pyopencl-2022.1.5.ebuild 1572 BLAKE2B aaed0c92df6a752644454b17cdddb25f9c77179404a02b76ad3860d862faa9ff8b108b7f3330e385ab22360a41a25fbb6a4378fa4eee683d20955d71ac15d481 SHA512 60867d0d0708fdf047d72d8fd80a49c2b0b88abecb45a859f5690d9ceb07bb171e8789c9e7239d3f2c428ac2d4fb96fdbbab13d94a034e5c600e7caa196251c8
-EBUILD pyopencl-2022.1.6.ebuild 1820 BLAKE2B 4771789e3bcf994856411c9c0f41f1d7c79c3fa1cf8d0dd5ef149cac0a3ad2277031ed97d8f6c17362cfc269cd31d5c1a9e05546b38194e89646e648e12a677a SHA512 2a6b2abd6ffcc6646599064ce4b34d26eea8b3407ea21ba46818efe19c7c203bc95eca0429adcb4d464c4be8e658693dc9577eb1f5acf94697792661da3fc96f
+EBUILD pyopencl-2022.1.6.ebuild 1819 BLAKE2B af8e6793bee7f165fe7d2914351363c8202207d47a353055b320cd58ba0f8f08bf53c457007bf45e2e3bd7b13eb25b8c51e3f8abfa446d3be85a47b472e3aee8 SHA512 d686767bc8ba8b39e82465e2c10379f6f9e2704786a443177278091fe55c93856c126d1729fd92bf8da605942a94bb0b91cd63b215164b1649ad0ffba5281236
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
deleted file mode 100644
index b6ce5908fee9..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-DEPEND=">=virtual/opencl-2"
-RDEPEND="${DEPEND}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-# libglvnd is only needed for the headers
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
index a1d774b5553c..051ab2404dee 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="examples opengl"
 
 COMMON=">=virtual/opencl-2"
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 70401402f36f..7f9f234234c2 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,5 @@
 DIST transitions-0.8.11.tar.gz 1103585 BLAKE2B e91800baa5101e2654b4e88fecec8bc795329a0e43890e32f42f7777136379d9852702f7cef14da3f3c26b50ce7bf9dcf2f6d2980d4af82149d2d16ea343d826 SHA512 96c91c988db990326f50b06c7538fb806c2a5d19f950f23cd0304b40517657c888df6c09445917d5e7224c1aa1b1d8d719bd10b0e210001f15eec947681c3847
+DIST transitions-0.9.0.gh.tar.gz 1116052 BLAKE2B 3c3f0f70029fac11b89741c17b4f8223ffff7b1f4120dbacf9047c7c9d8063df00449e7ceb378aeb6263d4f55245bb89f08f6eaa0a74948368bd0eb0227fea40 SHA512 805894ba772e4a31f1fd567d3765f8ee3f3498ca5b9dd4d5b94224722d48347a2feee284dab577eca97a748dc6f810dedf1cbc3b50f41f0ab5b65d84241b9638
 EBUILD transitions-0.8.11.ebuild 882 BLAKE2B 5f6869b12eff237f02117910de002a6465481d535b54a28551e3cbd6e207b41aa5c73efe63a6b45e05e937bc41798fbe7255b86c002e3201caba1406d1b5787b SHA512 e06d69b9f70b83b8bd0ef8b4708f205fd97d8e6aff833ba3b2471a57e5b84401d9a4dc06ec776bf8e05008874e096d2e74a99ff4830f906de4b70815862e6da3
+EBUILD transitions-0.9.0.ebuild 891 BLAKE2B 052c4f4e925644bd0b0c305481117e397ef41d4a063586f6b9449160791c8fc663ae945bd38c4935eaa8045b1e4504cf465cc96f755fa93d9b9f7742713ed6ef SHA512 f52c97d4e916163d5ba254b6fe6a4382c320aa50385bce83c7a0187d211bc201329c1b0e5a3efd9981f4ad6b877bcbbff7bb0d03793ee05dc494c18c091a4dce
 MISC metadata.xml 863 BLAKE2B 8ab7f50602ca6a7723c10c29c0bf436beb742e389fea5d4b98acf1828fb3287af27fed05f6c9e61cb65059d51a2290e0fe69515c1a67b138cfdac4cbaa7752bb SHA512 6e440169ae4a16c53f2a451d9f32e3d4831151b3af8a5f95f157e32a01cb2fde56bbab13e438c88f10e79fe37fa5ca6b48e18bfa9aaa81b96b7c703e2125356f
diff --git a/dev-python/transitions/transitions-0.9.0.ebuild b/dev-python/transitions/transitions-0.9.0.ebuild
new file mode 100644
index 000000000000..fa5ae762680b
--- /dev/null
+++ b/dev-python/transitions/transitions-0.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="
+	https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	|| (
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+	)
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index df85139cb5a7..cb82d279e81a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 9890bb8f683d..d0dd188fe209 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,5 +1,7 @@
 DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
 DIST trace-cmd-v3.0.2.tar.gz 308097 BLAKE2B 109cf260a2bc219c9bef92fb85bdd5abd0698d261ecec35ea31b152986af720aae26720cfa6148f798fca1d33f631ea3e50906a5fc7ef00dbd705c63d3b83f2a SHA512 3f364409f4a8931a09b762b19ee19ae52215b46e7ed90610a0fa4092e71d88d0dae91353ff98ba11f18012c27ef67289097c6c132f0f07193fac459ac52861d0
+DIST trace-cmd-v3.1.2.tar.gz 317611 BLAKE2B 485d62bfd6c7e3dedc5c3a9eb18af4b425bccc03e932854ef87fc0d032ef011e68cb978b34e319d97b85b24bba6d16ce619faaca8d96c77be1b64b1c4ca06e69 SHA512 d894842c11d895e2753fe254a83ecdc6bedcdfe1eceba5d75f1302b5476c9a3114c1fc5acddcba19ab05eaafb30db97e2e9b51b90afb1fd0550f1fbe0f59e0ac
 EBUILD trace-cmd-2.9.1.ebuild 2787 BLAKE2B 22b4be76ae6d985733791fe7c47fc274b83e5861695b99d4065e24667e567704591f0e532867e6524e603101c7a7b131eed7ee310beb2fb6f69dc279d7360548 SHA512 589e69f1c0c06887bfd27438617c9038ee59e4c9f21bf0807489aaf1c114b630756ed31a37c2fdda40c5474aa6a2699b88fd71e2eb0d356942b065e75cbabd61
 EBUILD trace-cmd-3.0.2.ebuild 3028 BLAKE2B dca25da4895984203d401b75e79328cfc4e80408f62792ae63c17ef5c41a388f725af9d1054f23f83c20a0cce754b3638eaa02de6b5599f2c7c7be44f9ad189b SHA512 089bc4e6ecd966bf37217bc1bdbe06f883cb9f3116e3b69591a229baec093c9638e3305ff7efac4e2a58cf22fdc44885f7cabeee8760c370ac57cf49ce9903c5
-MISC metadata.xml 361 BLAKE2B 25c92c4f81463633306cd3724f52d8590400d48caffdd03a5abaf6b9026a5ea486cd88f2677ab999bba93b79c3584210938c4ad2ce3a275e2ed07f32a5c5fd15 SHA512 17d5098f0416f962c2424dbf5a0c0002f5dec71d9a87d804bb018e9cb2b2959f6784c98fec4b6e1fc12ab81186f8d7d0feebb01304f9ef6690a090f85bb8486a
+EBUILD trace-cmd-3.1.2.ebuild 3028 BLAKE2B 2d9f8226f5423bd93bc3af018108bcad3dc19f87b25aa17a30eea44221602a2f57372e020ac7254e08f9f00d9a4d4bff0248ac745ff5aba56fd1d614254269f9 SHA512 d9578451a54a19e52f2a2716543366b69da83c90ccf426f6e01f50b98b90306aef0774d9e239a1405e63fc1157236fb5805e03f72ed20c4d55a23b5a64628cbf
+MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml
index c6cbdd9e0f6d..a580fe510b6b 100644
--- a/dev-util/trace-cmd/metadata.xml
+++ b/dev-util/trace-cmd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
 	<use>
 		<flag name="udis86">Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
 	</use>
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.2.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.2.ebuild
new file mode 100644
index 000000000000..0d772370332c
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-3.1.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+
+inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="+audit doc python test udis86 +zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# XXX trace-cmd autodetects this without configurability. This might cause
+# issues if the libraries are picked up with the useflag disabled and later
+# uninstalled
+RDEPEND="
+	audit? ( sys-process/audit )
+	python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/libtracefs-1.4
+	>=dev-libs/libtraceevent-1.5
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+	doc? ( app-text/asciidoc )
+"
+
+# having trouble getting tests to compile
+RESTRICT+=" test"
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-i Makefile || die "sed failed"
+}
+
+src_configure() {
+	EMAKE_FLAGS=(
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
+		"etcdir=/etc"
+		$(usex audit '' 'NO_AUDIT=' '' '1')
+		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
+		$(usex udis86 '' 'NO_UDIS86=' '' '1')
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		trace-cmd
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl python_compile
+	fi
+
+	use doc && emake doc
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake "${EMAKE_FLAGS[@]}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		python ctracecmd.so
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	emake "${EMAKE_FLAGS[@]}" test
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		DESTDIR="${D}" \
+		install install_libs
+
+	newbashcomp tracecmd/trace-cmd.bash "${PN}"
+
+	use doc && emake DESTDIR="${D}" install_doc
+	use python && python_foreach_impl python_install
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		install_python
+
+	popd > /dev/null || die
+
+	python_optimize
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index e331bc26c465..11bc7cb703b4 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/antimicrox/Manifest b/games-util/antimicrox/Manifest
index 66b8e9053bd6..3a94f1df913f 100644
--- a/games-util/antimicrox/Manifest
+++ b/games-util/antimicrox/Manifest
@@ -1,4 +1,4 @@
 AUX antimicrox-man_gz.patch 600 BLAKE2B 70f3837a4d3b2e4a5e64dd710eb710c1ea09bfdeea8a4000e976c1d3f0fcd451d0030aba22aa904308cf2aead9d1881757fd3b2fe4f703d8727ad132513bb24b SHA512 d30604d5615b00dd1b4ac03bd063a271c346ea8f13568b37c1af9f0bbdf8ad8ef8df604441b79e467742310433cc121aaee7c773cac7f3ec5e2547013fca16a8
 DIST antimicrox-3.2.5.tar.gz 1801792 BLAKE2B 8e42bef2c04f57a4ca733fa9632bb8b2070e4bfc6f0ac1c01016dd221a6cf24a229d1090c0d8ed2a7562d4c7224668cebdf0fe23265ac4d9208403f9fbe7e85c SHA512 5b9e75fcb1e5d7e12d5880f83451c12f0eb2da1a6e43387fc42bbcba8c24a77398868f69177277840b9a7541736007fdbec58fd852d32d12ca559f6f75178c0b
-EBUILD antimicrox-3.2.5.ebuild 1440 BLAKE2B ba4514d33a5c32edb3b8d6ebf7b2cab235ee7531348ca3aeffaabaf3e4098de27a40c322d9e33a51550d311f9f58add89106e4275fdc751947a7ac58065c5b65 SHA512 9d1051818a54f0e77676040bbb11810ce724022de4a65ad5631a0c3a701300fad8dc5f0ec8ecb0a839d78861291c9896b6f4176b540b60a933eb66dcf886935e
+EBUILD antimicrox-3.2.5.ebuild 1476 BLAKE2B 66557ba073b132582cf6e75c2423c31de0405fc54e07182ab824a187ece0408602ea0dd4a564c626b58c87caea98136af378999ccb5fe4d30eb0a690a3b7dd16 SHA512 db3db5f5539aa44978daf95b0f41f85e19c1215cc9711097ffdaaca23ce05567c9637c652e70ba6f8b080b5c15ef5b02e1531c566a607f08585a44a8ebd77a99
 MISC metadata.xml 412 BLAKE2B 9a75236478dfbb26649e3ab3355953ecb2d32739c0338d4fe2e8e0f4eddd0c5aa444fd13c02ff2740ef10077c56a40ab0a48d02670273ec831f24d50fae9cb83 SHA512 bcb066386dcc22038e8a9f2f42b03149dce3421ad545ebb9c7ef8df2f996970442219f40dbc82e232d7cf71ec9b421c6966b01801c46ca7a0322a8717cce4d87
diff --git a/games-util/antimicrox/antimicrox-3.2.5.ebuild b/games-util/antimicrox/antimicrox-3.2.5.ebuild
index 705547958f2e..15e929f6d678 100644
--- a/games-util/antimicrox/antimicrox-3.2.5.ebuild
+++ b/games-util/antimicrox/antimicrox-3.2.5.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
 	doc? ( app-doc/doxygen[dot] )
 "
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 114f20dfa912..3dff23ab617f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 190688b5fa99..3dc92db338cc 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,11 +1,7 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
 AUX fotoxx-22.18-documentation.patch 1074 BLAKE2B ecc735e158614bdbe2d44ec7463314a3f2f1151aaa95938a9415c7041ba0677acb4393d7f4d6c8817c0335e46dd365cc6f441102e0b6eb6f5ab233e70bf11ee1 SHA512 047ec5fa957ed3a9ad4e9667998045ec1c2d4cd6676f57275c40ea7d8797a0f95c7cfa2cd747e72f0f913c376bccdc708d73f675929302ce828c9d346d20885f
-DIST fotoxx-22.16.tar.gz 8984376 BLAKE2B 4a5665313133405b4a53d7e40986e37601b5c9552f20c07d5f0889f3dacbabce1b4a712fcb216fe3358e7ad1de12da608961a996b081e4b3d644c5581ebcc6ee SHA512 ff78b0d7bbde0de5d98ac42d63c36f4bdcd425ae210dfcda6f64f4307be02dfca2966475df3f962751f73afc8e9442d2eb975725db31745109e174fe1665f804
-DIST fotoxx-22.18.tar.gz 8917288 BLAKE2B 252e0e4a812e1f510da29f844f1f854f779c44f49d864952a5fb151f27bbac8af207308352f20ed976986cff8a6ce0a78f8d57b874d630d32a4d928f06dc820e SHA512 385a01201d18f75f5b2f6d2f3609c90fae7ba016279c42f3b0aaee65c0c28c71eae6d589ace71a9714629838d2de57ac93cb24c05339aadb6a3751e3081af795
 DIST fotoxx-22.20.tar.gz 8687337 BLAKE2B 013a1f154ea9971c5ff5c33f3ab62bcec9a364f0d47a65648b251966a0b798e00dd80ced399bcfb3657cf2e95534d1e694dc2d2c36066502ddc3b50a645cdba0 SHA512 c9b6cb298546ab121be6ef2c907ce51e4a4060a52829ed1ef51475ae1e542c7cb39037402381969519907a2a66bd8f741452786ff3a25f30fbbd22b24032a436
-DIST fotoxx-22.30.tar.gz 8692758 BLAKE2B 34688f3328af3e656ccaddd7f0656d4ac9e4f09d87e0960018ba773a80ead7f8776d4457986b9af537c46f9279da87c41b06d5ad6f3b3db108892dbd3819ab56 SHA512 9e10971e5ffed807bf0c6f1cc9c885d3a09f43b8a2004c1752863c4caf17a9d159fd1321f73e61f91f5e2e2cc737d2c45b60e44962de4976aa2605b713314b22
-EBUILD fotoxx-22.16.ebuild 2216 BLAKE2B 0a7ef8df9697f46b35ad214987da55beda2f15d5d8f07d13ad6489e26f069aefc44a1311ee8f9fa7f1f0842f985b07ac411465ae2651c0f495f13dd91ee40876 SHA512 c0e81b32e7bb8b7ffab608e7caf703460276d1e9f936abafa3e742b2b8053b534c5e820d2bafc7f82210a15c2f755e657a62ad8a88f0389a59d10d8922881ea2
-EBUILD fotoxx-22.18.ebuild 2218 BLAKE2B 82d2d2c45568c569ef3ce3e36a7133292c32eb42d016550e60bba6dce729df01305385e17630fe79fedc12e02264000ff2b435924ecc58b2b8895800068eaf3d SHA512 21f99c6bc7bf7ab7b8e05c8603f51551a59ab9b10a77b8aca5b1a797e5456d0111c8895845b7094251617876a7d2a800f1bf29c569bf6f8a1cc5baf3a5a06151
+DIST fotoxx-22.31.tar.gz 8647063 BLAKE2B ae636f9e2993cab3fa5cd8c432a051b42d23fa1a500c14cdfc13c1854c576ee60b25780e7bab4fa46734fab8de5839e4d0d639d759ff12cd2a52f5c8d704bdfe SHA512 06da8d87e5ff59cd32575720ffba7422d858e8bce6e126af61cdd30891c4a1f8f4a3b1429ae732adfe25b6373af2782abde2fefa2c9fb5c147458ad82270c20d
 EBUILD fotoxx-22.20.ebuild 2216 BLAKE2B e9c7318d9e66e9fd23c6cad9cd786e6b9b7f59fde880c4d5f2132cfa1c297e16df3b03ff0177e325d5e4e2617e65dd6df010f3e8bf5724f15d51ec6b5b93ae43 SHA512 14d10237455ab8ca61f019b62977dea2e8e636d71862e2bc84806581205ae24597d2eed20e8f2d88d6c0a53c3c3811f76ca0195d0f1ffcae5361de67e2590905
-EBUILD fotoxx-22.30.ebuild 2218 BLAKE2B 82d2d2c45568c569ef3ce3e36a7133292c32eb42d016550e60bba6dce729df01305385e17630fe79fedc12e02264000ff2b435924ecc58b2b8895800068eaf3d SHA512 21f99c6bc7bf7ab7b8e05c8603f51551a59ab9b10a77b8aca5b1a797e5456d0111c8895845b7094251617876a7d2a800f1bf29c569bf6f8a1cc5baf3a5a06151
+EBUILD fotoxx-22.31.ebuild 2218 BLAKE2B 82d2d2c45568c569ef3ce3e36a7133292c32eb42d016550e60bba6dce729df01305385e17630fe79fedc12e02264000ff2b435924ecc58b2b8895800068eaf3d SHA512 21f99c6bc7bf7ab7b8e05c8603f51551a59ab9b10a77b8aca5b1a797e5456d0111c8895845b7094251617876a7d2a800f1bf29c569bf6f8a1cc5baf3a5a06151
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.16.ebuild b/media-gfx/fotoxx/fotoxx-22.16.ebuild
deleted file mode 100644
index ea85a70053fc..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.16.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-22.30.ebuild b/media-gfx/fotoxx/fotoxx-22.30.ebuild
deleted file mode 100644
index 5819421d21bf..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.30.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-22.18-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-22.18.ebuild b/media-gfx/fotoxx/fotoxx-22.31.ebuild
index 5819421d21bf..5819421d21bf 100644
--- a/media-gfx/fotoxx/fotoxx-22.18.ebuild
+++ b/media-gfx/fotoxx/fotoxx-22.31.ebuild
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0450244a4238..f19b1a18b965 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index f058e22f33aa..d93c7df56513 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -5,5 +5,5 @@ DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLA
 DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
 DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
 EBUILD openh264-2.2.0.ebuild 3615 BLAKE2B 4558f97d1cecd36a9417a0ee9205b3f39fa72c1716d0f0fa80e1f1150fd0a3c01f49da973f01878e9ffcf16756835fa825685ce6951d1e3d52330b96c63b4a37 SHA512 7b58faf74d181c2637ad9647fc0d53ee209839316b772b8f0e6ce96228419ad9fcf41fc9d01b1ba0fa59e595683d843ad3766dc9995bdc7fd11aec97f9c9d914
-EBUILD openh264-2.3.0.ebuild 3621 BLAKE2B fbeea0b7a4f304d7c20fab467c7f6e77b0625cd91f7c8a16e8b5977fc0ec21d2ce67a038c0eb6a87dec3cfd6192803a5a47dcf58db19bb1afb850ae72fc09914 SHA512 0d80421e2f5041cd179ac59edc1b1197087c2ff08d67b6888394dabded813231decf8206bd96ae5cd0f77f4c4ac65bc17b195c49a2a992e217c8301a4f12d8b7
+EBUILD openh264-2.3.0.ebuild 3618 BLAKE2B 9ea4acd09a5c2281a99a576974bf3d0348fd54377349a68fb94ff983051a6f27a4a59c8b756124e48cdab8e92dfa336558e804ab80da4fd15cb271428de45977 SHA512 6cc32135588b0da11776558c210e7bc8ddca89f4028d4ad1fe283c046b08b058eac6404320937f7d1c6e3ac17fbaa14f7f04f505a1915d68fa2b393c72691efa
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.3.0.ebuild b/media-libs/openh264/openh264-2.3.0.ebuild
index 1eb4f62db3ce..25f5bca8a26d 100644
--- a/media-libs/openh264/openh264-2.3.0.ebuild
+++ b/media-libs/openh264/openh264-2.3.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/6.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1bddcff1e459..07fea679fa8c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a923d292abae..810a4b134163 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Sep 2022 08:39:44 +0000
+Fri, 02 Sep 2022 14:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ca4129a357ff..7680c48277d3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 524963 BLAKE2B 63a134310988775e80829f8df76e35bc7a36e500f38a02043ac51f423c095de0df8392b4c21b862e8aa1190811e33352db519f38ea643efbc71bfe95d975b6e6 SHA512 bc7c3b57f8c76fb5c8bdb7acf957ff1b9ee261e5de3501606b4991af3973817d95ec173a706003dbfebc5f22f084a39d16aa1dc3ca8f09463ac655d04f93d120
-TIMESTAMP 2022-09-02T08:39:47Z
+TIMESTAMP 2022-09-02T14:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMRwVNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMSFbNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD0TA//QE/kGc+G7rKKjzUBq84BQcTf7QqVFLkztFbrS3tHwTqZRPy2AuEF6WE2
-+3lwEiG4jsDy90U3PhBRUaQpL6lF9+V5tnqm10GGuiR/3I8DpWYRzsFCn4Awxe+H
-YjyIoRTKGr2T17alxnnPtxs9FJhTR3CtokmNevaN46Jtw5C5z0a2VDiXoIeFUNzO
-DySo16G7Me2I0xeGsOsUBvhwGwRtTELuZQXIFZdrIwoJ/hEMzkvv1jkWvUP7HatF
-Fv8YOZIxNWPkHym8FdNAqABsteuEzv3ksQ3W3b9olRW0dsjd7od4T5wnDA0b7COk
-cNfuwaw4hlwVzX03ylahgtnIFZOw/PBWyTM2Lh99p8gvFjGvMxqOaYjxgtGTYnzS
-inCA5R6iTrmnn4V4P2BWkS2k1adZhjYRS30WjWew4GI1LX3B3WyqslnHdjAiRoqi
-AHcALy6CU+dACGa5ofhIKH/mqTZo7U96TjxAFnhomycikPwng5hnguDvCqnHREmS
-4F9z5DswOR6uaCp8G0+j3oqQKqX76Y7LIFySxo8adFToZI1w+R62mnvB//dWolGw
-TQUU+mZ4Kwutc/VXT9E9/lKhdFQzGlhiSn3oZsreThtD8RVAQk7rqihJq6Y0X0Nq
-HHgMltKwIQbewp/uh7sPmHhSDl6W0OotDRbqgqm1nkAYtNYqbDo=
-=Kloy
+klDfQQ//cP3+C21FaRcV1fIcNPy+nXlDYL1tfAdFpOTKbwE0csQxXPmWB6zBaCjU
+OO6RrC1L5eBqmX/96Nq/reBfbW3EdFvQAc5HeF9FSZqMjZor1eNe+2zWD6kM+5Ey
+/5tJXn6NvQGcaKwduVibrrFiEj1CAvrE0wVRZiD1dq3CmT2pon0wnokbq/t34AWV
+UMK58LcSo7xiY6pWRB5mxU5fMIO8K1flV2nHoJ2OieyM6sxCEA239J3dfRjEXBBY
+nJT06p73+rP/AkdDf8UNrzTl+FzoNC51AOqMCeUFApTjju1qtwAXuEHFUuU8H2mm
+Knj0Zfq0/72mdOmHyXw38m1OPwpDtN6bgVRY4jM26GuXUI9d0F0ZK+SUZLm8I9qq
+x8TmQ6c7HCOH1PGsML5WiG0CjU0zImWoupG8rWKtvKP+DFrj/XInO7sMFhf5Edwz
+sMik5qFsvdvvNQ1E/mIRw5hzTJA6GmTtfyfPF/8BSuMkkP6BJPbVTnZh9n3UoN+b
+tf3GhsqOnCwXgYQZQJ4GX/m0ezaIErrb24bV0CrkoYkEZW4rJWzcxWTU9H0V1bgE
+09rKnyHweJKg9IABdQsi2y5bCO0AwmgmnwwD0u5f9FFuh7w20O2k7oxLigEP+80A
+relxkSqnnWQv+a9s2mKFgJR5tPPJ5zhdD/kQaR14haLvt0762W8=
+=U6CB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a923d292abae..810a4b134163 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Sep 2022 08:39:44 +0000
+Fri, 02 Sep 2022 14:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1bd0ba02f59e..7726002251ee 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 92c8e015d3a9..f08661632cd5 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-4.6.0 b/metadata/md5-cache/app-admin/ansible-4.6.0
index 535658a248a3..dc9e40683a0f 100644
--- a/metadata/md5-cache/app-admin/ansible-4.6.0
+++ b/metadata/md5-cache/app-admin/ansible-4.6.0
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
-RDEPEND=>=app-admin/ansible-base-2.11.1 <app-admin/ansible-base-2.12 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
+RDEPEND=>=app-admin/ansible-core-2.11.1 <app-admin/ansible-core-2.12 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_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-4.6.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e700802ffb2e5566b7b2fffc1b179512
+_md5_=765a60466e8e1296d49b286c1c680bd3
diff --git a/metadata/md5-cache/app-admin/ansible-5.10.0 b/metadata/md5-cache/app-admin/ansible-5.10.0
index 26be38dc34b3..5fde464fd2c1 100644
--- a/metadata/md5-cache/app-admin/ansible-5.10.0
+++ b/metadata/md5-cache/app-admin/ansible-5.10.0
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-3+
-RDEPEND=>=app-admin/ansible-base-2.12.0 <app-admin/ansible-base-2.13 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 )
+RDEPEND=>=app-admin/ansible-core-2.12.0 <app-admin/ansible-core-2.13 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-5.10.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4a31f3facd54c106e6e63398c6599262
+_md5_=f8d990fe975133e4a5932b296ee29797
diff --git a/metadata/md5-cache/app-admin/ansible-5.9.0 b/metadata/md5-cache/app-admin/ansible-5.9.0
index c9d563465d97..7c85ba7905bd 100644
--- a/metadata/md5-cache/app-admin/ansible-5.9.0
+++ b/metadata/md5-cache/app-admin/ansible-5.9.0
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
-RDEPEND=>=app-admin/ansible-base-2.12.0 <app-admin/ansible-base-2.13 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 )
+RDEPEND=>=app-admin/ansible-core-2.12.0 <app-admin/ansible-core-2.13 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-5.9.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c0c1ba64e17cce197412861a73967665
+_md5_=200293fcbb000873d3db4a305e9e6a67
diff --git a/metadata/md5-cache/app-admin/ansible-6.1.0 b/metadata/md5-cache/app-admin/ansible-6.1.0
index 3d0b9075386f..7e90d6605bdd 100644
--- a/metadata/md5-cache/app-admin/ansible-6.1.0
+++ b/metadata/md5-cache/app-admin/ansible-6.1.0
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
-RDEPEND=>=app-admin/ansible-base-2.13.0 <app-admin/ansible-base-2.14 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 )
+RDEPEND=>=app-admin/ansible-core-2.13.0 <app-admin/ansible-core-2.14 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-6.1.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8c5a5ec5c9355e543224c9a9053641a4
+_md5_=c4a75e7c7bc88f561553fbbb117c8dad
diff --git a/metadata/md5-cache/app-admin/ansible-6.2.0 b/metadata/md5-cache/app-admin/ansible-6.2.0
index c7836e9f1719..e49d6b7e10e5 100644
--- a/metadata/md5-cache/app-admin/ansible-6.2.0
+++ b/metadata/md5-cache/app-admin/ansible-6.2.0
@@ -1,16 +1,16 @@
-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-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-3+
-RDEPEND=>=app-admin/ansible-base-2.13.0 <app-admin/ansible-base-2.14 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=>=app-admin/ansible-core-2.13.0 <app-admin/ansible-core-2.14 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
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-6.2.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=09f399a5b27d677880aef35e17061d0c
+_md5_=1c810cd4a97da4059b2ee100c4947338
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.13.3 b/metadata/md5-cache/app-admin/ansible-base-2.13.3
deleted file mode 100644
index fcb3dfc15a98..000000000000
--- a/metadata/md5-cache/app-admin/ansible-base-2.13.3
+++ /dev/null
@@ -1,17 +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-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=8
-HOMEPAGE=https://www.ansible.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.13.3.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=34673a685e8b0e8727c1cafe06685dbc
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.7 b/metadata/md5-cache/app-admin/ansible-core-2.11.7
index 82d5103b4546..d8fd3a81e6c6 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.7
+++ b/metadata/md5-cache/app-admin/ansible-core-2.11.7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.7.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=75111784431fae7d0efab1242c5d42dc
+_md5_=be714440a8df85130707bf7ce8f5ba69
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.12.7 b/metadata/md5-cache/app-admin/ansible-core-2.12.7
index 88959516d8d2..aa5e7fd95371 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.12.7
+++ b/metadata/md5-cache/app-admin/ansible-core-2.12.7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.12.7.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=29daa9f8c9bf42a04b2d2a27cf6eb389
+_md5_=8bfc0834335709bf821b52d71884ae87
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.12.8 b/metadata/md5-cache/app-admin/ansible-core-2.12.8
index b9fe4ff9300c..f0160f62aa32 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.12.8
+++ b/metadata/md5-cache/app-admin/ansible-core-2.12.8
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.12.8.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e49804cbb5634dcc138682b2c9ada5bf
+_md5_=f2afaf32aaae1e8eb38bfa4cda9a3b68
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.13.2 b/metadata/md5-cache/app-admin/ansible-core-2.13.2
index 9d5976f30dac..79d7824bb6c0 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.13.2
+++ b/metadata/md5-cache/app-admin/ansible-core-2.13.2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.13.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3fc68606615229a23b7a6fcd845c780a
+_md5_=22ac6ce8994b3bd764d9f4a77ba8f779
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.13.3 b/metadata/md5-cache/app-admin/ansible-core-2.13.3
new file mode 100644
index 000000000000..a879d1060f38
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-core-2.13.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh 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/a/ansible-core/ansible-core-2.13.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=82af196fad1ff7872e51dd4380080511
diff --git a/metadata/md5-cache/app-admin/ansible-base-9999 b/metadata/md5-cache/app-admin/ansible-core-9999
index d65668b626de..058d1aabdb69 100644
--- a/metadata/md5-cache/app-admin/ansible-base-9999
+++ b/metadata/md5-cache/app-admin/ansible-core-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c27f34e08a5a107466bfaf117453c175
+_md5_=f2afaf32aaae1e8eb38bfa4cda9a3b68
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.4.0 b/metadata/md5-cache/app-admin/ansible-lint-6.4.0
index 23ee22a54ed0..229c03d141bc 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.4.0
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.4.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.8.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.8.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=>=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.8.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.8.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.4.0.tar.gz -> ansible-lint-6.4.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a8881f43da666c0cd2eed3900ede20f9
+_md5_=7cd73238fbaf5b7eafad6d46a9a423e6
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.5.2 b/metadata/md5-cache/app-admin/ansible-lint-6.5.2
index 1eb1e0a2c9da..b7d20527971e 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.5.2
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.5.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=>=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.5.2.tar.gz -> ansible-lint-6.5.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8cfe5acb1040dd51a268315f585bfd5a
+_md5_=e8b2da02821d9198c2e9a8f57e9a8688
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 129450ff69c4..1be58f097d0c 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/xen-4.16.2 b/metadata/md5-cache/app-emulation/xen-4.16.2
new file mode 100644
index 000000000000..56611f442b4f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.16.2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 ) flask? ( sys-apps/checkpolicy )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=8
+HOMEPAGE=https://xenproject.org
+INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
+IUSE=+boot-symlinks debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.16.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.16.2/xen-4.16.2.tar.gz https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c94562b8310827519a50116fd333b23a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.16.2 b/metadata/md5-cache/app-emulation/xen-tools-4.16.2
new file mode 100644
index 000000000000..11df808f45bd
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.16.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,xml(+),threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/markdown[python_targets_python3_11(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://xenproject.org
+INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
+IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,xml(+),threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.16
+SRC_URI=https://downloads.xenproject.org/release/xen/4.16.2/xen-4.16.2.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b7ebbb43cb3afe0e3c4859985211c071
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 13cfad16398f..a69f7d4d3e58 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10-r1
index 9c93667fb8c4..57984fff51a1 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10-r1
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.10.tar.gz -> tuxedo-keyboard-3.0.10.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	56708ddc53d8b607ed88fd97a56e59dc	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=953cf73d2a92ffe00f50e340de4e08fe
+_md5_=44390d3cee00673eb415794bd09bbbcb
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d121ee46c289..fb1626e52cf6 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.3 b/metadata/md5-cache/app-text/bibletime-3.0.3
deleted file mode 100644
index 0adb01c00f32..000000000000
--- a/metadata/md5-cache/app-text/bibletime-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-libs/icu:= dev-qt/linguist-tools:5 dev-qt/qttest:5 net-misc/curl sys-libs/zlib
-DESCRIPTION=Qt Bible-study application using the SWORD library
-EAPI=8
-HOMEPAGE=https://bibletime.info/
-INHERIT=cmake xdg-utils
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0.3/bibletime-3.0.3.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bf5de8ef887eda09e48569cd035efd76
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.3-r2 b/metadata/md5-cache/app-text/bibletime-3.0.3-r2
index 11eaf991d704..7261e36617ea 100644
--- a/metadata/md5-cache/app-text/bibletime-3.0.3-r2
+++ b/metadata/md5-cache/app-text/bibletime-3.0.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Qt Bible-study application using the SWORD library
 EAPI=8
 HOMEPAGE=https://bibletime.info/
 INHERIT=cmake xdg-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0.3/bibletime-3.0.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ee58803cf34eef9b6418a0ffa19fe4cf
+_md5_=8d895d7c9a5762ca235a77efde553140
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.6.1 b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
index 5ba218bb342d..b1bcd1473428 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.6.1
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/libgcrypt:0= virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.6.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=98e90b08bcbd9b1c7cf9e0073dc69a9a
+_md5_=570da3f5773bc1209a5297014565bf63
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 4ce40230f214..d5aa118007fc 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/benchmark-1.7.0 b/metadata/md5-cache/dev-cpp/benchmark-1.7.0
index 78c85d3f2a9f..fce0c57e806b 100644
--- a/metadata/md5-cache/dev-cpp/benchmark-1.7.0
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.7.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/benchmark
 INHERIT=cmake flag-o-matic
 IUSE=debug doc lto test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/benchmark/archive/v1.7.0.tar.gz -> benchmark-1.7.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=02162b56de3ce58be15eff4adf4c1efa
+_md5_=c12840659e9af89460cd9385e4127150
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 659d4d4f6c14..d82afda6dd9b 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libtraceevent-1.6.2 b/metadata/md5-cache/dev-libs/libtraceevent-1.6.2
new file mode 100644
index 000000000000..078fc50972d3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtraceevent-1.6.2
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-text/xmlto app-text/asciidoc )
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Linux kernel trace event library
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
+INHERIT=toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!<dev-util/trace-cmd-3.0
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.6.2.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b5e14a4f12e2059f573a70a4ea5f125c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f439cc701ffc..4a4830e22662 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/ansible-compat-2.1.0 b/metadata/md5-cache/dev-python/ansible-compat-2.1.0
index 762b49745c38..97ed34af93da 100644
--- a/metadata/md5-cache/dev-python/ansible-compat-2.1.0
+++ b/metadata/md5-cache/dev-python/ansible-compat-2.1.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=>=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[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 )
+RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.1.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51586d7ad7329b20d9c000c9eb22a67d
+_md5_=67bbb148d4058d3c3b17a38fe056b674
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.0 b/metadata/md5-cache/dev-python/ansible-compat-2.2.0
index 3492c2a6910b..271f11de0158 100644
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.0
+++ b/metadata/md5-cache/dev-python/ansible-compat-2.2.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.6.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.6.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=>=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.6.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[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 )
+RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.6.0[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(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a1c7bf0627dc8cbeb868f4ea41dfe35
+_md5_=539bd559cea981dc927b2e2c0f2905a7
diff --git a/metadata/md5-cache/dev-python/black-22.8.0 b/metadata/md5-cache/dev-python/black-22.8.0
index e8213c19d74e..775410188a59 100644
--- a/metadata/md5-cache/dev-python/black-22.8.0
+++ b/metadata/md5-cache/dev-python/black-22.8.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/22.8.0.tar.gz -> black-22.8.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f12958b65102f78cf34926807e90463f
+_md5_=fcec196a4bfa8b819723b7530239b9f5
diff --git a/metadata/md5-cache/dev-python/cons-0.4.5 b/metadata/md5-cache/dev-python/cons-0.4.5
index 9329d9a0860e..3b0d72850dc2 100644
--- a/metadata/md5-cache/dev-python/cons-0.4.5
+++ b/metadata/md5-cache/dev-python/cons-0.4.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implementation of Lisp/Scheme-like cons in Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/cons/ https://github.com/pythological/python-cons/
 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 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-3
-RDEPEND=dev-python/logical-unification[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/logical-unification[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/pythological/python-cons/archive/v0.4.5.tar.gz -> cons-0.4.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=807edc9dcfc0657d23099ffae2184847
+_md5_=7717ae37ff6fa38769a439e3751acafc
diff --git a/metadata/md5-cache/dev-python/etuples-0.3.6 b/metadata/md5-cache/dev-python/etuples-0.3.6
new file mode 100644
index 000000000000..d09d89708aec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/etuples-0.3.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/multipledispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python S-expression emulation using tuple-like objects
+EAPI=8
+HOMEPAGE=https://pypi.org/project/etuples/ https://github.com/pythological/etuples/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/multipledispatch[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/pythological/etuples/archive/v0.3.6.tar.gz -> etuples-0.3.6.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=95f2074f51324b377a555d11069c93d3
diff --git a/metadata/md5-cache/dev-python/logical-unification-0.4.5 b/metadata/md5-cache/dev-python/logical-unification-0.4.5
index 8c17c76b1406..6153e6d51d63 100644
--- a/metadata/md5-cache/dev-python/logical-unification-0.4.5
+++ b/metadata/md5-cache/dev-python/logical-unification-0.4.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/multipledispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/multipledispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Logical unification in Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/logical-unification/ https://github.com/pythological/unification/
 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 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
-RDEPEND=dev-python/multipledispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toolz[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/multipledispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[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/pythological/unification/archive/v0.4.5.tar.gz -> logical-unification-0.4.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0562122b44d13a153fd9af083b41134f
+_md5_=68325d71759e79a10edffb15ed7b9025
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index f242b56a06a4..4d10acdba367 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e978e9bdd7c49160bb167644320022c
+_md5_=3cdec060472be8140f655a61864cbb59
diff --git a/metadata/md5-cache/dev-python/pathspec-0.10.1 b/metadata/md5-cache/dev-python/pathspec-0.10.1
new file mode 100644
index 000000000000..37c9964153f6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pathspec-0.10.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[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= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility library for gitignore style pattern matching of file paths
+EAPI=8
+HOMEPAGE=https://github.com/cpburnz/python-pathspec/ https://pypi.org/project/pathspec/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=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_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pathspec/pathspec-0.10.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ce88b0e2214a670d6987c361fc65c515
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.6.1 b/metadata/md5-cache/dev-python/pikepdf-5.6.1
index 6e7e8c397119..ae48fbff5a22 100644
--- a/metadata/md5-cache/dev-python/pikepdf-5.6.1
+++ b/metadata/md5-cache/dev-python/pikepdf-5.6.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[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(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[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(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-10.6.2:0=
 DESCRIPTION=Python library to work with pdf files based on qpdf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pikepdf/pikepdf/archive/v5.6.1.tar.gz -> pikepdf-5.6.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51e0f7cc8c1be9be43e34cdf6845ab72
+_md5_=ce303f1d2b98f9c4c36776a586179921
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31
new file mode 100644
index 000000000000..21ba6511404e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Building powerful interactive command lines in Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.31.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2dd21d20f178f37ab98889f176237ab1
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1.5 b/metadata/md5-cache/dev-python/pyopencl-2022.1.5
deleted file mode 100644
index 51db2c081909..000000000000
--- a/metadata/md5-cache/dev-python/pyopencl-2022.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pybind11-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/opencl-2
-DESCRIPTION=Python wrapper for OpenCL
-EAPI=8
-HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-INHERIT=distutils-r1
-IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[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/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.5.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5e2e591d5fa5c41a9d84c11c66fcca89
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1.6 b/metadata/md5-cache/dev-python/pyopencl-2022.1.6
index 0e7102061157..1dc0e6fdc67a 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2022.1.6
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.1.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
 INHERIT=distutils-r1 multiprocessing
 IUSE=examples opengl test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[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/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.6.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c52e2b5fc0d197dfd2cf1e3f5de10a15
+_md5_=53969f7068b84988996a8691831e5343
diff --git a/metadata/md5-cache/dev-python/transitions-0.9.0 b/metadata/md5-cache/dev-python/transitions-0.9.0
new file mode 100644
index 000000000000..44afbe079542
--- /dev/null
+++ b/metadata/md5-cache/dev-python/transitions-0.9.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( || ( dev-python/pygraphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/graphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A lightweight, object-oriented state machine implementation in Python
+EAPI=8
+HOMEPAGE=https://github.com/pytransitions/transitions
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pygraphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/graphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/six[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytransitions/transitions/archive/0.9.0.tar.gz -> transitions-0.9.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bc4ebbc9882c8252d330d730b1bd1552
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f02880d06753..75760cde278e 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/trace-cmd-3.1.2 b/metadata/md5-cache/dev-util/trace-cmd-3.1.2
new file mode 100644
index 000000000000..c2dc6215ae71
--- /dev/null
+++ b/metadata/md5-cache/dev-util/trace-cmd-3.1.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig python? ( dev-lang/swig ) doc? ( app-text/asciidoc )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=audit? ( sys-process/audit ) 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 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.4 >=dev-libs/libtraceevent-1.5 sys-kernel/linux-headers test? ( dev-util/cunit )
+DESCRIPTION=User-space front-end for Ftrace
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
+INHERIT=linux-info bash-completion-r1 python-r1 toolchain-funcs
+IUSE=+audit doc python test udis86 +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=audit? ( sys-process/audit ) 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 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.4 >=dev-libs/libtraceevent-1.5
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) test
+SLOT=0/3.1.2
+SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v3.1.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=7e8c4194ff7ac9f79368d709de43c112
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 864cf379f9c3..4f21bc98f01b 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/antimicrox-3.2.5 b/metadata/md5-cache/games-util/antimicrox-3.2.5
index 7b3e84d27fb0..3b9b7a95a931 100644
--- a/metadata/md5-cache/games-util/antimicrox-3.2.5
+++ b/metadata/md5-cache/games-util/antimicrox-3.2.5
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 doc? ( app-doc/doxygen[dot] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules doc? ( app-doc/doxygen[dot] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[X,joystick] virtual/udev x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
 DESCRIPTION=Graphical program used to map keyboard buttons and mouse controls to a gamepad
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AntiMicroX/antimicrox/archive/3.2.5.tar.gz -> antimicrox-3.2.5.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dfb82e5e414e7c487a7d367a6036517c
+_md5_=2fa8e4a9fbf84b5a7ef0b9cc6c4e6863
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 5e705c66bbb5..5b72f5064af5 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/fotoxx-22.16 b/metadata/md5-cache/media-gfx/fotoxx-22.16
deleted file mode 100644
index 586212e0c624..000000000000
--- a/metadata/md5-cache/media-gfx/fotoxx-22.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] x11-libs/gtk+:3
-DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
-HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-INHERIT=optfeature xdg-utils
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.16.tar.gz
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2877d4890ca4f6bd5b0933a16b911ee8
diff --git a/metadata/md5-cache/media-gfx/fotoxx-22.18 b/metadata/md5-cache/media-gfx/fotoxx-22.18
deleted file mode 100644
index 01866db9014e..000000000000
--- a/metadata/md5-cache/media-gfx/fotoxx-22.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] x11-libs/gtk+:3
-DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
-HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-INHERIT=optfeature xdg-utils
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.18.tar.gz
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=034c4a4552030315f27245bc4c8d8634
diff --git a/metadata/md5-cache/media-gfx/fotoxx-22.30 b/metadata/md5-cache/media-gfx/fotoxx-22.31
index ce574f8ead4d..a9c5b6a35562 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-22.30
+++ b/metadata/md5-cache/media-gfx/fotoxx-22.31
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.30.tar.gz
+SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.31.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=034c4a4552030315f27245bc4c8d8634
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0535e17c9f39..6a145563ef24 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/openh264-2.3.0 b/metadata/md5-cache/media-libs/openh264-2.3.0
index 159dd76ae4e6..dca047257e51 100644
--- a/metadata/md5-cache/media-libs/openh264-2.3.0
+++ b/metadata/md5-cache/media-libs/openh264-2.3.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.openh264.org/ https://github.com/cisco/openh264
 INHERIT=toolchain-funcs multilib-minimal
 IUSE=cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=bindist test
 SLOT=0/6.1
 SRC_URI=https://github.com/cisco/openh264/archive/refs/tags/v2.3.0.tar.gz -> openh264-2.3.0.tar.gz https://github.com/mozilla/gmp-api/archive/3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz -> gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=06e419d055e8b1b2a23a6cfd8f13d7e4
+_md5_=e54b6e912244dd01ae604e11ca017107
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 596a450c23d1..ee4f91df34c8 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/xrootd-5.0.3-r1 b/metadata/md5-cache/net-libs/xrootd-5.0.3-r1
deleted file mode 100644
index 3045dcad81ee..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-5.0.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) readline? ( sys-libs/readline:0= ) ssl? ( <dev-libs/openssl-3.0.0:0= )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=7
-HOMEPAGE=http://xrootd.org/
-INHERIT=cmake python-single-r1
-IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) readline? ( sys-libs/readline:0= ) ssl? ( <dev-libs/openssl-3.0.0:0= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://xrootd.org/download/v5.0.3/xrootd-5.0.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=728600a71d4e9d494c21ca5d2e073d29
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-5.0.3 b/metadata/md5-cache/net-libs/xrootd-ceph-5.0.3
deleted file mode 100644
index ae52dbc87206..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-ceph-5.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/xrootd-5.0.0 sys-cluster/ceph
-DESCRIPTION=xrootd OSS plug-in for interfacing with Ceph storage platform
-EAPI=7
-HOMEPAGE=https://xrootd.slac.stanford.edu/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~amd64-linux
-LICENSE=LGPL-3+
-RDEPEND=>=net-libs/xrootd-5.0.0 sys-cluster/ceph
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xrootd/xrootd-ceph/archive/v5.0.3.tar.gz -> xrootd-ceph-5.0.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a4f9a502d4ab8194a849c99900169d45
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 84086e33406b..7de1d5789fb1 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/fflas-ffpack-2.4.3-r3 b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r3
new file mode 100644
index 000000000000..8b91040d7073
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=virtual/cblas virtual/blas virtual/lapack dev-libs/gmp[cxx(+)] =sci-libs/givaro-4.1*
+DESCRIPTION=Library for dense linear algebra over word-size finite fields
+EAPI=8
+HOMEPAGE=https://linbox-team.github.io/fflas-ffpack/
+INHERIT=autotools toolchain-funcs
+IUSE=openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=LGPL-2.1+
+RDEPEND=virtual/cblas virtual/blas virtual/lapack dev-libs/gmp[cxx(+)] =sci-libs/givaro-4.1*
+SLOT=0
+SRC_URI=https://github.com/linbox-team/fflas-ffpack/releases/download/v2.4.3/fflas-ffpack-2.4.3.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=03b00184cecb7da1f6f8e07a7cff324f
diff --git a/metadata/md5-cache/sci-libs/givaro-4.1.1-r3 b/metadata/md5-cache/sci-libs/givaro-4.1.1-r3
new file mode 100644
index 000000000000..22007a033a91
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/givaro-4.1.1-r3
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra )
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/gmp:0[cxx(+)]
+DESCRIPTION=C++ library for arithmetic and algebraic computations
+EAPI=8
+HOMEPAGE=https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/
+IUSE=cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=CeCILL-B
+RDEPEND=dev-libs/gmp:0[cxx(+)]
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/linbox-team/givaro/releases/download/v4.1.1/givaro-4.1.1.tar.gz
+_md5_=71f9f8a73f7b55bf9e1a507f2aef12af
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 6e3dc20f3bdc..04eaaf978f2d 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.4 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.4
new file mode 100644
index 000000000000..814da5c00bf9
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
+DESCRIPTION=Notification daemon for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.4.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2bafd8d7e19f249ffec761c112bd3405
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index df06d95e497e..300b39ca6b1c 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-09-02T08:39:47Z
+TIMESTAMP 2022-09-02T14:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMRwVNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMSFbNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYHA//fLlW1M8QaSgzo1SNZJg+DGlXyEUm1yH0Hg3XRQ6LAdPIJnK8SzvO0SrO
-SCqjnV60ci6DD1TqPxS6UCWeBaNTrPamwGp1QD4NnK1XNuDRHZoSTBhzvwVpJWUl
-o8jj1pS52wNTMw9l+vj0K8AQv4MN//jWf6iNB2Lu3RDrIjazqnTLWa/1l7TQzYGN
-f4qMJWdL5imgJlp5KNCRXxjOV4AGdtWD/BklDg3yUMLbqgw/zHY59uq2svaD/QFV
-3NMs04mC1HNqnK6XWWbahVroyPFtVp/WX8THhLeK3nr/yM3JTvIe2QwqL8A8LMh5
-AqZ+9JNcKn3cwrCqcyROgRH/MdivLtLXm0qI/VtbFx0Z9mNrkJt9edmfPytk5LPp
-NZjTV64CUjdQ3KzxrLnwXw5QFa7YcaOUDfwq4wq6I5Cg51Ng+hOReRh1k3Wmy+l9
-qWgZGN2yj2AK4tf3bdE/abynIvpfLqrWhmWQXhHrk1g4y9BEmqW7isDeBKJsIwso
-oKaWWUjOb5pbFRRQ924Vw2XHvdxpygVpsv+QO4WobBfzJ9Hy6CvcVCMBTkCLXoYN
-H9BLyuRxcBmbm5sDky1xx8tznhik7ZwEhM8OHcZF98MEfBZMQHWjMbiKxqiF7QC1
-aNctDyJTjZVUUBG2JqwAXtndWaZZSnWnlT0gS9e1Z7Z++TkBeLc=
-=riNz
+klAcPRAAghlRULgaet0FTD7wTpCVY+g1BfPlkfZcQPB5XiLRKQAXUfRQw4PFhgv8
+rrnRtppVj8vsiVT/l/d717VQ3YsMRD3BbGom6vW5lkWkJ+V3xtvc8XRR4aFUI9Rw
+zdwiSkA4Fe9Ixl053jFDkmEFR86OvlBftv2N3fSYC+sWbQH0AGbI8Pk2yj2IrM5c
+VrEb824fJfNXTiHudpTI0CDML9eB07X0nJXQG3ew87n8glEHTgu3WnbbW3wmD/cL
+GnoJWsD/9bfsP3co+dXLSojeu7n4SPSvaUjSbYMj3/cQ2TFGg6WyzuwsCUvC80Do
+yvhansOc7ckEyw/BuvYHwKc+O9SR1g5QFBOmsdaGHpwmzuUnCT/J/u16du9bpBNW
+Ig3PKxM1SRyeG3ZO7Oeq2Vo8JSMjnMGvEd8SIMuwf9BrWWwbU/7o136GUOpLxhwz
+YjCoeLik3JqUzByHT+lSMv47SkdsDsA3wdubLiyQ4OKQ3EiutZs1rERWOeqXCEgJ
+ec2nWgY6Q2kEKL/XCb6SA8PJiyCpbnsOnz5hrzPIrgjTcVX1tK3cbImaBcLLWwwF
+aLbu+xXsjQN/gWZMmoepFvJGMalDVnSSoDi0VtK96HNm806TEM80ypyclIxFwwnU
+k3kgCw+JUMSpHRcSuvhMPyfNgN6epc7uTDolMndOQ2zpN9BtEF4=
+=9EBG
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a923d292abae..810a4b134163 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Sep 2022 08:39:44 +0000
+Fri, 02 Sep 2022 14:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f7ef50916aee..a50fd0f9eb42 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep  2 08:39:44 AM UTC 2022
+Fri Sep  2 02:39:44 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 07eb55c81ad1..10d6d5928d4c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Sep 2022 08:45:01 +0000
+Fri, 02 Sep 2022 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 05c7b98ab706..633d563773d7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c076f1b7efd64f4f9bc05e54cf3df3eb69a888a0 1662103952 2022-09-02T07:32:32+00:00
+acb2db1792563d9efdb86027e4e5c3b86333ac44 1662127122 2022-09-02T13:58:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f1106c2ba7d6..01cc4b95b37d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1662108001 Fri 02 Sep 2022 08:40:01 AM UTC
+1662129601 Fri 02 Sep 2022 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a923d292abae..810a4b134163 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Sep 2022 08:39:44 +0000
+Fri, 02 Sep 2022 14:39:44 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6dc7b0216cc9..11f41bff3cab 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index d8d897f8adb2..c35229a5fabe 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,4 +1,3 @@
-AUX check_smtp-implicit-tls.patch 4817 BLAKE2B 0a163150461b1c57892ae5802534ecc10cc94af93af846e07a4b66da445280a58e29841834002fcf86b2ed140ba26d420c550283edfef27c242710cf5673670e SHA512 27cb281b9e7fb4bec6250c1af41c74e39b171b05300587496e45d6f314d87557354b11837ec4348c91db92746b564e86f617ecf4f57ac002b4abd2918155f53c
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
 DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff
 EBUILD nagios-plugins-2.4.0-r1.ebuild 3225 BLAKE2B dda29986ebcc2340c6a1c45805ce47b2e0e3218fdcb562d03be4f06c20c26e54328ff07dc3c7e17e2467c699598e7d1b9a3e511af3b52f8ef7e88d94044aef82 SHA512 67d45f7e9cb6332a975694c3c9fd658c47667b439f7d064310e9c2d2a705d30a436ebe50efcb23c78bc1253463270d253085b97bb45cfce3426f00e5452f61b4
diff --git a/net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch b/net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch
deleted file mode 100644
index a0f30d2efdbf..000000000000
--- a/net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 0a8cf08ebb0740aa55d6c60d3b79fcab282604fb Mon Sep 17 00:00:00 2001
-From: Franz Schwartau <franz@electromail.org>
-Date: Tue, 1 Sep 2020 12:48:51 +0200
-Subject: [PATCH 1/3] Add support for SMTP over TLS
-
-This is commonly used on smtps (465) port.
-
-PROXY protocol is not implemented with TLS in check_smtp.c, yet.
----
- plugins/check_smtp.c | 45 ++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 37 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
-index 0b1c54d4..d5923a6a 100644
---- a/plugins/check_smtp.c
-+++ b/plugins/check_smtp.c
-@@ -42,8 +42,8 @@ const char *email = "devel@nagios-plugins.org";
- #ifdef HAVE_SSL
- int check_cert = FALSE;
- int days_till_exp_warn, days_till_exp_crit;
--#  define my_recv(buf, len) ((use_ssl && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
--#  define my_send(buf, len) ((use_ssl && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
-+#  define my_recv(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
-+#  define my_send(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
- #else /* ifndef HAVE_SSL */
- #  define my_recv(buf, len) read(sd, buf, len)
- #  define my_send(buf, len) send(sd, buf, len, 0)
-@@ -107,6 +107,7 @@ double critical_time = 0;
- int check_critical_time = FALSE;
- int verbose = 0;
- int use_ssl = FALSE;
-+int use_starttls = FALSE;
- int use_sni = FALSE;
- short use_proxy_prefix = FALSE;
- short use_ehlo = FALSE;
-@@ -199,12 +200,25 @@ main (int argc, char **argv)
- 	result = my_tcp_connect (server_address, server_port, &sd);
- 
- 	if (result == STATE_OK) { /* we connected */
-+#ifdef HAVE_SSL
-+		if (use_ssl) {
-+			result = np_net_ssl_init_with_hostname(sd, (use_sni ? server_address : NULL));
-+			if (result != STATE_OK) {
-+				printf (_("CRITICAL - Cannot create SSL context.\n"));
-+				close(sd);
-+				np_net_ssl_cleanup();
-+				return STATE_CRITICAL;
-+			} else {
-+				ssl_established = 1;
-+			}
-+		}
-+#endif
- 
- 		/* If requested, send PROXY header */
- 		if (use_proxy_prefix) {
- 			if (verbose)
- 				printf ("Sending header %s\n", PROXY_PREFIX);
--			send(sd, PROXY_PREFIX, strlen(PROXY_PREFIX), 0);
-+			my_send(PROXY_PREFIX, strlen(PROXY_PREFIX));
- 		}
- 
- 		/* watch for the SMTP connection string and */
-@@ -230,7 +244,7 @@ main (int argc, char **argv)
- 		}
- 
- 		/* send the HELO/EHLO command */
--		send(sd, helocmd, strlen(helocmd), 0);
-+		my_send(helocmd, strlen(helocmd));
- 
- 		/* allow for response to helo command to reach us */
- 		if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) {
-@@ -243,14 +257,14 @@ main (int argc, char **argv)
- 			}
- 		}
- 
--		if(use_ssl && ! supports_tls){
-+		if(use_starttls && ! supports_tls){
- 			printf(_("WARNING - TLS not supported by server\n"));
- 			smtp_quit();
- 			return STATE_WARNING;
- 		}
- 
- #ifdef HAVE_SSL
--		if(use_ssl) {
-+		if(use_starttls) {
- 		  /* send the STARTTLS command */
- 		  send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
- 
-@@ -495,6 +509,7 @@ process_arguments (int argc, char **argv)
- 		{"use-ipv6", no_argument, 0, '6'},
- 		{"help", no_argument, 0, 'h'},
- 		{"lmtp", no_argument, 0, 'L'},
-+		{"ssl", no_argument, 0, 's'},
- 		{"starttls",no_argument,0,'S'},
- 		{"sni", no_argument, 0, SNI_OPTION},
- 		{"certificate",required_argument,0,'D'},
-@@ -516,7 +531,7 @@ process_arguments (int argc, char **argv)
- 	}
- 
- 	while (1) {
--		c = getopt_long (argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:SD:F:A:U:P:q",
-+		c = getopt_long (argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:sSD:F:A:U:P:q",
- 		                 longopts, &option);
- 
- 		if (c == -1 || c == EOF)
-@@ -633,9 +648,13 @@ process_arguments (int argc, char **argv)
- #else
- 			usage (_("SSL support not available - install OpenSSL and recompile"));
- #endif
-+		case 's':
-+		/* ssl */
-+			use_ssl = TRUE;
-+			break;
- 		case 'S':
- 		/* starttls */
--			use_ssl = TRUE;
-+			use_starttls = TRUE;
- 			use_ehlo = TRUE;
- 			break;
- 		case SNI_OPTION:
-@@ -694,6 +713,14 @@ process_arguments (int argc, char **argv)
- 	if (from_arg==NULL)
- 		from_arg = strdup(" ");
- 
-+	if (use_starttls && use_ssl) {
-+		usage4 (_("Set either -s/--ssl or -S/--starttls"));
-+	}
-+
-+	if (use_ssl && use_proxy_prefix) {
-+		usage4 (_("PROXY protocol (-r/--proxy) is not implemented with SSL/TLS (-s/--ssl), yet."));
-+	}
-+
- 	return validate_arguments ();
- }
- 
-@@ -851,6 +878,8 @@ print_help (void)
- #ifdef HAVE_SSL
-   printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
-   printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
-+  printf (" %s\n", "-s, --ssl");
-+  printf ("    %s\n", _("Use SSL/TLS for the connection."));
-   printf (" %s\n", "-S, --starttls");
-   printf ("    %s\n", _("Use STARTTLS for the connection."));
-   printf (" %s\n", "--sni");
-
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 0d4b393d5f3a..65f6c9d02807 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 995b204e04e2..d89dfc4750fa 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,6 +1,4 @@
 AUX xrootd-ceph-5.4.0_no-werror.patch 537 BLAKE2B c07404d729e6b8328c849125b543d2d31df51c05d97dd7481c39762c5b32a20b6e9715afdd9db448d90b06be15b6207021bf1c213593c8c2046304c4c284e312 SHA512 1418e185a6c799ebf9d4eb97044055cba3afdfd8f742f08e34f6cea8a01f795cf538a7a3ec1b387e9cbdba01776bbad27d83f8c58898c3f128d369c342830ce9
-DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
 DIST xrootd-ceph-5.4.3.tar.gz 82057 BLAKE2B 3ca2a812e6a55d696c1336b28114e9d4ec46c18d764ab8966533e150bb7e3a040c58a957c73adfd4f79038b82ebafcc3b09eae2d7b06aba41e36ce94c36ac3fe SHA512 b1065cf55d3918eef5083ebd1737139a761a28e4cc41cd2b796e2a0157d7a86850e643cecd89aeef89419485397676ac7040df5a5e2e9f7405d26320dbe1c9e3
-EBUILD xrootd-ceph-5.0.3.ebuild 953 BLAKE2B 3be28efa893f4d0a7b9a37229e460acea95e45f3714901e499ed05010199722a7e8000faa75b12b55a79fcd1e101a51c9e427604891cae7f71cb95736b188539 SHA512 e0d229329f66f98099a15968b2965a9136c59d6eda74857531cfc56a29e304488ddfd2c37e618983f95fe37d0f0596419f98b1aee429a45a63fe82d29e7625cd
 EBUILD xrootd-ceph-5.4.3.ebuild 930 BLAKE2B 3e9e600166da09de8b7834638d9c4dbf0188a1b0843198d1e3074bf7a57686f82323a27b9331482e2b0178fc1550435cf233f4d9adf0b95c7a0ad19867297a10 SHA512 cab7ccd34c1ea2097480b33de8b6884279f15d3f23f73e4f6144af63d05771bb7401d0f3a40887639e29b6b49af88fff406937b81c1034a87a57bde915afe62b
 MISC metadata.xml 497 BLAKE2B 00adeee3406c60c439ddc3855a8e470837ef34c5e29b26641255df7833fb59f1f68e62316fdb359012683415291f8af9ea21d6be59547bae4d3aa02fa8179fb4 SHA512 81179966535b582a62bd4e758dd55839b8c3063f6a7666eb8720dabd78ce4a77c143c2afd0367031ba483088d4e5769e3e35e9b04fcd4f9f1844aac03f7c53c3
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
deleted file mode 100644
index fe49b3f4f5c1..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-libs/xrootd-5.0.0
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		# As of 5.0.3 the default plug-in version is still 4.
-		-DPLUGIN_VERSION=$(ver_cut 1)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index bbbede0d5a63..6026ad32b824 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,9 +5,7 @@ AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053
 AUX xrootd-5.4.3-no_automagic.patch 454 BLAKE2B 78fdb01301a342db1ea3685f5513f56449ed69af0e5ecf48545af7c8e2cb00f58b68660b812f64dcdc15df4d1bc303ef127fe85c0b9ea7ebc4a9518ab0d30c11 SHA512 7aa1e7d2f2a86e2222a4bf95ca344994d67bc25dbb3ffce27c36634dcecf8dd828a3072f04dd266014e7fd8cab8a06135959a8ee10f3003dcbaf43ac5658d3e5
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
 DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72
-EBUILD xrootd-5.0.3-r1.ebuild 2666 BLAKE2B 553cea29036e2bfc922ab6604f66d001acc838c800b478131f46a674406b3f6302a7c4439e162496507a13ff7b0ef7665abe37edfcf5eadeff96720a5a908592 SHA512 daa560edcd935fc8ae9c21013fc5c83257ffc1eace97f2bf9aa90666d615b5206c817462f5f5fef84573a6e86db23f71a66afb5443829bfa7495bca716a8b384
 EBUILD xrootd-5.4.3-r1.ebuild 3236 BLAKE2B 9e1aa0733247cbfde76a1a53b87e9c7e44f58a5465cdc6b5e741757ad8a1a6e8515879d27324f8ee994ccc5fea1433804f27ce7113126b8b0b34f605e54c5787 SHA512 60d917d1737b2053bf23150464590b97c231010d16bd535df2147a3b89b73c261750342f9c1133d7eff5abbd84b0b41232f360eb9928862518937fbb74200274
 EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B de3810bbf345c8576b7bbc1835905e600d58edfe694eb631214d0c075f0acf11d8ae95e24252f65ede89b8f48d80bce740992fa65dc0fcc892c8c51b362fe91e SHA512 4c89f8a9d3a1dd61130fb63b5b1d8548d1f555e76ffe8dfe1ee9cac112c0a18a8fa07a61bbd758fc1743771f7b92c775d1f5bd73e1ff185eb0dbc0be0a82918a
 MISC metadata.xml 1124 BLAKE2B 28d63d184e1d3c53c1cc1ec05f9508e0cc99a0a6a14e405aa8cdeddcf20cff0e825d814531826544b58e51b4996948718407ba1269966037ad7f00ab8807b2c7 SHA512 3aac33a0c6eea3f0ea2e105a0c5b000a0d9d423ed1d2cfc10619142aa5de35fa4b27fba6aa224bd95020c5d9ec278a89bbd0468c38d674fb53e989bc738f001e
diff --git a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
deleted file mode 100644
index 63d03a9265a8..000000000000
--- a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( <dev-libs/openssl-3.0.0:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2b2c70ceacc7..2f622772bc2c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 1bfc099be13f..6dc55ad9a1bc 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -3,7 +3,7 @@
 
 # Various packages requiring Rust.
 app-admin/ansible
-app-admin/ansible-base
+app-admin/ansible-core
 app-crypt/acme
 app-crypt/certbot
 app-crypt/certbot-nginx
diff --git a/profiles/package.mask b/profiles/package.mask
index 04fa0bed4acd..c2a184f93289 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Marc Schiffbauer <mschiff@gentoo.org> (2022-09-02)
+# Dead upstream, open bugs, removal in 30 days
+# bugs #829447, #836227, #862504
+mail-filter/sigh
+
 # Michał Górny <mgorny@gentoo.org> (2022-08-30)
 # Flask-Security-Too is a package with high maintenance cost
 # and no revdeps in ::gentoo.  The next version bump (once more)
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 2cdcd10dc1c9..91742f7d8e70 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -12,3 +12,4 @@ move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
 move dev-python/PyQt6_sip dev-python/PyQt6-sip
 move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
 move net-p2p/go-ipfs net-p2p/kubo
+move app-admin/ansible-base app-admin/ansible-core
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3d73c563ddf8..728c7404b355 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index ea87aea9753f..5fd7e3824d01 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -1,8 +1,10 @@
 AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec
 AUX fflas-ffpack-2.4.3-fix-internal-linking.patch 2599 BLAKE2B f0bdb27bc8fdc62661c651f6d292774b5c130dadcec39116eceb65e09a771218a83eadb4986285477edb10c7b273629f9bf91cb43449f137f18310c347dae0a3 SHA512 5ab624546d52833fa5797890520771718ee89127149dc208f3e0cd4b1399741724576949b824539bc6612b625ce64a00a903ba3ac003d2c85104a1faf10f1434
+AUX fflas-ffpack-2.4.3-fix-pc-libdir.patch 586 BLAKE2B 030fab1e53b4584816ccd8961357c9d6c47375cb02d56b65cf5b53bfc659a5c2ee36dd2563f5c1a62b0dbcd0dc841d53bba5da0709f589c9dfb5f87f3d3cfd71 SHA512 11607abe8bf71ba50eaba74dc660261c768c5d01cd2f6775c642bc7878a32bb718575b4cbcf8de9de51defdef658ce377193912c35dc3bf045753543882a9087
 AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c3857385791a5c24c00ee2327192fd1c5dcb1a169ad97fa50d21124f054737dd6a1dd1c5c10377865b5b144b31eed728dedc89ea001 SHA512 8d6b3c9bd6637f1c3bf43ce722e96bd9e48b0e271cec1fb4ae72ab2e99ac7b436626385dd2e39781959248506c19474ac062c8ced2c63db80553150f8e7a0287
 AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1
 AUX fflas-ffpack-2.4.3-no-test-fgesv.patch 1268 BLAKE2B 51c0cf74dac9b296a944e918475807e97a2cf71f066cda9c067b63b344e260b9fbb9ea2851db7ac2170e2b239c0778be0c9a99e0efbbbb9215df921197208784 SHA512 9a57cba58a6bab69092c4d335d92994651bb51d2f4e867d4f0396813e14f492d720232779615299b5203603bb76553ec8a4881ffb9677c349f22c0ef3975df0d
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
 EBUILD fflas-ffpack-2.4.3-r2.ebuild 2245 BLAKE2B deb3c0666641c90eb6789d83023b394423c0fa0f3e1167d787d7ba1d68fbeddad9855c1a2e252374990bf0948b99ada21fc8019e6ada0791e8f9b52120b691de SHA512 e12cb9f870745ccc604f2511a71278db867f6f911ee13c8beb4137515b3e0d22845f98fcc1a94a1cfee8e6703f3937151ac258be41cbc109e46dd5db9c216db6
+EBUILD fflas-ffpack-2.4.3-r3.ebuild 2245 BLAKE2B 5c47c02b52c579123f87d2dd64769a754deeebf2ff0cfacaeb964a6e9a491b522919098e37489021377b34bbe453beb0f44a28b19b6894601d55932edff90838 SHA512 08cfa565b5d1b00429ac4f8c640f07382368e4d91a5cf7207723b62225cb6dfe74fbaf13293f65bcda5b0279f8f8ec08266b24797f24d00620fbbfd90370e06b
 MISC metadata.xml 1492 BLAKE2B 46a6b13fb1bae6f2aa43a9d7a96c7882d4d7de4b885a4ac92f320f72ce3076ad820c4c5f75c0f2d60334801d2764c20524ea26c1cc6c9975be13e00906708927 SHA512 fc6d90e2945f67a32594f601df69952baec0821d1e529a03c8dc332723848ca531f747efe7c30ea00885c4c4a081cdb81c0ea05085e7ca3acd7db304bb4f468b
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
new file mode 100644
index 000000000000..87c452d6e355
--- /dev/null
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Library for dense linear algebra over word-size finite fields"
+HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
+
+# Our autotools patch hacks in PKG_CHECK_MODULES calls.
+BDEPEND="virtual/pkgconfig"
+DEPEND="virtual/cblas
+	virtual/blas
+	virtual/lapack
+	dev-libs/gmp[cxx(+)]
+	=sci-libs/givaro-4.1*"
+RDEPEND="${DEPEND}"
+
+# The no-test-echelon patch works around a test failure that may
+# eventually be fixed upstream. Gentoo bug 725446 and upstream
+# Github issue 282. Same for test-fgesv (bug 807100).
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
+	"${FILESDIR}/${P}-no-test-echelon.patch"
+	"${FILESDIR}/${P}-no-test-fgesv.patch"
+	"${FILESDIR}/${P}-fix-internal-linking.patch"
+	"${FILESDIR}/${P}-no-fabi-version.patch"
+	"${FILESDIR}/${P}-fix-pc-libdir.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	tc-export PKG_CONFIG
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-precompilation \
+		$(use_enable openmp) \
+		$(use_enable cpu_flags_x86_fma3 fma) \
+		$(use_enable cpu_flags_x86_fma4 fma4) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse41) \
+		$(use_enable cpu_flags_x86_sse4_2 sse42) \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2) \
+		$(use_enable cpu_flags_x86_avx512f avx512f) \
+		$(use_enable cpu_flags_x86_avx512dq avx512dq) \
+		$(use_enable cpu_flags_x86_avx512vl avx512vl)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-pc-libdir.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-pc-libdir.patch
new file mode 100644
index 000000000000..e397758b5fc5
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-pc-libdir.patch
@@ -0,0 +1,21 @@
+From b1f7cadc105bcf1264da68ab69e0cdc6f8a5aa63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com>
+Date: Sun, 7 Aug 2022 14:15:49 +1200
+Subject: [PATCH] Fix fflas-ffpack.pc.in for issue #364
+
+---
+ fflas-ffpack.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fflas-ffpack.pc.in b/fflas-ffpack.pc.in
+index b869dd8f..8d6c823a 100644
+--- a/fflas-ffpack.pc.in
++++ b/fflas-ffpack.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@prefix@
+-libdir=@prefix@/lib
++libdir=@libdir@
+ includedir=@prefix@/include
+ 
+ Name: fflas-ffpack
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index faff0df8d192..10b5cd0ac53a 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,4 +1,6 @@
+AUX givaro-4.1.1-fix-pc-libdir.patch 549 BLAKE2B f564256b81f1e2ef42bca171fce581e603887905dcf7fe8c881e59aae82d062767efdb096598f92bca09e9127c98fe023e9c034b5b38ef4ca575da9e877ca334 SHA512 927b1a15c834ba2c1cab37e1fdac1ab1c347cba7aba98be652e2ed4468d2a0627cc7f4820561655d1a223c02f8eaba7cc2911acb9998fc853dc20590fb1c74ef
 AUX givaro-4.1.1-gcc-10.patch 1035 BLAKE2B 460371ff8e628e1945a29d9c6d2b718c7d98b07b023540bc49a439cd941a19191db44536a1514495014084a85028debfb4e714d6d9efd9ae7c7c12687d5f8400 SHA512 3e154b3cf6c11a106f78778eeaaf0c2cfe81e25d18f623b5b071b306f1221c8513f27f87ab3e3684a8b3f18138dfbb516c33691dbb854072a35a0be21ac0bc48
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
 EBUILD givaro-4.1.1-r2.ebuild 1850 BLAKE2B 43eb2f568b4169ca1ad1240ef6410fc56773c7790ccf310219b18bb9cc922e3d08617b19748c3e9d3a6cb1bab09e3ba929896a2b7a1b97f06e5236e2082d772f SHA512 03f79aa8a454c4fe1c62901cd7dfd204f813ab8feea3dd98d41c4a341e78bf374a1a8195c5ae29afae0ad2fc04eb81890c862a96d797a988d5f2a04598e53508
+EBUILD givaro-4.1.1-r3.ebuild 1901 BLAKE2B 8cd518cd36aa7329f21fb2ceb00f1786e93b17a6d050b127d6dcf2e3e7ce763d96b3e12948df8a926feed4a1c473aaf0d10061a3bb46e7ada01daefa096d58dc SHA512 378be5753f88b1eff194a00764eea2458603f14e65b62c7262b85e4bbbd0853ce4d211d07fc49e0f36c918b5646c20a4ecbe29bfdd6acd922c52060626376666
 MISC metadata.xml 769 BLAKE2B b407b31de2f554fdf554b2d77c2dd0b1bbf39f36b29fdf565f50362153798c60bcfecf0411247eec556ff6ddc92af0c49e11a9b242b5e3e7b7dcc1066527d08c SHA512 063ccc3fcd55f3d7033fd23efe5095d83784d0e60cca2e1092e534fe06d0e69d5d340a0a25547bddc2962d2906c14a2c996852e2c198124ed007ecdfde4fff2e
diff --git a/sci-libs/givaro/files/givaro-4.1.1-fix-pc-libdir.patch b/sci-libs/givaro/files/givaro-4.1.1-fix-pc-libdir.patch
new file mode 100644
index 000000000000..35a536c04ad8
--- /dev/null
+++ b/sci-libs/givaro/files/givaro-4.1.1-fix-pc-libdir.patch
@@ -0,0 +1,21 @@
+From f5cbcebd7fcc2b68d6e1e9f1ba3aa53b9ed17b56 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com>
+Date: Sun, 7 Aug 2022 13:25:24 +1200
+Subject: [PATCH] Fix givaro.pc.in file for issue #200
+
+---
+ givaro.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/givaro.pc.in b/givaro.pc.in
+index a4805555..9487ef8c 100644
+--- a/givaro.pc.in
++++ b/givaro.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@prefix@
+-libdir=@prefix@/lib
++libdir=@libdir@
+ includedir=@prefix@/include
+ 
+ Name: Givaro
diff --git a/sci-libs/givaro/givaro-4.1.1-r3.ebuild b/sci-libs/givaro/givaro-4.1.1-r3.ebuild
new file mode 100644
index 000000000000..f1ac1cd50f83
--- /dev/null
+++ b/sci-libs/givaro/givaro-4.1.1-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="C++ library for arithmetic and algebraic computations"
+HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
+SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="CeCILL-B"
+SLOT="0/9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+DEPEND="dev-libs/gmp:0[cxx(+)]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}/givaro-4.1.1-gcc-10.patch"
+	"${FILESDIR}/givaro-4.1.1-fix-pc-libdir.patch"
+)
+
+src_configure() {
+	# Passing "--disable-doc" also accidentally enables building
+	# the documentation, so we can't just $(use_enable doc) here.
+	# https://github.com/linbox-team/givaro/issues/148
+	econf \
+		$(usex doc --enable-doc "" "" "") \
+		--with-docdir="/usr/share/doc/${PF}/html" \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_fma3 fma) \
+		$(use_enable cpu_flags_x86_fma4 fma4) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse41) \
+		$(use_enable cpu_flags_x86_sse4_2 sse42) \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 0dc8dd794c88..fd30d1f59188 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 3c6730dab27b..c61bc7205025 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-notifyd-0.6.3.tar.bz2 547511 BLAKE2B 73aba96f6bd2116e87e20928ca74ff985ee74b8f39bca96de81e59ee5677bfacf9a2c78caa42ba43ece7e754fd7a8006ec1d3a507d89e4a2d6b4011d53e21d80 SHA512 9113018c238878c2584cb4221dd5aaaab9d8af5a86fb738f8f9deb863147343c0527582d8e45619bec3b7aaf3bbe045e41a33e306eacc20f946c971a8164935a
+DIST xfce4-notifyd-0.6.4.tar.bz2 554776 BLAKE2B f594ee8a841e4074592a6377e79fde8dd89574620a433a9813f4ad106d712361e941b443de481cb9d140a47e7b1b4753116b4f949c39b6834926f0708877fb6e SHA512 644e2e49092892e386a9f82edc6ab3b2b59ba67617d9217fb43dd3cf74ae5cfc9b9bea6ed0fab4c4440eca68613aa996d9f8dc73deb1f60926217b7db18cc73b
 EBUILD xfce4-notifyd-0.6.3.ebuild 909 BLAKE2B 8839419fca13a63a384c289d0d020eb8770092e11004107d6b486badc5696391fa4b2c227d39ef622fe2621b927ced9d514b386e0e8f3faa2d78fda3d1da9d45 SHA512 915ce660d4dd028ba96a134d909b9f0dbb2c630df2aef62bf62726aab8d6200d985aca04781d59c393563b2c9e6dada8fe426d51be99bd2934382e3d1a65acbd
+EBUILD xfce4-notifyd-0.6.4.ebuild 910 BLAKE2B 975f8ff37fb4f5308fd091144001b813af01bed4affd8231ed657394da65babf5aaca0c6bcef98410f4e8fb955dbfd79cb4c99b822486253b7d0c00ea1ec167d SHA512 3b33560c5afa9403e950b62c1270f7815b7b832c454e3f193eea08137cb7e38e528cf1d8388c4f8aa810e405d06cddc9e2c3e3d94272208c01fac9aba47295e7
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.4.ebuild
new file mode 100644
index 000000000000..8273e159ed4c
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Notification daemon for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libnotify-0.7
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.10:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}