gentoo auto-resync : 11:07:2022 - 13:30:02

author: V3n3RiX <venerix@koprulu.sector> 2022-07-11 13:30:03 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-11 13:30:03 +0100
commit: 5305195b55d8632768f01d641fabf2af7b0df2aa (patch)
tree: 6ebf505cc679c8af44183ec10eeec80cb58fab9c
parent: fbe1e64cf651fcf73e25d2d3115003bf59e231cd (diff)
159 files changed, 1426 insertions, 2381 deletions
diff --git a/Manifest b/Manifest
index ab7e0ae0e6e0..bb32cf955a6d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29578 BLAKE2B 425fd172c422664d75c09f521874e4dd146dcf38ab37241122220e2f03f1faaab36dfd62cd93566af3ea1cff01a2c1c2871f6f246dddb9d3166469a17a56d228 SHA512 a2a839d838ded37f5d8e88e9608fa2907e54e81a9dc9ff636a4bf94dd86ece0ea97de672200b9fa11aa94baf73c0baec9d64e4a56dc70b867833b78765efa56d
-TIMESTAMP 2022-07-11T05:39:48Z
+MANIFEST Manifest.files.gz 29575 BLAKE2B 9d7e1d5162458d5b7aa97298a7272287b2e7628f8e89b8ac8deb213052314f24d117dbd1d767c7224c08407c3642c14a0246d0ae45ddb9a5a23e1f97f756382e SHA512 69cf1c972700252555ce75831f60b22f33094d7877748494cc754c482cf15d7fe4eddff10119f03084a6dd239bda8742e89b5d7d151f9486718b44460215559e
+TIMESTAMP 2022-07-11T11:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLLt6RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLMDANfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZtQ/+JCwCueYYJWYFzdc1i06KX3x9b/dXNJj1pNJWfry4JEOBu1KdegR0HIK0
-4Ziwm2J9p+GP4EJPyjMGNrCPl7/2LVj3Z1M6ciu1fuFpunYEurwFB9YmEE132FOD
-/0ROixxqk/FnMKd4y2gY36Q9aDWyD4SgwYpkTVULirUPpcsuOF83xR9SMiZJbYc2
-EC1cyUXsVLbJm8cgMVLgsDhxoMcb+1ZIXp1N1L772CN7hpHsNggnIC9stDEgTpSW
-F4E7F3rqbZrSUa0/vYBWemZL2DOEEIuiCky+8q9ER4CnvlDeZziNmUCg4uzkgwYp
-25jGiyeVf+1OvUprNfufFNt9zz3bQ5cG2GksXKbmJaXYhSTxFAZzsBuvX33SgyCa
-s0CXsDPya0zYb9ke5WYo8cpzpMnu3RzKu1IsY103zAnPNu+cWyEcD4LTQhXj0AdI
-fMpN/mXwsjd+k3r4XBUUJ5358wfl6DsJ/aN0xxSgldozZ9rmruf7hkF7yxUk2soS
-gq11RaXBUtzIkQyQoZDi/TJZs2VF5kJ9VTTTLAqh4xX3VTXlL1Gc3glGqw/s7oK5
-ogqZhTvM3nJc4Hj1GpV6kPPEDyFlLqywtJL3eOb9dBJ2OXYhhGe+ICDIfWIjCZOK
-Yg4wNOvSN7nCcyVDIg83yHjNzZV4cKBKFpFUkl91j4bbkpC7L5A=
-=zBnO
+klAvlA//R+5EY3VnbGD87mv8+5S/v1b+OJGGVai94pQmOnZgWdERC1klX3aqTWbv
+j+juqON9+/vBGdxJlpUxHiHBMglj4t4eQZJN94KLhLYUzEUwYTTagbVO1xpobxYN
+w13deSu+uNjF6I3uCkvQf5SUuy/cnmuu3GwOAWUe5A4BD3VVxzjeCwpLMWIz972I
++nevd/Z7wEgYJIcKC+nk0oQuSGnMfB8PwZTCWdEfRL9xSt9g1Y2fyKcUQ6o9mycJ
+pXFW55LRzK5Z5QWIJBZBZAnklREYXpW6D8hJEKEaB4wPWfmANSYX2Ej+vNq2PPjo
+qvwF5fZwifIc09SMeiUJID0ha5lyU1JZS9TsEFDloa+ujyIbxTa/k9FtYHjcm/nX
+ONTFBvv9V7Bh7cfEnDMyw71r6NOuQ05XqyDswV5g0A2i5OWi3q32383LoejCDeOk
+kCvQk9YXd8nrJ+MNj1vHxU8w2K+7hcDp46q7n+Hi5RLDaPjyccV7isMEoTupXo5k
+f1UfH38Spz4bQUMXIHKi0xoS/5nJ+k7FUQ1Q4CduK7N9I2N52naka65sM0icNMn4
+4A4bYy2vRlmsHLSrTIIgk9t/htTcN0JFdV13Ir7RdSbdM3RjbgJUlqMuHEPgVlBS
+jfjCiZneBikYgSwYHx/rEWjoN2EOJHF6DFI1XWav/ih5LYX57Co=
+=MU8N
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4fdd6ae387b3..6f1b4a4dcb51 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c88bc73ef4f0..5a9d21513fdd 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 bd896209f313..0ff8b1a23eb8 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -21,21 +21,13 @@ DIST OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b640
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
 DIST edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz 13998677 BLAKE2B 3614ceb69e295a6afb37c7905d0aec3534d8daf3d9f22137c1b722da6dc764a3669d99af03f96155d45feb5058a6f725acf37d1048186fecff4232d64f96e97c SHA512 a1933d815b947fd4f13c96970a6dc36c3048e3ddf27c897684104b0129cf58331e46d3147062ae1fb8973f08cd373c319788dd850ac5e45da385eed8368571a4
-DIST edk2-a3741780fe3535e19e02efa869a7cac481891129.tar.gz 12886279 BLAKE2B 2054bb84375b9840b31276f86786ea764368da200087e45c0528f2ca6b17aa9078a05e406bafa41c25cd65971ff007dfa19ffe91f9a5a2ab6c845bc6f62df3de SHA512 ca0543fefeb1fdc8d0d9841de309ce40fe88220463569a77f56d3fe3184fd4a57ce00b3c96c0861a51b7dbf5f4a9f9946b960a636593682f380c861f2606d190
 DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68
-DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
-DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
-DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
 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-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
 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-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
 DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
-EBUILD xen-tools-4.15.2-r2.ebuild 17828 BLAKE2B dd49a8492b9b2b27eaea3702aba04d663a8f4eb052e4d92f34b8ffd3165ef23d6d20b024a5894ac5ff9555cecb0efacb785d6a70a9393c564862e1e8a3b7e267 SHA512 1955d40d91295250d173568c80dea737c082e17c4e90e5c980158fea90384b6705cca5911207d23da67b9eed6779f8a558e848322b495dbb42e1b0ae890f9884
-EBUILD xen-tools-4.15.3.ebuild 16674 BLAKE2B f46069a7e22d990a5afa8700241d420f99b4d1306aa12d146b3528016f4d2654fdf6b23bd5397621c806a4ece794b7102c3e18d2b34a71673b3b0a0a8544a799 SHA512 e7fe61daefbc84ed277581eae742e158cb8ee488c9a5a1a6d2ca59492805773941ccfbc986b0f756ec6b917d7cc68e0c455c380e530ef5ec23e48add0de9418b
-EBUILD xen-tools-4.16.1.ebuild 16548 BLAKE2B e16e6217d6573365bac929c0c796232876ff480bb53d46bea52e707158f582566543ee1688b161f1c95e9a45818c30d82e98b0fb003acb1239440d1b5dd3e984 SHA512 83dc4460ede881c701641d700dbd938d42f7b6bec2e9c2674e4d925ffbd61d25f7a1e3ef11a17547101011f293c9bd1da97514b6bc16f31cd57141593519832e
+EBUILD xen-tools-4.15.3.ebuild 16673 BLAKE2B 5564ae42258c6eb413b4b29730d6fa5823f4479dd8b483d2ef093ab1d1ae9e234d3b42bcfd1fdb1667f0584604cc54fcef76be6f2bb03e862fc8302053e89999 SHA512 9c774445827cca9995f488e1bd5ae37a6a3402774e45c62a984fc3331ba53f5546f664504fb487474e4dd856f541263dc1de1ffbd909b6a1318db24916e0dc65
 EBUILD xen-tools-4.16.2_pre1.ebuild 16785 BLAKE2B fcb88e3b26c6fab27fa3f82c4f5684044087cb1479e470bdc5ed1985016cb3cf44c41733b7eb06f5bb9648d2c46dcbd456f0938439ab3eac357281c7e6dc66f9 SHA512 911c6e0731ddc7b6bc7a567e25155ab0d05ad537e970cdda961f3904b9ca73696698c7b5c9ae7d4669cd2e4fab8e9b40f2e7f22c85eae6e77c7e49c20fb2afca
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.15.2-r2.ebuild
deleted file mode 100644
index 39425cd356e6..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.15.2-r2.ebuild
+++ /dev/null
@@ -1,555 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-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"
-	UPSTREAM_VER=2
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=23
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="a3741780fe3535e19e02efa869a7cac481891129"
-	EDK2_OPENSSL_VERSION="1_1_1j"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://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
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-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 ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	qemu? ( sys-libs/pam )
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	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 ) )
-	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:=
-		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/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-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/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"
-
-PATCHES=( "${FILESDIR}/${PN}-4.15.0-fix-xenstat-python-bindings.patch" )
-
-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() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# 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
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		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 "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote > /dev/null
-			eapply "${FILESDIR}/${PN}-4.15.1-edk2-python3.9.patch"
-		popd > /dev/null
-	fi
-
-	# Fix building with ocaml 4.12 #818100
-	eapply "${FILESDIR}/${PN}-4.15.1-ocaml-4.12.patch"
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${WORKDIR}/patches-gentoo/${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
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/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 ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || 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
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/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) \
-		--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
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 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
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
index 3c52b578af80..6c9c7c9fec49 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 
 	SEABIOS_VER="1.14.0"
 	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
diff --git a/app-emulation/xen-tools/xen-tools-4.16.1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.1.ebuild
deleted file mode 100644
index dc73508d5fc5..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.16.1.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-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_PRE_PATCHSET_NUM=
-	XEN_GENTOO_PATCHSET_NUM=0
-	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://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
-		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_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
-		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
-
-	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 "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${FILESDIR}/${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
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# 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 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 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
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index f4ecd12f2933..d7ce29f24519 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,15 +2,10 @@ AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf
 AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441
 AUX xen-4.16-efi.patch 696 BLAKE2B 2bc3db7286d7ea24c762e914012c71d3fe6dc4d8c47551c9c88282d67d896917c04456c607c155d8340d0b264a34830091309a1a28417dbfc585f26a9fc692ad SHA512 0c1f594ae6321af190cc205d2ebb8afbca53c2897302b630a6f0eee9ce43f591483c96cc4f8b8be5db78ee11451c724882e50bb4226359e784bbda520b090524
 AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95ae7f805c4bfa0e5a357342b845f6f260915f9eac46573bd9813fa602702df6254ad4b946fccb32cfea7514cc86b3 SHA512 0d1a8c8dbfdd57dac6d9732afcf4d0da1746ecbfa06689eb343b3d54167a784c9b9b65555f4cabd8f30a97692c511ee16c7787cdc3d335f7e39c2e3f8fc86ccf
-DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
-DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
 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-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
 DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
-EBUILD xen-4.15.2-r2.ebuild 4405 BLAKE2B 0090bf96c539f0ec10bdded08f4a67d5413bfed25e9f85b68c65e7c49bd4c220d493b45800b3515c81c8bde3670a29cc34a6d079b9429ade6ed69e0ee47ad0c8 SHA512 355a160d6326367eb12ca7c0492b324e35d8b635e295e5a8b0c431ca44bdded9e7c2160592fdc4327ad1473a593d03f9e6d71e80ddc2734aa9ed87b6319da6d3
 EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
-EBUILD xen-4.16.1.ebuild 4832 BLAKE2B 2a9fc53ee631e5ccd502f419ea1437dc1988b801812a83a21f1ff04a2b71e85046c24030843c77d580e5cdf6dc4edf6961678ce33b77495ead4e3e51c4aa5c59 SHA512 fb7dec4bbc69f85e8824f984a6acb49b94be2192403ef8ea57dc3b13868e61044a274045ceeb2c0ded3e09d0776bc7c30cbb448359e9af35ad777079d93de533
 EBUILD xen-4.16.2_pre1.ebuild 4761 BLAKE2B fe2c436fca2d516c4ee588c265898b62278636609119768d7ec4319ad2a011cd91c8224d289384ea9fc2f38006437134a96b028d78846488badfea0a2313efe7 SHA512 600b693dd83b464fe57229b3ba3bd9acb42c88ea9b207f78694bf31d61e59ce407c675dd968e2222ffdfc7f8227f8a58a65be951dcb321481eb49eabd7818e75
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.2-r2.ebuild b/app-emulation/xen/xen-4.15.2-r2.ebuild
deleted file mode 100644
index 295e07209e8e..000000000000
--- a/app-emulation/xen/xen-4.15.2-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=2
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-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}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-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() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	# Symlinks do not work on fat32 volumes
-	eapply "${FILESDIR}"/${PN}-4.15-efi.patch
-
-	# Enable XSM-FLASK
-	use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
-
-	# 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
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.16.1.ebuild b/app-emulation/xen/xen-4.16.1.ebuild
deleted file mode 100644
index e4073b7cad14..000000000000
--- a/app-emulation/xen/xen-4.16.1.ebuild
+++ /dev/null
@@ -1,185 +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} )
-
-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_PRE_PATCHSET_NUM=
-	XEN_GENTOO_PATCHSET_NUM=0
-	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://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
-		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_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
-		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
-
-	eapply "${FILESDIR}"/${PN}-4.16-efi.patch
-
-	# Symlinks do not work on fat32 volumes # 829765
-	if ! use boot-symlinks || use efi; then
-		eapply "${FILESDIR}"/${PN}-4.16-no-symlink.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)" \
-		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"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 570bc5e3bbe8..cc1436df456f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
index 2859eafc9297..89c32c71ac35 100644
--- a/dev-java/istack-commons-runtime/Manifest
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
-EBUILD istack-commons-runtime-4.1.1.ebuild 1519 BLAKE2B 234100c13f56ea5df7a05ad20e9c2f560f50d92abeeb403858b14a3f635b2c37ce10f5385828039468bbf619141cd656045e03fce0a7a3f56c21bc5c265a4981 SHA512 bb7ff0f6837069c27c36f897a012a7965498e77a4e6d06ef4702aef455fa7491afe68bb413903a61255fae94334bc0593420f5b9cb663b3bcc052e240a0a0b44
+EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1572 BLAKE2B 56da8777f570ae2123101ea25869c161a6d3377ac34c10b1cd6586b473b8ef14e2e7de2e60304ceb74e83ffe949b83a37e0522b809d4688fd7a496d41fc132ca SHA512 c9db560d0b377c85f44a5b95cd225841f598102085a28ff5b6c5c82e12033197c1926b5086b9381df0a67c1a0363e4ee32006643ab1cae4ee6dd30a2452c0371
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
index 49b1f7559700..0d9371ac7cea 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
@@ -26,8 +26,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 # POM: runtime/pom.xml
 # test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
 
+# fails if jdk-1.8:* # https://bugs.gentoo.org/857024
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	dev-java/jakarta-activation-api:2
 "
 
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 0c180a4a7d13..75ad29369239 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,5 @@
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
+DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
 EBUILD jakartaee-migration-1.0.0.ebuild 2875 BLAKE2B 5c1d22930a619cedf70f5ab662f97254d749f9e61b69cef1042cdf953ed88500760a584293f85ddfd6092e16cb5da37a6e338bd8774248a30b6a356bc1b65977 SHA512 437f3185594bcc8450f8f000ae300bd178e82a4da58cb6a30c9412e387684a50d435e026d28712d6d06c675055ea23f0fa85f9f18bc0290116a6ad8010bae1e3
+EBUILD jakartaee-migration-1.0.1.ebuild 2946 BLAKE2B 7b51890cf04d922d23ce3abe48b789175bf5f9cb92bab182d3b5b822d6732078d322f611cafc235eed5e45cdc108acb8036a86a2a371b866b462c1c654bed482 SHA512 742c0c758e91b7f03e417756b3ce49e762cf6ddd7f7b6fa913defe80af3043219852c22cca78a134d21a7c006e0079f18a52753790b65dcef938af77aea9cd9b
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
new file mode 100644
index 000000000000..112b36077026
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/bcel:0
+	>=dev-java/commons-compress-1.20:0
+	dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+	"org.apache.tomcat.jakartaee.TesterConstants"
+)
+
+src_prepare() {
+	default
+	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+	# we need to create jar files for the tests the same way as it's done using pom.xml
+	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+	mkdir -p target/test-classes/META-INF || die
+	pushd target/test-classes || die
+	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+	for enc in rsa dsa ec; do
+		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+	done
+	popd
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b8b5e0b2b055..8f379fe09e9e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 7c6b373b38f9..7dc374991934 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,6 +1,8 @@
 DIST PyPDF2-2.4.1.gh.tar.gz 5121207 BLAKE2B 387085ea028d7fcbcfd5fa4e5373b655e647548093638db66fa92d44b8771bb5342f8086ebca82e205cf56f1865778bc604f49a49b39af16d8d9e3466a51653d SHA512 430e73ee6965fd6b8dac9ce8b6ee232e8ea829a7dbdfe87aafd29ae24ab182cd3e568b447030a0c199aab9049a79ce2a5518ce7fe59b1d8ce533b1313a568fc2
 DIST PyPDF2-2.4.2.gh.tar.gz 5327738 BLAKE2B 5343d5b7c2efe2ed664f896b030a60ad8570ae8f481376e4ad9c865144b66d912633e4f83294d7f6399230963c02dea262cc247b10ca3c146ab24f823c0d57f3 SHA512 84a13d5b624ca8ca2dc4c474309ffa47d1770e1681ccb527f7fc1df37698037c224939dd062da004cbf7b983744afd3ab9adc9a610bea3f2f297e1ed5b708dd2
+DIST PyPDF2-2.5.0.gh.tar.gz 5597332 BLAKE2B 40d4fa812f1a70c18d3b2907d83185cd79af3d722e762ec8dec9709cb5c70246c21fa124e419d8b12142b0ae22b1f13958835eaaa23e9f4cc9efbd05793db7ce SHA512 ec7560b4bb3737fe4c830f058f5303cb70c9ff660c3f40637b4b86c8c79bf11a246a3fcc425aa54b5ca160548311c7f93248a1001c75a7e1dbf3119245e3262f
 DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
 EBUILD PyPDF2-2.4.1.ebuild 3417 BLAKE2B 2fc2228d08d8593a7c2e49cbe61cc8d036d894fc7ced3d4308d8c93ada40bf4045e955cb4a44ab0f0daa4836d87a620ca421117b4861b3cc6d0aefbdc36be739 SHA512 edf9219b5534384ccb3519836c8710f21b6f793f856f1e92bc218fe9ed81f9dda197900171f2b7f732150546ec513f55978d52cba72e68bdd8886b152e39c142
 EBUILD PyPDF2-2.4.2.ebuild 3854 BLAKE2B 4a3462dd7e69a50288f11bdd8842994e05d9f539f816c934cce50cfe1d3495f373b7a6eb625329b9da46b8c063dc1f60cd091744c7a84aa79fd67c59b7f2775f SHA512 a4c463ef7a85ffcf86f7b1803ae0d18ac0550f06bd849f9d8d78ba5b3e7b590afee880cccc32ed478d24494b9822017e1b043f39a1c274b43e59bb6a73e646fd
+EBUILD PyPDF2-2.5.0.ebuild 4007 BLAKE2B 187f411a58db8c66fadbb7327bdbca018d62ba2bbe60b70fd10e807971483dcbf8b11863410a207d2ef1ac43acbd724e52c11f6881226c068228bf016490f285 SHA512 63050898595a7d5d7941d1691405465de26b42f31d0f7a598fa07c9f8ad7815d39907c0e9b1fe9a335800939bbab20217467b5c1a1b4bd5210205157eb82058c
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild
new file mode 100644
index 000000000000..00f40d10f306
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild
@@ -0,0 +1,115 @@
+# 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
+
+SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	tests/test_generic.py::test_issue_997
+	tests/test_merger.py::test1
+	tests/test_merger.py::test_bookmark
+	tests/test_merger.py::test_sweep_indirect_list_newobj_is_None
+	tests/test_merger.py::test_sweep_recursion1
+	tests/test_merger.py::test_sweep_recursion2
+	tests/test_merger.py::test_trim_outline
+	tests/test_merger.py::test_trim_outline_list
+	tests/test_merger.py::test_zoom
+	tests/test_merger.py::test_zoom_xyz_no_left
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_single_quote_op
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_read_form_416
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_reader.py::test_xfa_non_empty
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_compress
+	tests/test_workflows.py::test_extract_text
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_workflows.py::test_get_fields
+	tests/test_workflows.py::test_get_metadata
+	tests/test_workflows.py::test_image_extraction
+	tests/test_workflows.py::test_merge
+	tests/test_workflows.py::test_merge_with_warning
+	tests/test_workflows.py::test_overlay
+	tests/test_workflows.py::test_scale_rectangle_indirect_object
+	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
+	tests/test_writer.py::test_write_bookmark_on_page_fitv
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_subject
+	tests/test_xmp.py::test_issue585
+	tests/test_xmp.py::test_xmpmm
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 033c4747eafe..f44d321c209e 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,7 @@
 DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
 DIST astroid-2.12.0.gh.tar.gz 429498 BLAKE2B 4daf36a96c1f47446558ef223210becd78db1ee8dc76247f9e8d4c16622f777cd9f5d70ed863de9f893b9427b479057f72f24c4c8c7b1468c566eda85ee829b0 SHA512 3a5a104a98268f61bf852f7565ef7a4f3d6ded4e8cfa0a6d5dea08e045d3fc0067633618311d82fc2f330e56ffd11d02a81c2493222eeffadf2d333b24b5aa58
+DIST astroid-2.12.1.gh.tar.gz 429733 BLAKE2B fe55fb38ed5bdaa70371425f8e7bf11d52d0cbb70cc94d568614f507bf716b66d7c54e98ddca6b2508384234b330ef880c4847826d9e0907bf724e1a06aaeefd SHA512 586c094b577f1d06c5cfe90b54a220ca331657a2c5f9daf3fadc26795a631b8edfdafbd4ac7988aa3fbdc4527ca0ea3392cd38fe15c9444f5471d9bee4bf90d4
 EBUILD astroid-2.11.6.ebuild 1786 BLAKE2B 56b20263f11843ff7b511229e3cf7af3cf61b0ae95ae0a12409fe6895b7f232bb85ba9286940b80291c4264223b9bbbcd406ffd2f7f88a029205fe195dedf50f SHA512 90e3ede82dfd55199b56671640c30adb0252df7deb49257a730a7ca13b8186425dde611b1b2539a8c5bee076bcf9dc0b96bb160276036033277022b2d516d28f
 EBUILD astroid-2.12.0.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
+EBUILD astroid-2.12.1.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.1.ebuild b/dev-python/astroid/astroid-2.12.1.ebuild
new file mode 100644
index 000000000000..de2148b20e43
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.1.ebuild
@@ -0,0 +1,59 @@
+# 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="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 51e15c29ff20..1db1cbd399ce 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,7 @@
 AUX cherrypy-18.6.1-close-files.patch 15776 BLAKE2B 8205e3db173706e749d9adc83d4784f7af928c5cf22f3e044d7675861048d95093d97db2db42dd9f84681a33f0b95b782f1c273f7a06eb2000c832306a7375b1 SHA512 8d4b2ee002bff97a0b80d2b03089873ceb97a861a1133e97ce210de4a18ebbe73ebc82e7f261102caa13ad57cd25398b2f213d4ac29925ed86ad64a8ca09acc6
 AUX cherrypy-18.6.1-py311.patch 1078 BLAKE2B 7518be839f56493dc3960472bdf0fad663490382ebce956c3cf8f2917c93e6b6672bdd654afe162f447f4ce907b1d122d5fdd90b30a9c130564fae7419246cc6 SHA512 31d00c5bc29491f57d4e663211bcc6c2292ca1eaff41c7be6ee5b6af0802875cb82fcc110c16c852989acec40c4c5bbc6ae0bddecc5afbfde2e8c571a767846e
 DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
+DIST CherryPy-18.7.0.tar.gz 621794 BLAKE2B d60cd21d0b0bacbb18bcaeb525be143c3639f462978e9835e5c77ba8ce732a3af4662e4c37e2d20e1ad19760900775dee4a3cd98db53e70a19611d30c8329bce SHA512 321771a3e3cda16090bfb7a79c297defd67655ba5453e440e09e85fec41cba850544bebac7203206c95e38d79b3bce22368ea19c0fb1fbedbb00d76a4ab59c8b
 EBUILD cherrypy-18.6.1-r1.ebuild 1950 BLAKE2B 1d40c7f6d31c9641ae503df5705e5465941befa8f6ce24adf0e976778dd023d73218902ab35d0c271e7cd9ee52cd5bfa57dbefaaa0b982623f6e2d74ec460ba3 SHA512 d6b60880219efb9eec875a01f4c8549c225edfb1c789a1fb2927b1d3d285a216f67400dfd4dd929ee9b9de52277dd1c5e08ef6eccbeb72f6207388812042bcb5
+EBUILD cherrypy-18.7.0.ebuild 1781 BLAKE2B 2aa6d1c79e1586d3a228735eb8dacbf5865103b1d654dca1b3743a1cab856bf73bd3ccf8a1a6f1d92b412471495db49808e23b40078b53c8c783fda478e54a82 SHA512 913243b479f297d64fcc6092ef6925cfdaa45b168ea2e9c62f8ec0319aeaf6f79c1ad3418f2f43c349d6ff3d5015a3a90aded7b8e53cecb241a1310512598dc6
 MISC metadata.xml 347 BLAKE2B 7694118d09caebdeac890ee40fd8a79906637bb695f9ec44dc25e67378c8c7f06901e5c52e6f79dd498921ffa01b18b9762b102baeea34792a2ff730a1303c40 SHA512 29cbadf45008c3c422c47ca232634bd15efbd4bcdc6065d18cf1adcbc0c3bbb155a2b122eb4ce7180839fcdaf4acb5515486f191ebbfa63eaec8a14abbb1e3eb
diff --git a/dev-python/cherrypy/cherrypy-18.7.0.ebuild b/dev-python/cherrypy/cherrypy-18.7.0.ebuild
new file mode 100644
index 000000000000..b1cedd9565ea
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.7.0.ebuild
@@ -0,0 +1,69 @@
+# 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
+
+MY_PN="CherryPy"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="
+	https://cherrypy.dev/
+	https://github.com/cherrypy/cherrypy/
+	https://pypi.org/project/CherryPy/
+"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ssl test"
+
+RDEPEND="
+	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/cov/d' pytest.ini || die
+	# upstream has been using xfail to mark flaky tests, then added
+	# xfail_strict... not a good idea
+	sed -i -e '/xfail_strict/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# broken by changes in traceback output
+		cherrypy/test/test_request_obj.py::RequestObjectTests::testErrorHandling
+		cherrypy/test/test_tools.py::ToolTests::testHookErrors
+	)
+
+	epytest
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index fa1bcf3a8974..7950abe7dbf8 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,6 +1,8 @@
 AUX docutils-0.18.1-py311.patch 4637 BLAKE2B d103e5f4fa6b8c1ab06f2b07c33ee3f707f0c1224d9bfa6f57504c3f30177dcb46cb8ed32dcc03c413937a94212bc64a9963cc0cede766e50b81b1f73531fcef SHA512 7c7c97e150914ddc12948236f84314b3ce49d043a7e5245ae0defbbf1d0845a8e3b06ebd63fb466c92bc970305578243dc97103230d80a810fa3cd54528b70bd
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
+DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5
 EBUILD docutils-0.17.1-r1.ebuild 1830 BLAKE2B d13ba2e4998192d440e02fa4832ce67862d01b3731db0eb10f0c8df1a1403e5e356487d56599ef56cd154cc24ec37ac5dfaf6d9eec7b9aa429e54d5fc8ba4c3e SHA512 6cc1a8a27d9bcd575f9b9ab92629869583a28ac78592d47257bec360169987aea1a3a9d167f72e0ba6c38cd0868ca109ec8f0da739823b1ae24b923ff19e9215
 EBUILD docutils-0.18.1-r1.ebuild 1819 BLAKE2B 3a9611e2f5d592d762eeae1b72ab8fa364f0c0fef173d8c93a8bc6f5959d43fb4b2cd28d6d29ec8da3a096e3e0b6684d96b442070c97d044637d5a82eb6f7cbd SHA512 b36683561ef5367b0e1937693b14a867408b4d051b6a6680804c8c748da8f6c0369013a4aa5de40797fdf306f72490edc5219dd41fa5f0bbc8920d6d0945ec6b
+EBUILD docutils-0.19.ebuild 1782 BLAKE2B 0c6fa4e01f91e3a3eca01e89c40d1a1ca4d6a28446db1da792d55a7fb80c7e535108ad954a23d111afea303bcfca78dcadf8c9255f706f7ec86c910c0a836043 SHA512 689f6919815df430c9dae5fcf913bdf3fbf1f857a9f62e3d53c58e70594f21cb9cb3c2f174f19a12ce17764f15dae0817dcd2e0113e82757a349af706e1c157d
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.19.ebuild b/dev-python/docutils/docutils-0.19.ebuild
new file mode 100644
index 000000000000..c348d6c56be1
--- /dev/null
+++ b/dev-python/docutils/docutils-0.19.ebuild
@@ -0,0 +1,73 @@
+# 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="Python Documentation Utilities (reference reStructuredText impl.)"
+HOMEPAGE="
+	https://docutils.sourceforge.io/
+	https://pypi.org/project/docutils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index f77b95db95ae..ee2eb3676a2a 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,7 +1,9 @@
 DIST hatch-hatchling-v1.3.1.gh.tar.gz 220023 BLAKE2B db336126d8c5235eab57ca53e2f8832b9590513f40215ff4b51d1b60c43b0d971b472dc4434cfcf77406143a4ed3172a2fcd95d4c7d11a6f39ccd937f9eff9e6 SHA512 21fa8bd4ffe0bec5ae9f8b9716ce3b7ece45c6a62bc74f0cd49f759baaa5b21343bcc9f2a8e505f0b724b7d73a4c1f84c863a29e064e95f4aa1a288098adc8d3
 DIST hatch-hatchling-v1.4.0.gh.tar.gz 229007 BLAKE2B 5a288a9de356fb06646ebb3eab95aee319d3e7d15a67d4a36cf52d0865a4ecd7ddd1e18db203c55136e950221f79572b152f9edf9398f52ecc927819e5a2f2fd SHA512 a104e092b2078eaeadfd6ea70b65bd8aabc91044e4e9fef4e1a54a61c138629e2a3963f26773e303f3cca0839ea63530849260b2d8c51b50fe67a3cdc5707029
 DIST hatch-hatchling-v1.4.1.gh.tar.gz 229194 BLAKE2B 9d7b11244ce67d64a05f4a737966a8f037031275ae5b2ecde395c172232eb5bbf0f38df4f0048c6732641bafbf524670bc1e6dd9d441cc4297ef74126b56971b SHA512 b8dc8dfdc7e251cad4161f59acc724122f8f7083a1ce170722b7b5c31ccf22488e3871be76ea3fad058be2cce263752099c9b548759e16ba644daaba0eca63ba
+DIST hatch-hatchling-v1.5.0.gh.tar.gz 232265 BLAKE2B 4fd57f7610831a025b9b0dddb89c4fe484d32d0b76a2d0cdafb76730b37c54af42ef27dc1c4d73061d888ce75806bd8f0fc70f5d39a077bd534716cf4e4a4db8 SHA512 9e5498b9da3a1f756e0f3e40daa63e45017588332da4197ac83b8402219bb9501b9c498dd881c5812b2b8903af591e4c6146aaf6dea8cc7b6bc664a85dee74e6
 EBUILD hatchling-1.3.1.ebuild 1980 BLAKE2B 0c537198ec4cead26561b0781f68f6062ba8845cc56e68ba482ebead4618ab86cb5418234524939c1fb69b09a44993fdf2bf222e75f254b0139c66669ca38d59 SHA512 6036e99f5bc40b79197476c7e3201b6b003fa36269d63b36a1f40db9f912dc1467b037a891292d586b36cc0c79a8999ce3bf7f3dc82cecbff0cb7d4d149be316
 EBUILD hatchling-1.4.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
 EBUILD hatchling-1.4.1.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
+EBUILD hatchling-1.5.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.5.0.ebuild b/dev-python/hatchling/hatchling-1.5.0.ebuild
new file mode 100644
index 000000000000..868dd0172a97
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.5.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	epytest tests/backend
+}
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 188bed848691..57169a1b1506 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,5 @@
+DIST huawei-lte-api-1.6.1.gh.tar.gz 32963 BLAKE2B f159e1dc4cb759c09a88bb763c6ba5f43043eacf025e7ada871c816e0e72a238f9e7536dbc043f8596bef390ecfc2ee137c1a4c079ca33db6c3a3198147c9f98 SHA512 2a6a330c419af0d2b8eeff9d8b93a11cdf8050db04e609cb1d86a33ab770d7102c8e40652482c2500ce4bf4152b66b98ee1fc77be104db8ab9a9bbeec871ce20
 DIST huawei-lte-api-1.6.tar.gz 32617 BLAKE2B 194d2d983e7bd5bd456d3557b16795cda350ea157545c1ce37aa6d4dd0bace8a8a0c724b9d0ae4315e6f95585598b147a03acb77d84837bf879fa9b83737cafc SHA512 62f70853bba0fbd863e07e2d91309fc15c41508857486d01a02ec30ed513567d0880551744eed5a61517cc33a2f56583df892d22cca45124e95e24605ab23678
+EBUILD huawei-lte-api-1.6.1.ebuild 872 BLAKE2B bfbe5cba45ef654091a5bcb8d3dd672b0b81864d3747a3e5e41a2ff4a2f32b957729c9e8217bd6f55ed3007b43bf7c72dc116474434adba9a1504660bdf64106 SHA512 8fd9fd2c890214f14a9fb9c01f911ba46730996529678fb7136711980821b3d9e7aaee951381484cedb0370fb3bf8306903d59210283e0582bdd61b50e099a8b
 EBUILD huawei-lte-api-1.6.ebuild 869 BLAKE2B e3bab6beffb0e617b96619dd7233a0cd12f91933460d4c54463bff6b3e6c10edb5036d0493874a50e92fe879aa8ddae7da9bbcd229b0dabc7b1a4e67e50a16c3 SHA512 866e4bf8ce773ca9684db71e4591063ac7c23e3c41bc79997724e3b56c6addc4266177615125184012312e407abeb2e9b1403d013dac30e5f23e8b8c7f29d046
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.1.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.1.ebuild
new file mode 100644
index 000000000000..5b62e249fda3
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="
+	https://github.com/Salamek/huawei-lte-api/
+	https://pypi.org/project/huawei-lte-api/
+"
+SRC_URI="
+	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 5028becfac9b..33ab8f76e3a1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -40,7 +40,7 @@ EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378
 EBUILD numpy-1.22.1.ebuild 4475 BLAKE2B ee6d48a454d685da1ee4715391c0ca9dbe4072980c09bfa9c21e217a6a94509c3172828f76f0c408ce8c6c3655842a184c1636bf3d923a2bdfb35b6f0667345a SHA512 9f2898c9ab8bb3b2a7007ebd0f7094b844c74b05f64e62418a6ac9ba27f96f7eb7bfaeb480b267f615b4406040e651f16d254afd9db4a2f3e8381e545d341f89
 EBUILD numpy-1.22.2.ebuild 4522 BLAKE2B f3dbd009337631f3f72590d4ed8e1dfd910a624ce7980ec5d20edc7673ddf887e5e18eacb9ac5c33b128beaed1901ba13fddf3ac484d11c791c8e1af3ce7baae SHA512 e32115bf9f08bb1cbe0312ad34bb2a16c98e2b5973f33ae380e7e8ede7f4e0c4943d899fa60addaceb2d563309ea6bcb73000b46291ccf5b4cf33982f8c31d10
 EBUILD numpy-1.22.3.ebuild 4809 BLAKE2B 591d29cf3f8786179f8c883d185357db303bb90da5b577d4fc8c0d548bfe2296d247d10901ae931e276db68e2ef197c38a34740767afe9f091b5bd266ae50442 SHA512 a2973b01c557c5956ba9aebb8f9a15c56fabc321a672f61b06e19fc0f83c03e04856128eea37453b57797ee5f45572952dd67f51436a493ecfdc7434cfb6688d
-EBUILD numpy-1.22.4.ebuild 5020 BLAKE2B 8b67bb2b8adc7d0f014c60123e279bbf371efd2c87a061b4e291f96869b2c9a4830ddcd17cd35e6aa2ea68382c1de48aa782fbe793f71f899f2e193d6dbf6641 SHA512 09d90d6c04b44caab5c8f8188463f7318f31bf054cd05faf31447ed8afb4dc23a608ca3ee4282faea860ce13a42bcccc278bb2de796d0908eba0fe1929edafb2
+EBUILD numpy-1.22.4.ebuild 5019 BLAKE2B fe7e230df9bd39af552f45c081fb2275da242bf7f6deafdc9fe4ace7cbc3032354d83010c7d26abd47f98be41dd473ec6fc2554da08dc1c757a92e514e4059b0 SHA512 ae1bad2296c7b167662064c9cc5640988e7b096d2af4ef5f4937b2aa206ba186be41e1ff51824e861a912fbd1066457ddd5f4638d9e5f26078b1840ce74e147e
 EBUILD numpy-1.23.0.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
 EBUILD numpy-1.23.1.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
index 510ee44ddbd9..3f8e9f3560c8 100644
--- a/dev-python/numpy/numpy-1.22.4.ebuild
+++ b/dev-python/numpy/numpy-1.22.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 3db831633c33..6c77b353e87f 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,13 +1,5 @@
-DIST pikepdf-5.1.3.tar.gz 2356111 BLAKE2B 5a9ec1d06f91be44b4eacc68d7d9449a2bb74b59214ce3d1b10d3cdf81533d38450a2150834d0008cf81475e07e4de241ea16e438450dff6dadd5c15da533223 SHA512 d38a6203b9a4150e4daf4980517b72b0e8e797c57bd82009d6f95a1275c0e6f767e415e14fe6d1614bd51edaf660febafd0f0b85cc46482125aeced8f6912285
-DIST pikepdf-5.1.4.gh.tar.gz 2356865 BLAKE2B 7ebeedd7a2bb29371325b0cd6cb89cd56843eee1847cb26f0487d0114a3268e9a15171769abc16502c48684bb1bbe59050a2c692e17857f161ccd10a4663eeb0 SHA512 390c8f07bb5602715a061bf26b272cc8301dbb610ea06b8e5e5560282b7256c03e87717ab62a657c662ef51f549f5d52f0133f3806ff536451664ac93add625a
-DIST pikepdf-5.1.5.gh.tar.gz 2356890 BLAKE2B e08f311ad2714f856eb29510e847ca2ddf2b3919cc372d4bedb59c7449be69574a32ea6cd23f51c34d56096bb8d2936f70c52a6a948d513277ff2a5d13e35725 SHA512 e6da0471abdd2a8133fb5789f72eb948e32eae24ee61956fb71f5e279151bc6df5d18ac9b6d73987fd9b891739892111df8c5f93c90ba8ae022dbb2821858350
 DIST pikepdf-5.2.0.gh.tar.gz 2359546 BLAKE2B 953a5268eb7dc52934967b593237bb3006ee35e7a1657c0721ef4cdc874c9c51d7920fbdb7e38f67e221b01536166b8811a95021668491e8c783f51a08f49144 SHA512 f36ec09017aeac547c2b4ef17de7513293e8bf243707cb9c0c03826973be266847d8514002be546ac958a735e29765df94efdaecde6ad5f901c329dadc3e9451
-DIST pikepdf-5.3.0.gh.tar.gz 2360722 BLAKE2B 1be449661deb3e57f097e0a95fcd099c1652e0700077077e299c88ae131487e6f2bb89cc07ffc06bdf15f46bc6aa613ed823b9dcc6ef55f100f37451be7c2488 SHA512 ef82703447d20edc497fcac287b4eddb48f1901aa060dc5f57301469741bb15ce367d0eac4ec27431740707f0e56975dc36d8e7eb3897c879663d56134c14fb1
 DIST pikepdf-5.3.1.gh.tar.gz 2360816 BLAKE2B 02b36814144acbf05cf50d8bca6542271208af0ed7548dd8f41493b6e95183851033a3d4f3335f10d4bf6798606e9031aa2b38d28a9e824692fe8f78f1e68077 SHA512 b0256533011dae384ce657200db69b6e3ac93b4364fe55a2e0fb8fb2d993550dcfe4e05b723b81d62ed1db3cd544023e81a9e70fd807bcfb618f125ae5a35117
-EBUILD pikepdf-5.1.3.ebuild 1621 BLAKE2B c9ef21fd68798ccdb76a90285c620b0b633cd1580414a3ac22d7118f5fdd3cb1365307053fdd065dff21935b3cc734e0a632b100c0997a09940e2376408d6b34 SHA512 25ef04445dc00c28198fe13745b6886876bb42b6a50385854a24774e49c805354b228b6bd5d2061c66811797a9030769b3db2b2d1d7cb8265b944c614a85b91c
-EBUILD pikepdf-5.1.4.ebuild 1474 BLAKE2B d373691070d7295335ec968543bf0a1b4737736fde700c201dc40873bfbe8aeca9dfb5ac75c32c27f418f6bb6c80ae0c77e16328fa5912627159e6c2343f800e SHA512 e7d989139bfef0ac6c125a4f0fed8b5262b9dfe0cfce5709b83a6586ee2673b1896328471308362ef0a10435c552c234b9aa8e6f87c741c848972b9d90659285
-EBUILD pikepdf-5.1.5.ebuild 1514 BLAKE2B 668e031985e40a885a88e6d7a6608e87f22625c0b014e5c102ac0dbf2c2e3bc409447189ab93365fee0f339a90de5d787df66365173009ab986b4bb3907a14f2 SHA512 05690e54fce69f2c73f8b910ffde5e800cfeba2288c4fd3814def3fb989ac7d160b0f599f9fa31f86712c0773598154479baf7f2189d1d8d8dd8db328d64671b
 EBUILD pikepdf-5.2.0-r1.ebuild 1552 BLAKE2B d9f8e96311c19ddad321fd3c8ccef2391d5c30e0f59bd31f829fd8c82cfe5c5bb7e4bdeb0130b48d7b84c5f445f31e9f8095c487c81117b615df46d99c44f3a9 SHA512 3f6c60d2d494aa51c52bf9d60fe14b8fcbdcb612c52532885b195f0dbee08987dcc97dea9c9ead3c8ea28a71568f6a8921693a4ef84b1bc31fb0fbad66b5a21b
-EBUILD pikepdf-5.3.0.ebuild 1553 BLAKE2B 9d14235b46a24f97b6f42bdbd82289a619d723a8e004b0f6946f228a44b41460a23b47d715b09ba0ea5d6285e229bb1dc5ce697a77a9c2e75a27dcf9a66315de SHA512 146222856b90b4ed77349000887ecddfb68aeaabfcb783b3b9ed4647e32d9d4c3f67a6339e7b30e3dbdded77b49ad14682ca94a6e20cf832d341eebf9395b91c
 EBUILD pikepdf-5.3.1.ebuild 1543 BLAKE2B 960ecc4871f4f8802687dce7bef7b8394bbbef401d7261e3e3e617ec0f18abcdbd09116c74e1d6d295083e89033d24a9c7289b32bf9d4f3689a6f61154e9c480 SHA512 a04d06f4e2ab96fe268b8448413b3b1794c9d8996d19218268a2eda6abc0937c99367b136db15601c23166a8a441c99c7f4109b5b2b6d70c524f13cccdda0b51
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-5.1.3.ebuild b/dev-python/pikepdf/pikepdf-5.1.3.ebuild
deleted file mode 100644
index ab8a2b9d246c..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	<dev-python/pillow-10[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.4.ebuild b/dev-python/pikepdf/pikepdf-5.1.4.ebuild
deleted file mode 100644
index 200d14ab9c83..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.4.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.5.ebuild b/dev-python/pikepdf/pikepdf-5.1.5.ebuild
deleted file mode 100644
index 40a95644a05f..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.3.0.ebuild b/dev-python/pikepdf/pikepdf-5.3.0.ebuild
deleted file mode 100644
index 2b080c8a66ca..000000000000
--- a/dev-python/pikepdf/pikepdf-5.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 0eec94284d66..8adbeec9e867 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,9 +1,5 @@
-DIST psycopg-3.0.14.gh.tar.gz 381063 BLAKE2B cc63bda476bd7f5b53698349d893f42e300395cb604ef458d75aa40d0c7f7ac3f89e734534a2df0710fedd6ae63ec1426174c0e78d57680fb63156a2e2aad60f SHA512 3abbe947bddbb1ccc47ce9a5d18351311ca4729e3f25a6dfc5238aac821e69223078beccc30366e375026eee04645fa336b4ad579a91c8ff9d5f852b8c5584be
 DIST psycopg-3.0.15.gh.tar.gz 384815 BLAKE2B feed19f8482767de12a549530b8fbef5cd374636f1b1e84b2746f23379760bf3b75fbbaed64b8d45d120b84a1e56b4ce6fe26bf29fb13e6fd20eb39e4aebad9a SHA512 65c0e081821ca580f56495073ca69fa38e98888ff3531dc55faacec647cfeafcc74767c53a7d3edbeea1e5bbc557ba08fbc089be8b6bc73963cbb459b029e313
-DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
-EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
-EBUILD psycopg-3.0.14.ebuild 1660 BLAKE2B 00bfd0e20311e4dc373068065aafde93b951998ee7fd40484ee07644278c14a0c31f4b961cca0cadf1da4b9afa8976ea80c1f9ad60755d9a7d59481b07b14f0b SHA512 e2c2b675e0835821f1919cf8b531d42a965823d35ea1d3913b08eb325bbeb73f5d1ac5855db76406619430f74aad6dc17ab226dd21655eedeb4ecbb1856446f0
-EBUILD psycopg-3.0.15.ebuild 1658 BLAKE2B 6120f3d32f4d103d51311bfab75573714e2b40b7bf73fb8347ee2b530ba89b9315d00a0c7a4a9255a24697e57a475a957b5125282fcd7e1c851e47a349779db4 SHA512 181cb9717e723af24c6ab31c754a3833556c51cdaa1e6da03cb758c83764e88acd2bfc914e01b5bac893d0dc8fc465d042789e9419920c240e646eaed41d45b8
+EBUILD psycopg-3.0.15.ebuild 1653 BLAKE2B 91a5f64268d5304b46e14d3969bfb3a8df2fd1ebf6ca8d9adc365ce7200628efbe8d7c8bcf4e964881eeec743fb3c736ddf49f897df546161f053ed955284e58 SHA512 647f24602344c4016e440c4dc2d2c8247b5e6f549049140d9fcb03854d926bea1c1f494f836ab1f9f5be3f0239c680dd6cdc44fa14166981b149a2a1db707ed7
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
deleted file mode 100644
index f14410ac8a4d..000000000000
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-3.0.14.ebuild b/dev-python/psycopg/psycopg-3.0.14.ebuild
deleted file mode 100644
index fec8d3cf5d5b..000000000000
--- a/dev-python/psycopg/psycopg-3.0.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/psycopg
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-DEPEND="
-	>=dev-db/postgresql-8.1:*
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
-	' 3.8)
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# tests for the psycopg_pool package
-	tests/pool
-	# some broken mypy magic
-	tests/test_module.py::test_version
-	tests/test_module.py::test_version_c
-	tests/test_typing.py
-	# TODO, relying on undefined ordering in Python?
-	tests/test_dns_srv.py::test_srv
-)
-
-src_test() {
-	# tests are lurking in top-level directory
-	cd .. || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
diff --git a/dev-python/psycopg/psycopg-3.0.15.ebuild b/dev-python/psycopg/psycopg-3.0.15.ebuild
index 912b2ba035a0..a3964c006ce6 100644
--- a/dev-python/psycopg/psycopg-3.0.15.ebuild
+++ b/dev-python/psycopg/psycopg-3.0.15.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index b8e86f2583ac..e6b5e5821919 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,5 @@
 DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c0158195684b0cdee915811b1ee3bfa791b84632edb6d098562aa7b9f4c36eb00f244e249340b4de557999ec2a0f176ebd1e SHA512 805da232d138edaf4094614df0ebc4840f0c1b9deb9586026bffe0ec17d54553e4d3876ffc53d87b13687b741951a68334369f0f2475cf2f12359f072dc6a0c8
+DIST pyspnego-0.5.3.tar.gz 389939 BLAKE2B 236151d9d9f37137d46b06a99f037922563b4d43931288129492aa7173f166d24c3086297e30a0f05158773101df9868f88efffe00864b1bd5deb0a99a496b61 SHA512 41ca9f785a7dcc99818da351e0a020ffaed72d65cd67b0f19ad4a462a6a1fe739d040acec85052133a19aed06066dae9a9e8f0b469713b331f6ddc52cd3b4c0a
 EBUILD pyspnego-0.5.2.ebuild 922 BLAKE2B 72374a98bd8ad5eaaadb201d5fbaf996eee2050f84bf232e67eb135020f2510aa2332a7e24051ec5846cc1f6047d552dd4373d0c0a87562e4f9cbc3aa333915e SHA512 1320ae5b3d893d70604c4c32152974f59dc31399b8aff9c2e93aa4aa8d90c437c29c1f9a7b368fffde1ef804163df16e7d355241c64c53b3816e6d909dd621d0
+EBUILD pyspnego-0.5.3.ebuild 983 BLAKE2B e92453d0e2c2c856fcf2b956e66c8f5fdc20b1e90947bbc9bf61fe57d4dd70a6518968e58f722abada3845eb531f9f464ab41ada10d441e0cc64f3b9cedc202c SHA512 fd78c905f5ca82dc3ba409cbf223ea3a8725e5d0a7c86d6ec85940fbde0deae1ec6f26c98eaf0c4b0c87eb0cbaeebcf7caa23c0d38097db45bd6e31052b291c4
 MISC metadata.xml 370 BLAKE2B 113adf1bd70a99f41e2b8cd4d5bb69cbd4f6bffa1dba325a8a6e35a1b5ee2800ef1d4b9ceec9be2ad1291fdd054fa81fdb841cdf40b5e969360bf1ee2e456960 SHA512 baa8a1fee20b0cea6308fbfa24fc395cd58e8729eb703692cc2a109e838284ec21559d4c9af3c99fe6d63ac6a8e04e3a3c824cb073302f788f2fa5dcf1dbf00c
diff --git a/dev-python/pyspnego/pyspnego-0.5.3.ebuild b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
new file mode 100644
index 000000000000..6ce9adf021e2
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# py3.11: https://github.com/jborean93/pyspnego/issues/42
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pytest-sugar/Manifest b/dev-python/pytest-sugar/Manifest
index 1c2e77c8852c..73ff5f523d3f 100644
--- a/dev-python/pytest-sugar/Manifest
+++ b/dev-python/pytest-sugar/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-sugar-0.9.4.tar.gz 12727 BLAKE2B 898692fc4083871d707fad44c7dd0c1298c28c190d705ef4525d4ba68d77bd37bb2634e43795ea553041317dc2f014d9be8ef52cfe40383ee75af36e5780cb98 SHA512 bbe375f0ae934d132457d698c9e09994a9a96a31860397f1b5e50b32139e5018f0137ddc0d3dd84bec29fc2b4c16592f59a38933c53fb8acec714c64689c4c76
+DIST pytest-sugar-0.9.5.tar.gz 13545 BLAKE2B 37c5241b951b3167c73537ca7bbb93f679673e57c84a13b74caacfcb8d5510b5e5ad215aa4aa33f722efffa54d30ff73d521bce412214857d11c25c255596bdc SHA512 4451d09181b6130591c504b2825a86777f5daa6972a6be7f2bc51139cf3ef2e57dfc1b8ea1972220a1c84866ed2584c684cc83c8052cb9105c0c3a9ea19922fe
 EBUILD pytest-sugar-0.9.4-r1.ebuild 714 BLAKE2B 06f75d3f18badc75c7bc9f075ac1a3881f79820b1e13cc993f3534e222534c47999c198ba2e7b74643196ffba3950f60441afc5868330c38787b282787e0fb82 SHA512 3abe3d3d430dc54e7e670a2012d8c44c425e7052e8f82f77695ce1a0c9522943ffe3a741167e67e0a746fd9cea06640fd75a665918c9b20eb69e13c492364385
+EBUILD pytest-sugar-0.9.5.ebuild 720 BLAKE2B 1c0a855054d55d1fd40ef9f3f6ace7915ea5448ca4973d54132b90e0404efa900a3cf98337b1199332c4e009abebd7f35244212c337cc7655e9b9c6b7e24efa1 SHA512 795ce53bc8839056f16ccd1ff89daa95700768ca521a3f7316a3f38d653c3425ef890b18e2089a4baab3f3a45e5348f4ebe0d839057160500f97497ce5bb88d3
 MISC metadata.xml 408 BLAKE2B 85f1b0ab3459c14c25ed5da0e2f458094e76c22d442f4e32d2496da42c66daf473e7301dadb6fbf5041bf3b167a8e24d3755c1ac61f48e91fd88cf28ad25de74 SHA512 19e8b2f5cee8223178d9e5de58e8d048515857755600d4d0d2c4381e83c679a939ba67a48daf3ca16e1895808512f4882b37afd71f8cbfd5f4c15f67a30e7ab5
diff --git a/dev-python/pytest-sugar/pytest-sugar-0.9.5.ebuild b/dev-python/pytest-sugar/pytest-sugar-0.9.5.ebuild
new file mode 100644
index 000000000000..87ea2427d002
--- /dev/null
+++ b/dev-python/pytest-sugar/pytest-sugar-0.9.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-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="py.test plugin that changes the default look and feel of py.test"
+HOMEPAGE="
+	https://github.com/Teemu/pytest-sugar/
+	https://pypi.org/project/pytest-sugar/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index 7e0e3cb7c0cb..8c0155c7ee49 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,4 +1,3 @@
 DIST pyu2f-0.1.5.tar.gz 39008 BLAKE2B 475a47ad99bfbe8f85ebe246eb7c394d0855732fc6bf0dd887bb32ad02bacb1f34dadc5506d330add64bca5b353824e773d2b1e971e78d9cf9dc2438d12b4f62 SHA512 ddb15bb1d917117a2b19ad169ac0f8b8c7667d7ef8ee4c266cc30326429bb3627d41d84dc390ce0036d0b0f110e1d2da47d06d4e4d03a8be98cedb5ea3112246
 EBUILD pyu2f-0.1.5-r1.ebuild 702 BLAKE2B 662d7350b001b3d489a5ec5a27f0f884366d79bfd93a45321292de82edb807130c90b8919ecd55ef37a5568054aa3cce5c5c83203eaa62cd1b2749506f5d63bc SHA512 18615341e5f24631bec9c367eac09bf7dd90f86de9cb3fbf8bb98cf073c0b202e795a7908cbd852dba843b1b66163d80fc23088188f1d07fce71aebef703d1f8
-EBUILD pyu2f-0.1.5.ebuild 670 BLAKE2B 1a0dc257926db4e9958138022d0404ae8866a4c3313bd26eec9cc9656d3208d3c9283bf0faa953c7e9e36f42121dd842e4aa3f57a013c51be3a8783cdac41410 SHA512 5e2b11b8d4a24e5b526e9e52ace15de60e5739c74e8ac22c7ca2c26acc7a7b7defc6dbfd92edea3f344352398d6aa28b51a96593c66379796ec67c9c2d48e7a1
 MISC metadata.xml 365 BLAKE2B a79d187c19602699fa11ff064ca991aa5ceefeeaab5f8b2bb1c9888ead8e23dd3bd4566b17a8956390c0db1f04e4d4fd601a1a667491aed4c30959d312efef49 SHA512 03eae2c778e036e9ef06f25d2ff97ce1865a7b44edb32f59b751121e303a7774c78c258cce889fa4af1932f51abdedf282137c8ba573f5dce1a00066636463a9
diff --git a/dev-python/pyu2f/pyu2f-0.1.5.ebuild b/dev-python/pyu2f/pyu2f-0.1.5.ebuild
deleted file mode 100644
index 570759dd98e5..000000000000
--- a/dev-python/pyu2f/pyu2f-0.1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based U2F host library"
-HOMEPAGE="https://github.com/google/pyu2f"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index c36c65d3c069..08c0b65d0ce3 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -3,5 +3,5 @@ DIST pyzmq-23.1.0.gh.tar.gz 401651 BLAKE2B 8e78f993bc7ee0212c6fa598d7993fc7b9cff
 DIST pyzmq-23.2.0.gh.tar.gz 402085 BLAKE2B 4ab26af04c76205d0770163e248e28a22aa8f710a66c9dc96e18c772338c434ad06227d57edd5aa3476fad68fa7320e9216a102b2cb19649393f1e9ef5d9599c SHA512 348482f4b6fd4ebeae8e4720a7005ed35eccee2bf26b0128115b756ee560156b34e6f043c96b71a84d47b1313bd2d8e0ed0f74c7768e23cbf65bd906036800c5
 EBUILD pyzmq-23.0.0.ebuild 1858 BLAKE2B aeb3a8b77d655c19d70fb63620a8b933af2febbbb7a2dc50d3d6aabcc45ede63e17f519c96e65287a81d8d976a7301c9b46c367217f5eb469e4dc0f5868e577a SHA512 11548dd7124f1f75ab1e2830507956cc5216505eacc0fa824a51ab44992e096deb13484949d65f28703d457cb109c2aa49906c2d10b7167707430a4316cb286f
 EBUILD pyzmq-23.1.0.ebuild 1866 BLAKE2B a5f14054580779d5ce85837b26835e0152afd5a38086601fe1099a183649049fd21b41aa322d2db6fdf202fc41e5006a5abce700da854282a816bc347c72978e SHA512 ae901ef0d324ebf059a39c01669efabe24e349759a1eca780f7390d4709fd8b87237b610f98ec384e7f39d8e5152e8eb8291d19cf381679a11a93b7b94087fd8
-EBUILD pyzmq-23.2.0.ebuild 1884 BLAKE2B 72f523cd0c73c237b59383a4d56b4f77636c8f2190eca5869455372eaf7090af87031b6c329433f75cbcfedf09854999112bc5df283d2cbeca338f2de5c326a5 SHA512 a46af1a3e8386b5034a7e5ac1cd300fa897b79a75235a9bb301b76d2a646f7b2218bae2276256c0f766ed80876c7afc26a8c070380d3e7a3fb8291bbe3f32cdf
+EBUILD pyzmq-23.2.0.ebuild 1883 BLAKE2B 92adac91d7dd757af5e650ea2f5255365ec66129655564e122f7d6bf37435778d2b0731911b42b5cec200bd5d9fbe53e2fd5e3e762a0965bf4699327e5bd37b4 SHA512 bea773d121e2e5f3d434ab15f17c88b3bbbbf601b044550f898961664ee247555337638a932fd5a60f1f5150a4ccc06ecf2f6ddcbb3cb070e043c83dce4671c5
 MISC metadata.xml 548 BLAKE2B 0120b82c6a48537f80d08237f4184ff855c109a0a461adfe7921e25468928ea053cc7727c7b00ff96ea556d719e453ee27cf534b285f24f62f7d1ca4ab326770 SHA512 124145f71518d39daa57522eadc27ab4782c3fc1794543396a6b6c91dda29175c4c097d6be90d7d405823621ce66f62e169b97e086c983d7f08178e6d85cee40
diff --git a/dev-python/pyzmq/pyzmq-23.2.0.ebuild b/dev-python/pyzmq/pyzmq-23.2.0.ebuild
index 70e0dd3fd095..6cba377b28fe 100644
--- a/dev-python/pyzmq/pyzmq-23.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.2.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/shapely/Manifest b/dev-python/shapely/Manifest
index 89e04ba44faa..f560f885e53e 100644
--- a/dev-python/shapely/Manifest
+++ b/dev-python/shapely/Manifest
@@ -1,6 +1,3 @@
-AUX shapely-1.7.1-tests-support-geos-3.9.patch 2130 BLAKE2B 2785926f41a8d9486b9591616acf1f9b2dd76c2b009a7a51fefcb664733b304e7fc59b247a87fa36f4b4301132f157a16153f78dc68c2102901c4eea46c020ba SHA512 64c5ecd44ee7b6020e9605825b8af78ba0dfcaa5b0358c8f76af4104869ce027eb059331fa8c488add3ac1e360e41f46346d24e702c54858fe2f9bbef0b929a6
-DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
 DIST shapely-1.8.2.gh.tar.gz 322064 BLAKE2B f21f91eb58818aa30464c719b1079d382c5a00f13eda70c532e4a12f1612284240e5c8c110a867c74eaa4aac5f3a21fd10b23c7ce781808d4adc871d038b8b2b SHA512 c85323f180622235257aed28c85640c63bb43cbcb2bd7ed9b354a0f23a92e0ca8becf7a94e85edea3a90cfd01017ddfc6f268f4bb2945639c2cae29a73292bd6
-EBUILD shapely-1.7.1-r1.ebuild 766 BLAKE2B 653241ac95f61191086bfc143da76f3962c534922ae513ef59b69bac7722763e909b45bfc2c87194c7558512898d469f4b537d844a05b45f888ce31aa35cdc4c SHA512 c54533c77431cc69e6e810b6a538eeca5776d54aeaf19d81416091052bec84e5b57fc7be214f22ff5d3328baf55f2cb7bad98219eaa66f5e2c4655f6f408c5a9
 EBUILD shapely-1.8.2.ebuild 923 BLAKE2B 07eb43351f004c170b4f4c4809b112d3fa68716415e43f95060b21eeab1fb1b305ee5a4188698d493cd7f75d71db44d184cf1360b0e875ed4c50ea7b8fc82150 SHA512 4506f974e0cfa01cf54eec14c1872690eec56a10f6c0e04bf97cff74e1fc05ea2d61c7d100037756e07a99269c632e5fb143844a33f4d9f2e24ae1183a39acb8
 MISC metadata.xml 1000 BLAKE2B 13d49473b11208e3e050b3d0c5b55751c50b0d29c9bf1a71d73867a3b8a7620b2e3755babee05a09696a55b09e61e440e8e1b5878bc9e3819a5ad38e98de1770 SHA512 77d8c1f9a0c2bfa12acc04f7374d0b633dbd859b3f506c92bc1c1749bd630371a18255ddfb04f323d24740253d1cdffef26bcf3e766d45b4f9c3df5e588f6901
diff --git a/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch b/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
deleted file mode 100644
index 18b6c5ad9a46..000000000000
--- a/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/tests/test_svg.py b/tests/test_svg.py
---- a/tests/test_svg.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
-+++ b/tests/test_svg.py	(date 1615044742785)
-@@ -174,7 +174,8 @@
-         self.assertSVG(GeometryCollection(), '<g />')
-         # Valid
-         self.assertSVG(
--            Point(7, 3).union(LineString([(4, 2), (8, 4)])),
-+            GeometryCollection(
-+                [Point(7, 3), LineString([(4, 2), (8, 4)])]),
-             '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" '
-             'stroke-width="1.0" fill="#66cc99" opacity="0.6" />'
-             '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" '
---- a/tests/test_wkb.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
-+++ b/tests/test_wkb.py	(date 1615044817079)
-@@ -1,6 +1,11 @@
-+import binascii
-+
-+import pytest
-+
-+from shapely import wkt
- from shapely.wkb import dumps, loads
- from shapely.geometry import Point
--import binascii
-+from shapely.geos import geos_version
-
-
- def bin2hex(value):
-@@ -49,3 +54,20 @@
-     # replace geometry srid with another
-     result = dumps(geom, srid=27700)
-     assert bin2hex(result) == "0101000020346C0000333333333333F33F3333333333330B40"
-+
-+
-+requires_geos_39 = pytest.mark.xfail(
-+    geos_version < (3, 9, 0), reason="GEOS >= 3.9.0 is required", strict=True)
-+
-+
-+@requires_geos_39
-+def test_point_empty():
-+    g = wkt.loads("POINT EMPTY")
-+    assert g.wkb_hex == "0101000000000000000000F87F000000000000F87F"
-+
-+
-+@requires_geos_39
-+def test_point_z_empty():
-+    g = wkt.loads("POINT Z EMPTY")
-+    assert g.wkb_hex == \
-+        "0101000080000000000000F87F000000000000F87F000000000000F87F"
-diff --git a/shapely/geos.py b/shapely/geos.py
---- a/shapely/geos.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
-+++ b/shapely/geos.py	(date 1615044673942)
-@@ -84,7 +84,7 @@
-             'libgeos_c.so.1',
-             'libgeos_c.so',
-         ]
--        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
-+        _lgeos = load_dll('libgeos_c', fallbacks=alt_paths)
-     # Necessary for environments with only libc.musl
-     c_alt_paths = [
-         'libc.musl-x86_64.so.1'
diff --git a/dev-python/shapely/shapely-1.7.1-r1.ebuild b/dev-python/shapely/shapely-1.7.1-r1.ebuild
deleted file mode 100644
index c3f37aa5b3d8..000000000000
--- a/dev-python/shapely/shapely-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
-SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND=">=sci-libs/geos-3.9"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests-support-geos-3.9.patch"
-)
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/matplotlib
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index ee8f5f9ab643..60c3fd6a10b8 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,5 +1,3 @@
-DIST thrift-0.14.1.tar.gz 4311458 BLAKE2B 00c0b77c3d722b0db833f03848df0b74ee64712ed1ff06e0b63b926eb493f43ffd9c316422b6044f74685471cdbd2ccea7c6305fd8dbbc10614f2151a3e16237 SHA512 e09e53b2ea3cad01ef81ab4b5a87bfed443cfda849a13c4f00ba0ed1cd1a1f9742faf95adb07f279506cc5f866c13fdce57149de1bc9e71ab5c40238037e8b22
 DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
-EBUILD thrift-0.14.1.ebuild 593 BLAKE2B da6f8d820e0f6936906f9f4f13a2072737f2ae9c6c77de2464ca2b8b5e8d62563e6b4abda6600af78fd6d5d8ce06a8dbebcff887054383726382f0bd9b6e0d7b SHA512 1f2511a7ac57737254df5c12a528687b4f62f3ddb78c00888d4e7a2123f1df86e5872587076b2743f29d749c71148f59a5c3f37fe33b5264ec3ef28149af7eff
-EBUILD thrift-0.16.0.ebuild 509 BLAKE2B dd695922a315b078f764ee05b77db4f414dd428c413e9d9dec5b5cdef275ff54b0d3f5b35e11560022b7f311441f597b99a0f4e0265fa94a442c53a5a4f496d8 SHA512 8a6099105bd1053947ae87f7535e92d62ce2728f3d2d1b4b228ec7678aa944548c1206d08699498136c64f10fab9aafd85eb3ccda6098d96a475ea70bad35184
+EBUILD thrift-0.16.0.ebuild 507 BLAKE2B 53b099d4995d44ea6509a82c4f60097c98cac62618217d4e2c665d6f09621396d8f7f27e14471109d7b30e840fd44bc81a8d4d43afa5d82be0e4187b0f750869 SHA512 34d04b4601ba48fd0fa45b0ea253e140eeccb4ea6464d8e204fef8882646129032f4064d9e60a36faa3e7205c0f885ab25e72328e57bef4ee0c067186777ef5a
 MISC metadata.xml 328 BLAKE2B 945425132ceb24c1286fff7b9b64eb814e331e9df732251040f444efed2740e06e76d44dce88c338d7ffec243f4ef0f2c5ce661cfada5f027a50c79624d35fbc SHA512 271fa461589f5a148fcd06c76a6d9a7dd1469ab090536e858bfc9f43a5039d5836bd2fa77da2dba947d7d85ed6ed30d7ab36bc2df36c5a321bd29389495f90fe
diff --git a/dev-python/thrift/thrift-0.14.1.ebuild b/dev-python/thrift/thrift-0.14.1.ebuild
deleted file mode 100644
index 491c7fc2de1a..000000000000
--- a/dev-python/thrift/thrift-0.14.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of Thrift"
-HOMEPAGE="https://pypi.org/project/thrift/ https://thrift.apache.org/"
-SRC_URI="https://downloads.apache.org/${PN}/${PV}//${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P}/lib/py"
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/thrift/thrift-0.16.0.ebuild b/dev-python/thrift/thrift-0.16.0.ebuild
index 7e8f3240e62a..b9c4693a0a74 100644
--- a/dev-python/thrift/thrift-0.16.0.ebuild
+++ b/dev-python/thrift/thrift-0.16.0.ebuild
@@ -14,5 +14,5 @@ S="${WORKDIR}/${P}/lib/py"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index f0b8a1146b35..7e9078d3dbd9 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,3 +1,5 @@
 DIST xdoctest-1.0.0.gh.tar.gz 193294 BLAKE2B 95725757faafd2a15652557e07753ad8c4a8ee57b545169ba29b6e8f0ef5c7a021eff3c092cfe123da91311db98ef7700b29d52b1418a8160869402fb4ecfcab SHA512 8c77fbd8fcd1a3030b33651d35567dd4506ece3aa2c6155223d5cdea6e16510b59bcbd5b9ebb6dc13e20af92c5d07dc205485566b836874e835b18a53cbe7355
+DIST xdoctest-1.0.1.gh.tar.gz 200921 BLAKE2B 29d4947e8a49b11721c2ab8500e12334c9937d892519154267ad1ff3f98e3a35767eb770ed40d34c253e282e09e90de2567b92fd7b3167f7d8a58dcd762bc43d SHA512 c853f0b673ebc8b1f6fc6305a8688bffdf33cabab734a53f4ed1668d4f94d0431dd6e867b30a1c4588a86f3552e9b94ceaf540c3ed8e66f80bd9ce45ddbae690
 EBUILD xdoctest-1.0.0.ebuild 793 BLAKE2B 6bd200b884b62e4f6e378a60e071a6a5689c35e0a0520623e0497a57db4e8ec5acf89afbd93e30a8d5a74f9fe62ef06ed53c028e8b34f668bddae48953b8e6dd SHA512 83c4d2e75cf7e7bd059c3ba50ab24a3c3256efb380c802df97b8bf27f4a675f0485051cba7f53cd00cce808ef124bd79cb2f692def1e523ce40089dfbcb5ee05
+EBUILD xdoctest-1.0.1.ebuild 845 BLAKE2B 34c187f937384b8c95fad088592bac62237661c2bc5ae18f88ab352f24d15e23372c6686a87ce018897deda4f6072abf89434edc87e933dc10ffacc33e1dbe31 SHA512 3bce4c0a0e6540f78a14b6ac74bf227b729b083a5a175b8d7d893edf96a6c34dfcfeaa3bbb4514a6308b16d3482f0a3ad181dcaba72bfbc9c35fff21119b1f05
 MISC metadata.xml 426 BLAKE2B c5bbac93c627fdf15490b4867f0bd1e4d1fde469552cb8c7140c83e13130a4190f0dbfb3b67608ae454683630b937e3e8dc38ddf37b344aabff20ac4dc04e9d8 SHA512 0cb726bc6ef7d28b3ab744da3e3e770287826c8d4b1ef87fa404d9aa4b8d1e8fa3c8a2191cf2679bbc16335fbd50e5d887a1759c2866ac9b1cc48c2189b16637
diff --git a/dev-python/xdoctest/xdoctest-1.0.1.ebuild b/dev-python/xdoctest/xdoctest-1.0.1.ebuild
new file mode 100644
index 000000000000..a1433e00c391
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-1.0.1.ebuild
@@ -0,0 +1,39 @@
+# 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 rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/xdoctest/"
+SRC_URI="
+	https://github.com/Erotemic/xdoctest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx_rtd_theme
+
+python_test() {
+	epytest --pyargs tests xdoctest
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c69d0ba3211f..5c1ece29190c 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index d970216ad225..7beb6a380d6f 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,9 +1,11 @@
 DIST i18n-1.10.0.tar.gz 72745 BLAKE2B 0675af73a52eba29ead397623d602f9eec60ff21953e5f23ee986fa5506a3296d7f54e88ea8d30cd6ccf9eefdcb589bfd798e2ac2a76f5d93d44c47b9dbe0f49 SHA512 efbe3c0c21d84c0ad69bda4a6f46a2106b3d20470b7d06fb2e62a063ac9d4047e38098b69ed30a5d892331d63aaf75e0bc29ffa5ae1d14ab066d47cccfe342fc
+DIST i18n-1.11.0.tar.gz 73729 BLAKE2B ec2eb21b6c67139b8aa2ceac635b0d84cad0cd462821db87d359e616d2bc1ff93a3b267a3c4d9fe6f223fa1118a59be872097f18514811de407c43230a3e61c8 SHA512 ae7b9d7a87ba87dbb192ad3c3453b088d63a29e796117656f1ca01847d5633e1b27f1679605c313f50219299a3663d84ecb4790bfd849c491dab00eb1d948f6b
 DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc919ea7aae641cb484524d17312ebd3e0ee68cde1c01091e42713ea229ccb41ed3998c6bbf772d32f855ca107 SHA512 e8b10bf380241d1e6b19250cd63e727366215b4ad7e63479a02cb81a5b46a48e06db827d9df9969c2052895646ee30c237fd17c3352a2bbfed97615bb9b6cfca
 DIST i18n-1.8.11.tar.gz 67964 BLAKE2B e603077c6eb02f6fd89bafd6c06f85c72528d5eb4388854f060f05a4b49a3782a3830366a1f11bd95b191048f29fae251002a34d55cb185ecefb3afc06bb2f36 SHA512 af8fcc307de9959b5a01a79ac3c99d3a3573630f8cdf91c21208e07d35d1a0db60f4995f1b77921c5374a1a19ad66770a107cc41fb29cf480d02be00bf90634a
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
 DIST i18n-1.9.1.tar.gz 68971 BLAKE2B 00fadafb96dca76f7ed180fe5af5e8b44db96262fd98868b2fad5f57a461c3abd61e17d3c8e143603108cf05a58f8a74ed8e2c8cb062d63ec4edc8081b5580c4 SHA512 661f3f62a0933188b8b09f91d816605dbd50f6afc45c54e38ae70e76f03fb428dde33070e1dde48459d0b385521535ebfff1b18323abc2a1a104c5a6097970a4
 EBUILD i18n-1.10.0.ebuild 1573 BLAKE2B 64f582227c3a54ec01deecb7778f852625323c5048a2826ddecd6655b2d5ea758b1edac90ca916f2491daecd4d98f1ea8ff54aed48442345d9dfae2b832941e6 SHA512 e3eecb557ee0efde0e686dbfffaef961272c5380f6f3aebfd83470f2d0a54ac466733cc7c1275067383572f2490cc30bdf6ef28fb7007e8615e4b662543bae14
+EBUILD i18n-1.11.0.ebuild 1573 BLAKE2B 64f582227c3a54ec01deecb7778f852625323c5048a2826ddecd6655b2d5ea758b1edac90ca916f2491daecd4d98f1ea8ff54aed48442345d9dfae2b832941e6 SHA512 e3eecb557ee0efde0e686dbfffaef961272c5380f6f3aebfd83470f2d0a54ac466733cc7c1275067383572f2490cc30bdf6ef28fb7007e8615e4b662543bae14
 EBUILD i18n-1.8.10.ebuild 1580 BLAKE2B d282f7c3fe160de710586e1bf454807e4c9c5c80b25ced3c31d41b863164e917a753b2a7cbcf02621126d749f9832e92fab00323792af7bd46b1c2b199999e2f SHA512 1f90a5e3587a6da2b16679f14608d1b39d62403bd2fd1bf819e6ba07fd6e47214b17805ae557f77884a9fec67a3a4c0e01a3f0e68330e05d9768be69a53cdfb3
 EBUILD i18n-1.8.11.ebuild 1507 BLAKE2B 25c549ec71d9ab2cfb3b50c2aa8bc264fd30e6ae79d2c6b397b45d8a8b19511d6fc9305d35c62ba04f4d6a0291afcf0304e24a0e976b0ca830f0f5aabd1ed442 SHA512 f0be173922bc84b078c6bb8a3ebdacb81d18cdd38468c58da19b4df029fd1e55bfadafa52675aed4cb6badcbaf0d3c7e99c656fec0aacd19db481e2ed2c5d02e
 EBUILD i18n-1.8.9.ebuild 1571 BLAKE2B a12efebaa78afc758b65b6bd82dd0a3a9909ae9f7f11bee834f5a22bb4691ce69f671b597a9abbfc439e785a89d966be38b6f4c901d3f98c5f89af8085f5b161 SHA512 a4ae786b0b6b2bda3585285f4209044a2a8584b9ee55279fb36cb5f108988f172c81de57bb066ddf8d497e7ef489b51cf6166cc190b427bd5a7856cd3a5da4f7
diff --git a/dev-ruby/i18n/i18n-1.11.0.ebuild b/dev-ruby/i18n/i18n-1.11.0.ebuild
new file mode 100644
index 000000000000..dd6a097b4229
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.11.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/mocha-1.7.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby30)
+			versions="7.0"
+			;;
+		*ruby27)
+			versions="6.0 6.1 7.0"
+			;;
+		*ruby26)
+			versions="5.2 6.0 6.1"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index def5ddb25577..7ed2b110706c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cucumber-ci-environment/Manifest b/dev-util/cucumber-ci-environment/Manifest
new file mode 100644
index 000000000000..f793801cf68c
--- /dev/null
+++ b/dev-util/cucumber-ci-environment/Manifest
@@ -0,0 +1,3 @@
+DIST cucumber-ci-environment-9.0.4.gem 9216 BLAKE2B f7758051d9e990b7b25b4dbbe4448c083630855619d11a4262740ca2bb2c85d659aeff95c889d179b22a8cb2831659b4cb86bf04d253a451749565e263244eae SHA512 be130abb5227a17308bdd2792e84d509a2ad64e1b19030bde254ceac607ebea5374f94dde80d9cce01be125a01356f12bc70b1884df149d6e1a7bc43651710df
+EBUILD cucumber-ci-environment-9.0.4.ebuild 431 BLAKE2B 7efac6078abc9aef51165a0bb23f69d8aa0679d7362e0684456fe8544fc6bb668e1b5ddda5b28dc79b3cf30a25cd3605f37798957ab7cd0e7945e6361e0ab871 SHA512 1eb52d42d2555735a50cc63eb15ad45868cb58cecafd653fd2913f38d4536fb89a75f3aa3bc4904dea51b84efe58b4717733f37ac1383e8a003ef26ef9e1659a
+MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.0.4.ebuild b/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.0.4.ebuild
new file mode 100644
index 000000000000..8a6e1e11317a
--- /dev/null
+++ b/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.0.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Detect CI Environment from environment variables"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="test"
diff --git a/dev-util/cucumber-ci-environment/metadata.xml b/dev-util/cucumber-ci-environment/metadata.xml
new file mode 100644
index 000000000000..ecbd8c460ae2
--- /dev/null
+++ b/dev-util/cucumber-ci-environment/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 29efc8733491..2c2e2a8eabac 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,7 +1,9 @@
 DIST cucumber-cucumber-expressions-12.1.3.gem 32768 BLAKE2B e873ba0ac58982c2a975935351bdbaa0e2d5fac5128386cbab347330d5ee920eb7c90d7670e9cd68a9294eb09828d7640e6fcdc69da6d819935f8faec9bce2e4 SHA512 57e8b322b7451967d177e291e9649cb7d9e2668dcdfc2453b9b2ed9c8f84f4c3c5b7905d246dbfc5382a8c515a3d031acfcec93e5ce568da23dd1d42e6d31fb1
 DIST cucumber-cucumber-expressions-14.0.0.gem 24064 BLAKE2B 45b811bb1c1fba8fb2b4819998b92b827ef80c7bb654d899b717f2438b5c6485447ce5e25e5d97e7d7d323fbc576d98334cefb825687b3791387df0cbc7669d6 SHA512 c5b3b840e04722b516a8cf57ce8f55f835f84efd73b133f9d6f842d1ae5612108e1100dd970d52cd349bf4c606ed1922b4730a0b2e4a2d31abdf2f6f51768a80
 DIST cucumber-cucumber-expressions-15.1.1.gem 25088 BLAKE2B bc9990d11994a5c094b23a2d8bccf283d0c035507d7140128acae674faa70d1b8927bce6069b82bc530b28b4867ae6be3f168847e0d6db036211a5fd13defb06 SHA512 ceda830ca22e388169db41c85343f9adbe918ac76a5cfaefd55ca3d2815ec826eb592ba70771f0cf41bfefe8e42d9afbcfeb8c384cfa30687e9c0c023164fbe3
+DIST cucumber-cucumber-expressions-15.2.0.gem 25088 BLAKE2B 3e0a9283cdf1a9488826260a98358612847945e287ed0f4b011c697fa6aabd340974705d5eb338464fdaee938090ea83b8c912820517b9a2b0cfa0c81b554d5c SHA512 c4f72a6e096794598f94318ef21ac7586328229db4ec5d6791abc3d36319e798d3bddc91fdc9d56a3741ae8ce082deeec153b66d8904683e3038b1161b84fcf7
 EBUILD cucumber-cucumber-expressions-12.1.3.ebuild 442 BLAKE2B 4f1d7e7900a38a912a4ae1d1e42236b9ee854a81fb55d0a4873cc24c1c8d6dca90882ebd017a1eb31995dd0abad261883891f16e793dca83d69c30e85b08b3f5 SHA512 9bcd00b42922069b814dbcfad4bf40d8c5003f38f9f0c2b884e60921ab3313f00ab8c891f737816e1e04c1e3acb65d5507ab67140e2fe17a5c8c61f6853050c2
 EBUILD cucumber-cucumber-expressions-14.0.0.ebuild 449 BLAKE2B 2b06313cb60c12c6ae6dba6ebc4c3189fbe73ec331ebb6cc05c984a702f700ea2064e1a5b8173b46f0e3f7c3c89f785d1bf2b1a470f58c4c3c953f2dd477840a SHA512 8f197d4cdbb687523f357690ef2ec5b82c4ac3e5443a9afeae3f8841e0b4dde3c35db0fe8755f46ea7d4bb3ca788ae20dacf8eb1d9c9224b4f1b0906909fb24d
 EBUILD cucumber-cucumber-expressions-15.1.1.ebuild 456 BLAKE2B 6a702ecdc78b58b661829d41ea3dcec3c6b3ac52a8f9b3e95a6a789b2abcf022aa5697830e39db61711732dcb50ecf0ca8bdd2ebae05544a9c9d809145795ba6 SHA512 d3a6e75cfbaa5fe1b408c498e06d24330d6431c3a8b1bbcf9032cdaf146446df1affbc81ce15b6910a4f574aa2e6f55d56b9c180083aad192f4ff07cfb0b1f4c
+EBUILD cucumber-cucumber-expressions-15.2.0.ebuild 456 BLAKE2B 6a702ecdc78b58b661829d41ea3dcec3c6b3ac52a8f9b3e95a6a789b2abcf022aa5697830e39db61711732dcb50ecf0ca8bdd2ebae05544a9c9d809145795ba6 SHA512 d3a6e75cfbaa5fe1b408c498e06d24330d6431c3a8b1bbcf9032cdaf146446df1affbc81ce15b6910a4f574aa2e6f55d56b9c180083aad192f4ff07cfb0b1f4c
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild
new file mode 100644
index 000000000000..254c73877467
--- /dev/null
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index f96fc93bbb65..9aae249da284 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,7 +1,3 @@
-DIST stripe-mock-0.130.0.tar.gz 572453 BLAKE2B b97a1b54f4da158140e91abf68c8b476f18d7e96ea96587cd6a54be451776e5066a0dfc2da6c4b7234e08315b646d395f21099b8e30f20b9bce1b3c90f03c199 SHA512 7796ce75a77cf84c475cb8b957b76280ef7ba616dbfdabe2b6fbc4af135c0068777e0acc5f7a0c058a930988f66ae9d08c69a71cf119fadd9a79f210dddf7be5
-DIST stripe-mock-0.135.0.tar.gz 581001 BLAKE2B 7e7b129b5080cca742b1ce08b1a3443f74af23bad3cf09915a7b697f08c4ecb3d0801bd0a1498746cbd5a1f1e4bd4b4fc182f7f4cf0fb39b6db7067c4f8b5a88 SHA512 276dd5f063a1f318349d87314e76f6d6a00f4e694bd7be0f3de8f85195c196d43cf9f17128b156e75b90502ce897835953d5c425684ce7176a3977d4ea0a477e
 DIST stripe-mock-0.136.0.tar.gz 581986 BLAKE2B 6ee65d8beeec0bff9a97fd0963d0509c0174be49f7bffacbc2e5ba36c3d1711ccebb4c2acb377b9dba32688e8b8f9a4b4f80e5d88b23d6bc1d1f8cc48d0ddd93 SHA512 f5bc97739158e32382ebfc9c06b7db3a1b42e66821210a18dbbb7d36d31d5ee16313a518aaeb9aecfcfb383eb76eb5c05f11e600217f93b5ae10b9de2adc0327
-EBUILD stripe-mock-0.130.0.ebuild 497 BLAKE2B 6d01c4c1a82df433bda4ba706643db3b88f4b1f2dcf04f604ffceac9311d61875b32c9b33ec4658ff5b24c663d7ebb1cc602f6a06eae9616d2859ff2b252d9ca SHA512 ef737de8503726059fbe7addf29b60f960f705fa4ed7880403f80d4250b994218aae25ef4f2f47d0c6b76c4dd2bc2507d5c6c24fe12e75c8ab218aa62a30fa6c
-EBUILD stripe-mock-0.135.0.ebuild 500 BLAKE2B 619d5546bf1ccf99873ce37ff7c447c0b1cf009c9a74f8325c070877b39b522f7a1f7b881b05c2171e204ab23cee1edefaa3f60a1888b731fee0f69e784e5140 SHA512 b8698f82c4a0ba96e351eb8738746a927ecb80d34a66cf51718a88fd40ae20cbbdc8ad95e78244119ea94d1340177ac27399f155c4eb572ffdc90f7c1671a557
 EBUILD stripe-mock-0.136.0.ebuild 498 BLAKE2B def6b159574c4b15abd9138f51ec0b5793301a4719a5644d9b9380552424fa51dc110957d6180fb65fadd6c9670067fd7cf3513941cf60d60541588c27e1f4cd SHA512 c08d4a4bc2a6d64102ea8e39ad03c794df6d1c5802354f5e9f2dd897f76828ce7ba406c7326f476b7ec8507b4e3f981b8c8458b8a474281466c192df54d7fa0c
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.130.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.130.0.ebuild
deleted file mode 100644
index f69efe4b5061..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.130.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin stripe-mock
-	einstalldocs
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.135.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.135.0.ebuild
deleted file mode 100644
index 89958510a463..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.135.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock/"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin stripe-mock
-	einstalldocs
-}
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 26916c66dada..d7639d4ef6fc 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/trine2/Manifest b/games-action/trine2/Manifest
index ef2927324ee6..210dced6fb5f 100644
--- a/games-action/trine2/Manifest
+++ b/games-action/trine2/Manifest
@@ -1,3 +1,3 @@
 DIST trine2_complete_story_v2_01_build_425_humble_linux_full.zip 3243286878 BLAKE2B a9032d6043ac9623a254c1ebe69c30e5f173de91e3cc0552c4ff60275c11601c7708c37d2d7b9eb789290e24569967fc82b56f143110306642b28d5e21cb62ee SHA512 e59aaa6da7d4cae96d361f7f80d857e4102b23fe9584b88af9163407d4f1a34b9e0e79a9337c133e9d60e31ac8ead3a7f9b02b47f9797df05f998666c9219c15
-EBUILD trine2-2.01.425-r2.ebuild 2487 BLAKE2B 875be8fe0909d6983e591ffa39f6f6f5a390547810ab4a6e28c6d4904b1284875b17ccef170a4b5cb26dcff21a086c0835b51725eb0ff2f6be27d33c045d9a79 SHA512 fb6943e07684b2627b42ac67c2fba758b8551858b62443694034a3b35279971e50318b29a064501589ae74da3a62c59652464f801ef5eec6f897b9eb68df6d57
+EBUILD trine2-2.01.425-r2.ebuild 2505 BLAKE2B 2b0668bf6a1ee1496121f916c35d45586acf3e44cf05522c8a2de470509a8e69043756ec46db51bdc726512c027adbd1222ea79cd6ee230762192e005aacc2ac SHA512 4c6034c06f9de681f1fe530300b53f929b9a9b50ab84ef4f57e46cf5e258e0af4438557ede77e22cdd5c898de573d34408b2f4d8e3a9d106cb9937bce6b93e50
 MISC metadata.xml 322 BLAKE2B e72f96cb02a9a3a5352dfb35a117a62390f2963bfb3850244ba2fc461f376b7643a410adf92a0b8ffe9cee2548a0e522b2900e8281096bfbfc2d778a4d14fc48 SHA512 a15991fe3adfe196792e7ca912952ce8583321d5f525b14db4aa274afed337f3c30200ccfa2f50e63d110281a06e3b01dd988c25c5ff48a6e3526b4e6a7437ce
diff --git a/games-action/trine2/trine2-2.01.425-r2.ebuild b/games-action/trine2/trine2-2.01.425-r2.ebuild
index 0bf349e4d742..54c627265d17 100644
--- a/games-action/trine2/trine2-2.01.425-r2.ebuild
+++ b/games-action/trine2/trine2-2.01.425-r2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	>=media-libs/libvorbis-1.3[abi_x86_32]
 	>=media-libs/openal-1.15[abi_x86_32]
 	>=sys-devel/gcc-4.6[cxx]
-	>=sys-libs/glibc-2.15
+	>=sys-libs/glibc-2.15[stack-realign(-)]
 	sys-libs/zlib[abi_x86_32]
 	virtual/glu[abi_x86_32]
 	virtual/opengl[abi_x86_32]
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 62942d843f03..0e0e869684bd 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 4ebbcd032466..ebb538fb15c6 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,5 @@
 DIST rosegarden-21.12.tar.bz2 6490931 BLAKE2B d1f3bbd173e1d082c5380be2fe0bd9818a741498add5edc9b24c47b9e37e24b928869c00734bf84dd9c2cb9a79fed15275de35a8e7cd4cbbd8ff6cdcb739c09d SHA512 d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be
 DIST rosegarden-22.06.tar.bz2 6514502 BLAKE2B d4ba13ac6b4cba6d0b5bc555933737d696d380737e56a3e4e1dd782aff641dcbd49af50aade75550b8a0e22a45f491585ffb4166b21cb9889eca1a2e546c585a SHA512 42ce03a65f9c9401cb3f641c0ae80a827e18d6f47420add382f63273f4644eac5997befe70cac972380441a43d74153a4e37a276fc3dc8d9889eb8671759ab5a
 EBUILD rosegarden-21.12.ebuild 1133 BLAKE2B a622a2944862fa2075296aadcdf4bcf28f60de9b2d69abb9c56d78d757a74a1e31f526eb2551b08bcd9b740ca33a1193c3ebb39610cfb1a3dc2a5f3e27061e59 SHA512 4663edcf437147fe646031dd7791a49eaec8fc5e1eaaa5d841561d317fb63106af4d8cddff8c5d83bc9377976c4083cf022ce89af2c956d5ed8240139bbaef29
-EBUILD rosegarden-22.06.ebuild 1135 BLAKE2B cdae8ff15f7bb2f7f8ffac044ae7a06c05f2d7084bd46e1d91055fd3c934e6a958cac6caa4ea43ed77a989a7b87a98830ff269c70969e3310b0a52f8259b8a94 SHA512 15c4e90ea5510374252f2583f5e4ca76147ecb655ccda904fa7ac2a8151a0fead5972e36eedca02d627a0553f220302e0639d6c2500ac17114ee3716964378da
+EBUILD rosegarden-22.06.ebuild 1133 BLAKE2B a622a2944862fa2075296aadcdf4bcf28f60de9b2d69abb9c56d78d757a74a1e31f526eb2551b08bcd9b740ca33a1193c3ebb39610cfb1a3dc2a5f3e27061e59 SHA512 4663edcf437147fe646031dd7791a49eaec8fc5e1eaaa5d841561d317fb63106af4d8cddff8c5d83bc9377976c4083cf022ce89af2c956d5ed8240139bbaef29
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-22.06.ebuild b/media-sound/rosegarden/rosegarden-22.06.ebuild
index 2a8fc820cf59..be07439fa3cb 100644
--- a/media-sound/rosegarden/rosegarden-22.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-22.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b1b859cf8ee8..7b7b93a45a18 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7897ba37d138..505c140cf07b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Jul 2022 05:39:44 +0000
+Mon, 11 Jul 2022 11:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 42b1729ff0d2..89259a5a28e7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-11T05:39:47Z
+TIMESTAMP 2022-07-11T11:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLLt6NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLMDAJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBG7Q/9EQeGVLQnoXfPdizJzem36ad6jC0dmd0YDj9+B2GThpjMowJ+LhGdnQDa
-JASLWIplLygDtWVaor0PZSQeAfP8nAi89YueorEiw76a1iNUgVXk1rUP2LZWfTfJ
-jfl3OeYiYCbAkzTLg9NOaJweroJCBg3nxY0PydTBKTMJYfp6tKtuDku75ovBPjLD
-yUIacjBPhhAV8bMCYXwlgCvzqjfNGOgKUWTBADbUhjqoi9Ql96HDLklzFAzyVgBK
-23aF5/1Dstx1d5m6cSc/mBqcvKuhviuKro09to1ElHXceMFtfNMWPOZMdZ9Iva7n
-MLctldbEGNdQRO8icVFmstnv+j6G9wwXmU3pxzLirHjtkawoTF8BzGy7DxnEWJAX
-nJgayghk4PYT4sLRrTxMkltHVLhG/qcgvOETgI6LNnWYm5/Els1xlXfWFuu/LPim
-6pT4h1OY29OlU8LWRUemPMGRvVs8PG261TOrGwvpHg0/dSohyJtE6/WRTM1yBxtE
-oRgJhUUpPW7oAZKyN0tRbEDBJBTm2zn8Fg/cU1ryzDWKHhfcKYUPEbPXacP/YInd
-iuuLREKj3I4Mp6iwhQRrpMihUsKf7QciTn9nCLiEKxbbpBa98AcOKKI/vCd5WtgI
-FicYPMS9keUx9olQH00eqbCt/7bsX8id7zA68xd93EnYzR9IAoE=
-=fsmn
+klCs9g/7BRhNTXjaRy4/UL5nUJFvVMU/ea2EL6VY1fVMtaJoCFOkNKvj2KiqKSaI
+ejz8+038BohM7hYQAZ0luOP29JvPesJoNNhJEzk8k6jaGmakX0mbeikFVB5Lodnb
+mgQXRlepG69rKVXBEFNrj7S3ojMq3LAZgzY+4YYwwO+5NJkjbHwUIVveqpsEZ1xZ
+w12k04GBeXlDZCbmDLH3zqpXWhXYO3aGfNVNSobohmNV4df6vs4djHDYsC/OyEFI
+lAnQWuvx63iC3icf9JOvZ2j9eRIURawICqq7yjbP7eXuhCcZthZO8gml9PUD3kJg
+dHPhQUinKgaUZWeNSLYtsjmp2otTi68K+2n96ssaGwdBz0xJbKbhHTrJp98Zkx0O
+sKe+dtig2I+g3YFa5Vd64rIieJuvf7aBa4xXyjFkTVnVQRQYyfvrdw8MzKyPZsrl
+UaVShjMP2RDFhd2QcVT7Y/eh3HIOY7RPlyKRBsexyK0PYMjydY6pORZUEXuzSsjx
+wdnTN00Sca6x+wwQ0WmxMUP/CxL0mUfw0KTfHJfrivc8dJfQH0otdQUNI9RgBwKy
+9pR5RRHbQmdYQiOXIauYUPmrSVcDhgPqiIb94G1Fv8HAWzakBYV4v/+OcjGl9wvT
+tUeAbRXdXqgqkFgwNfsU+dEAGOSaWwbD0dfAWaEsr9KqFBh5BeU=
+=hPtz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7897ba37d138..505c140cf07b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Jul 2022 05:39:44 +0000
+Mon, 11 Jul 2022 11:39:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e6d9deb7ce23..f4e18cee4274 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 872e191adf64..750945022f51 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.15.2-r2 b/metadata/md5-cache/app-emulation/xen-4.15.2-r2
deleted file mode 100644
index 72f3eef2282f..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.15.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=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=7
-HOMEPAGE=https://xenproject.org
-INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
-IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.15.2
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.2/xen-4.15.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.15.2-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.2-upstream-patches-2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a8c80e3ceda1f76e101587f4d4cb59b4
diff --git a/metadata/md5-cache/app-emulation/xen-4.16.1 b/metadata/md5-cache/app-emulation/xen-4.16.1
deleted file mode 100644
index e4c1495e3f87..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.16.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=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.1
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.1/xen-4.16.1.tar.gz https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/4.16.1-gentoo-patchset-0.tar.gz -> xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz
-_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=8c1dd76821e83c9ec754a98490b8341f
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.2-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.15.2-r2
deleted file mode 100644
index 23d845b0a0e9..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=qemu? ( sys-libs/pam ) sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 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(+)] ) 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(-)] ) 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] ) ) !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 ) ) 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(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= 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 toolchain-funcs
-IUSE=api debug doc +hvm +ipxe ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=qemu? ( sys-libs/pam ) sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 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(+)] ) 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 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.15
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.2/xen-4.15.2.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/a3741780fe3535e19e02efa869a7cac481891129.tar.gz -> edk2-a3741780fe3535e19e02efa869a7cac481891129.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://dev.gentoo.org/~dlan/distfiles/xen-4.15.2-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.2-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b2f67f44c67cae3f0cdef0ee9c77bc0
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.3 b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
index 35d1dabb5eb0..775cd73e873d 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.3
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://xenproject.org
 INHERIT=bash-completion-r1 flag-o-matic multilib python-single-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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 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(+)] ) 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 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/4.15
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.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.15.3-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c78add70cb483f09dd532dba06d330f9
+_md5_=304709e843b7f5c12bca43824291ae44
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.16.1 b/metadata/md5-cache/app-emulation/xen-tools-4.16.1
deleted file mode 100644
index 971e017d260b..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.16.1
+++ /dev/null
@@ -1,17 +0,0 @@
-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(+)] ) 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(-)] ) 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] ) ) !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(-)] ) 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 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
-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(+)] ) 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 ) 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.1/xen-4.16.1.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://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/4.16.1-gentoo-patchset-0.tar.gz -> xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dc4d6818f62a6ab0a403a387f7904e44
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index b9b799361570..d19ce2729861 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index f9a6a7be8ac9..9416f8e6cd9d 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-activation-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* dev-java/jakarta-activation-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=istack common utility code
 EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=017580c1a2bbab04687dfda83d03bc7b
+_md5_=1c1c306097611f6efc71a12188bff5c2
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
new file mode 100644
index 000000000000..0d89490b573b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz -> jakartaee-migration-1.0.1-sources.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=5d04d5fbc0787b9752ad18dfaa7b93ed
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 30ce46d5d2c2..28ae0603e76d 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/PyPDF2-2.5.0 b/metadata/md5-cache/dev-python/PyPDF2-2.5.0
new file mode 100644
index 000000000000..419f51cb6e60
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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 unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_beta3: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/py-pdf/PyPDF2/archive/2.5.0.tar.gz -> PyPDF2-2.5.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.tar.gz -> PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz )
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d3af46dc51fcc77e8c4bf3f7fae9c70c
diff --git a/metadata/md5-cache/dev-python/astroid-2.12.1 b/metadata/md5-cache/dev-python/astroid-2.12.1
new file mode 100644
index 000000000000..ae05d4d65da8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-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_beta3: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/PyCQA/astroid/archive/v2.12.1.tar.gz -> astroid-2.12.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e39bf0e4f19207ce82a1a8b79d2060d3
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.7.0 b/metadata/md5-cache/dev-python/cherrypy-18.7.0
new file mode 100644
index 000000000000..bf4ba124d0ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cherrypy-18.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/routes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/objgraph[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-services[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cheroot-8.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zc-lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-collections[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ssl? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.2[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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=CherryPy is a pythonic, object-oriented HTTP framework
+EAPI=8
+HOMEPAGE=https://cherrypy.dev/ https://github.com/cherrypy/cherrypy/ https://pypi.org/project/CherryPy/
+INHERIT=distutils-r1
+IUSE=ssl test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/cheroot-8.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zc-lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-collections[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ssl? ( dev-python/pyopenssl[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_beta3: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/C/CherryPy/CherryPy-18.7.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=8268b077b27ee174a974005afaff283d
diff --git a/metadata/md5-cache/dev-python/docutils-0.19 b/metadata/md5-cache/dev-python/docutils-0.19
new file mode 100644
index 000000000000..e5f7bb6547aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docutils-0.19
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pygments[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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=Python Documentation Utilities (reference reStructuredText impl.)
+EAPI=8
+HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2 GPL-3 public-domain
+RDEPEND=dev-python/pygments[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_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/d/docutils/docutils-0.19.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a3567866733c832e9b9b79c0b9afcda6
diff --git a/metadata/md5-cache/dev-python/hatchling-1.5.0 b/metadata/md5-cache/dev-python/hatchling-1.5.0
new file mode 100644
index 000000000000..6876ee70111c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hatchling-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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_beta3:3.11 ) >=dev-python/gpep517-6[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=Modern, extensible Python build backend
+EAPI=8
+HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
+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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[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_beta3: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=https://github.com/pypa/hatch/archive/hatchling-v1.5.0.tar.gz -> hatch-hatchling-v1.5.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=53f3da12c31bc9ea210115b30aded090
diff --git a/metadata/md5-cache/dev-python/huawei-lte-api-1.6.1 b/metadata/md5-cache/dev-python/huawei-lte-api-1.6.1
new file mode 100644
index 000000000000..7d324c1cdb01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/huawei-lte-api-1.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=API For huawei LAN/WAN LTE Modems
+EAPI=8
+HOMEPAGE=https://github.com/Salamek/huawei-lte-api/ https://pypi.org/project/huawei-lte-api/
+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=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/pycryptodome[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[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_beta3: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=https://github.com/Salamek/huawei-lte-api/archive/1.6.1.tar.gz -> huawei-lte-api-1.6.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e206f6d3b17a2b483738ffae76d7dbbe
diff --git a/metadata/md5-cache/dev-python/numpy-1.22.4 b/metadata/md5-cache/dev-python/numpy-1.22.4
index 084f03ac5c80..59bf3b2b5503 100644
--- a/metadata/md5-cache/dev-python/numpy-1.22.4
+++ b/metadata/md5-cache/dev-python/numpy-1.22.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://numpy.org/
 INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] ) lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.22.4.zip doc? ( https://numpy.org/doc/1.22/numpy-html.zip -> numpy-html-1.22.4.zip https://numpy.org/doc/1.22/numpy-ref.pdf -> numpy-ref-1.22.4.pdf https://numpy.org/doc/1.22/numpy-user.pdf -> numpy-user-1.22.4.pdf )
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=4dbb79a9d5eb2e7bcc7bc67f767a7c98
+_md5_=aa5a54ea564a752e55f61590f3d5fa26
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.1.3 b/metadata/md5-cache/dev-python/pikepdf-5.1.3
deleted file mode 100644
index dc199893c0d4..000000000000
--- a/metadata/md5-cache/dev-python/pikepdf-5.1.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[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(-)?] 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/pillow-10[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-20[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=app-text/qpdf-10.6.2:0= <dev-python/pillow-10[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-20[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(-)?] 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/pikepdf/pikepdf/archive/v5.1.3.tar.gz -> pikepdf-5.1.3.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=16c09d18acf766bd751008fe6dd05c38
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.1.4 b/metadata/md5-cache/dev-python/pikepdf-5.1.4
deleted file mode 100644
index 051b9807eb86..000000000000
--- a/metadata/md5-cache/dev-python/pikepdf-5.1.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[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(-)?] 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/pillow-9[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/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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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
-EAPI=8
-HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=app-text/qpdf-10.6.2:0= >=dev-python/pillow-9[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/pybind11-2.9.1[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/pikepdf/pikepdf/archive/v5.1.4.tar.gz -> pikepdf-5.1.4.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=ac9a00453a4931d56cf5e44a20f032a5
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.1.5 b/metadata/md5-cache/dev-python/pikepdf-5.1.5
deleted file mode 100644
index 8caf615e0037..000000000000
--- a/metadata/md5-cache/dev-python/pikepdf-5.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-6.4[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(-)?] 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/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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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
-EAPI=8
-HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=app-text/qpdf-10.6.2:0= >=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(-)?] 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/pikepdf/pikepdf/archive/v5.1.5.tar.gz -> pikepdf-5.1.5.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=40931b8af96b457daac20da6ef12875f
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.3.0 b/metadata/md5-cache/dev-python/pikepdf-5.3.0
deleted file mode 100644
index 01bfb56f0edd..000000000000
--- a/metadata/md5-cache/dev-python/pikepdf-5.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-6.4[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(-)?] 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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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
-EAPI=8
-HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=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(-)?] 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/pikepdf/pikepdf/archive/v5.3.0.tar.gz -> pikepdf-5.3.0.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=8aedd7e114fefad8db8c4bc9057f5914
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.6-r1 b/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
deleted file mode 100644
index e57e753e02e0..000000000000
--- a/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-db/postgresql-8.1[server] ) 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-db/postgresql-8.1:*
-DESCRIPTION=PostgreSQL database adapter for Python
-EAPI=7
-HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
-INHERIT=distutils-r1 flag-o-matic
-IUSE=debug test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=LGPL-3+
-RDEPEND=>=dev-db/postgresql-8.1:* 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=2
-SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.6.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=84e5642b68c1691d44775b36789fe678
diff --git a/metadata/md5-cache/dev-python/psycopg-3.0.14 b/metadata/md5-cache/dev-python/psycopg-3.0.14
deleted file mode 100644
index 476d98fd3af0..000000000000
--- a/metadata/md5-cache/dev-python/psycopg-3.0.14
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-db/postgresql-8.1[server] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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=>=dev-db/postgresql-8.1:*
-DESCRIPTION=PostgreSQL database adapter for Python
-EAPI=8
-HOMEPAGE=https://www.psycopg.org/psycopg3/ https://github.com/psycopg/psycopg/ https://pypi.org/project/psycopg/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=LGPL-3+
-RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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/psycopg/psycopg/archive/3.0.14.tar.gz -> psycopg-3.0.14.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1b9ffbda061d85e19c124ea5721c7953
diff --git a/metadata/md5-cache/dev-python/psycopg-3.0.15 b/metadata/md5-cache/dev-python/psycopg-3.0.15
index 4be7a0ecb2e2..1fc217519f33 100644
--- a/metadata/md5-cache/dev-python/psycopg-3.0.15
+++ b/metadata/md5-cache/dev-python/psycopg-3.0.15
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.psycopg.org/psycopg3/ https://github.com/psycopg/psycopg/ https://pypi.org/project/psycopg/
 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_beta3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psycopg/psycopg/archive/3.0.15.tar.gz -> psycopg-3.0.15.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6317416130994751622698c9706e2913
+_md5_=0b695b89ce12fdcd09be70173a12f884
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.5.3 b/metadata/md5-cache/dev-python/pyspnego-0.5.3
new file mode 100644
index 000000000000..afb2b69019b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyspnego-0.5.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/krb5-0.3.0[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/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cryptography[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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 postinst prepare test
+DESCRIPTION=Library to handle SPNEGO and CredSSP authentication
+EAPI=8
+HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cryptography[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/p/pyspnego/pyspnego-0.5.3.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4c3e004248a708d60703497b73953ca7
diff --git a/metadata/md5-cache/dev-python/pytest-sugar-0.9.5 b/metadata/md5-cache/dev-python/pytest-sugar-0.9.5
new file mode 100644
index 000000000000..03e9ba19d04c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-sugar-0.9.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=py.test plugin that changes the default look and feel of py.test
+EAPI=8
+HOMEPAGE=https://github.com/Teemu/pytest-sugar/ https://pypi.org/project/pytest-sugar/
+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=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/termcolor[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_beta3: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/pytest-sugar/pytest-sugar-0.9.5.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a65b2ad1c5bb80cdd74d59b40906b50f
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.5 b/metadata/md5-cache/dev-python/pyu2f-0.1.5
deleted file mode 100644
index 3dfc27ebd599..000000000000
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[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(-)?] ) test? ( 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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python based U2F host library
-EAPI=7
-HOMEPAGE=https://github.com/google/pyu2f
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=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/google/pyu2f/archive/0.1.5.tar.gz -> pyu2f-0.1.5.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=259ebdddfb686da3dbb6daee088f39f0
diff --git a/metadata/md5-cache/dev-python/pyzmq-23.2.0 b/metadata/md5-cache/dev-python/pyzmq-23.2.0
index 8b9999bb2722..94a8ee22be34 100644
--- a/metadata/md5-cache/dev-python/pyzmq-23.2.0
+++ b/metadata/md5-cache/dev-python/pyzmq-23.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://zeromq.org/languages/python/ https://pypi.org/project/pyzmq/ https://github.com/zeromq/pyzmq/
 INHERIT=flag-o-matic distutils-r1 toolchain-funcs
 IUSE=+draft test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/pyzmq/archive/v23.2.0.tar.gz -> pyzmq-23.2.0.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b6a1fc13f02d59e6318c181ae4ed645d
+_md5_=7b767220645198dcfdc04703ba771523
diff --git a/metadata/md5-cache/dev-python/shapely-1.7.1-r1 b/metadata/md5-cache/dev-python/shapely-1.7.1-r1
deleted file mode 100644
index 12c9ffb929fe..000000000000
--- a/metadata/md5-cache/dev-python/shapely-1.7.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sci-libs/geos-3.9 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=sci-libs/geos-3.9 dev-python/numpy[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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/matplotlib[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/matplotlib[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/matplotlib[python_targets_python3_8(-)] ) ) ) 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=>=sci-libs/geos-3.9
-DESCRIPTION=Geometric objects, predicates, and operations
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=sci-libs/geos-3.9 dev-python/numpy[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/Toblerity/Shapely/archive/1.7.1.tar.gz -> shapely-1.7.1.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=869bc3a3017a044cf1744c401e1d9eb8
diff --git a/metadata/md5-cache/dev-python/thrift-0.14.1 b/metadata/md5-cache/dev-python/thrift-0.14.1
deleted file mode 100644
index b337c1d9a74e..000000000000
--- a/metadata/md5-cache/dev-python/thrift-0.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python implementation of Thrift
-EAPI=6
-HOMEPAGE=https://pypi.org/project/thrift/ https://thrift.apache.org/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://downloads.apache.org/thrift/0.14.1//thrift-0.14.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=32e6982b8e5b7e50ccc29ca173911bfc
diff --git a/metadata/md5-cache/dev-python/thrift-0.16.0 b/metadata/md5-cache/dev-python/thrift-0.16.0
index 4876c7e5ca57..e6ae1dc23ee5 100644
--- a/metadata/md5-cache/dev-python/thrift-0.16.0
+++ b/metadata/md5-cache/dev-python/thrift-0.16.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/thrift/ https://thrift.apache.org/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.apache.org/thrift/0.16.0/thrift-0.16.0.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=e1b6a3a969a2df8c193d623728785230
+_md5_=5575de84637bfb56c9c157f2b6aca7f9
diff --git a/metadata/md5-cache/dev-python/xdoctest-1.0.1 b/metadata/md5-cache/dev-python/xdoctest-1.0.1
new file mode 100644
index 000000000000..50da57dc5ea8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xdoctest-1.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/nbformat-5.1.2-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( 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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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 rewrite of Python's builtin doctest module but without all the weirdness
+EAPI=8
+HOMEPAGE=https://github.com/Erotemic/xdoctest/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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/Erotemic/xdoctest/archive/v1.0.1.tar.gz -> xdoctest-1.0.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=82854285613bf4f7a9f0d39aeef1cff9
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index bb721613b81b..c21bafaa9c41 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.11.0 b/metadata/md5-cache/dev-ruby/i18n-1.11.0
new file mode 100644
index 000000000000..f38e1c685fbb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-1.11.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby26(-)] dev-ruby/test_declarative[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby27(-)] dev-ruby/test_declarative[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby30(-)] dev-ruby/test_declarative[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby31(-)] dev-ruby/test_declarative[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Add Internationalization support to your Ruby application
+EAPI=8
+HOMEPAGE=http://rails-i18n.org/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.11.0.tar.gz -> i18n-1.11.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5d47a3fbcdb9616bce5bdb77a57bb35f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d6f56ca88341..5fb908a0ba14 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/cucumber-ci-environment-9.0.4 b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.0.4
new file mode 100644
index 000000000000..d08a62c740d8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.0.4
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Detect CI Environment from environment variables
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=9
+SRC_URI=https://rubygems.org/gems/cucumber-ci-environment-9.0.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=dca3f8f04d010c312e65658864d18810
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0
new file mode 100644
index 000000000000..68e62229d0f8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=15
+SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-15.2.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=918e1f5134d3ad333ab1529f35b2407e
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.130.0 b/metadata/md5-cache/dev-util/stripe-mock-0.130.0
deleted file mode 100644
index 198af537bb95..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.130.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-mock
-INHERIT=go-module
-KEYWORDS=amd64 x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.130.0.tar.gz -> stripe-mock-0.130.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=f609c08b8e3773fe14a0c275f6df251f
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.135.0 b/metadata/md5-cache/dev-util/stripe-mock-0.135.0
deleted file mode 100644
index e86af2842a35..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.135.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-mock/
-INHERIT=go-module
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.135.0.tar.gz -> stripe-mock-0.135.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=bfd74c5baa1a340eaeda61711326dd26
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 3520ff342f0e..9e6bd2daf16a 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/trine2-2.01.425-r2 b/metadata/md5-cache/games-action/trine2-2.01.425-r2
index 66888ed92203..98961a150843 100644
--- a/metadata/md5-cache/games-action/trine2-2.01.425-r2
+++ b/metadata/md5-cache/games-action/trine2-2.01.425-r2
@@ -8,9 +8,9 @@ INHERIT=desktop wrapper xdg
 IUSE=+launcher
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/freetype:2[abi_x86_32] media-libs/libogg[abi_x86_32] >=media-libs/libvorbis-1.3[abi_x86_32] >=media-libs/openal-1.15[abi_x86_32] >=sys-devel/gcc-4.6[cxx] >=sys-libs/glibc-2.15 sys-libs/zlib[abi_x86_32] virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] launcher? ( dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] media-libs/libpng-compat:1.2[abi_x86_32] sys-apps/dbus[abi_x86_32] sys-apps/util-linux[abi_x86_32] x11-libs/gdk-pixbuf:2[abi_x86_32] x11-libs/gtk+:2[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/pango[abi_x86_32,X] )
+RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/freetype:2[abi_x86_32] media-libs/libogg[abi_x86_32] >=media-libs/libvorbis-1.3[abi_x86_32] >=media-libs/openal-1.15[abi_x86_32] >=sys-devel/gcc-4.6[cxx] >=sys-libs/glibc-2.15[stack-realign(-)] sys-libs/zlib[abi_x86_32] virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] launcher? ( dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] media-libs/libpng-compat:1.2[abi_x86_32] sys-apps/dbus[abi_x86_32] sys-apps/util-linux[abi_x86_32] x11-libs/gdk-pixbuf:2[abi_x86_32] x11-libs/gtk+:2[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/pango[abi_x86_32,X] )
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=trine2_complete_story_v2_01_build_425_humble_linux_full.zip
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a2ca44835a8915d33dc6fd54ca5ab8e9
+_md5_=9bdd714db503932a4c707404b9707a27
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d214c4ba1e9d..cfee242d51b9 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/rosegarden-22.06 b/metadata/md5-cache/media-sound/rosegarden-22.06
index 694dc8fe9aec..885fcff7a0c0 100644
--- a/metadata/md5-cache/media-sound/rosegarden-22.06
+++ b/metadata/md5-cache/media-sound/rosegarden-22.06
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.rosegardenmusic.com/
 INHERIT=cmake xdg virtualx
 IUSE=lirc test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-22.06.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=224349ac138be570c111de4423d0e170
+_md5_=894b7d795979a6609c639cf5794ac8fd
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3fd2c5245d06..5b3961306c9e 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/cawbird-1.5-r2 b/metadata/md5-cache/net-im/cawbird-1.5-r2
index bf6910ed0b2b..4beb83a9c568 100644
--- a/metadata/md5-cache/net-im/cawbird-1.5-r2
+++ b/metadata/md5-cache/net-im/cawbird-1.5-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ibboard.co.uk/cawbird/ https://github.com/IBBoard/cawbird
 INHERIT=gnome2-utils meson vala xdg
 IUSE=gstreamer spell
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=CC-BY-3.0 GPL-3+
 RDEPEND=dev-db/sqlite:3 dev-libs/atk dev-libs/glib:2 dev-libs/json-glib net-libs/liboauth net-libs/libsoup:2.4 net-libs/rest:0.7 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango gstreamer? ( media-plugins/gst-plugins-gtk media-plugins/gst-plugins-hls media-plugins/gst-plugins-meta[ffmpeg,http,X] ) spell? ( app-text/gspell:=[vala] )
 SLOT=0
 SRC_URI=https://github.com/IBBoard/cawbird/archive/v1.5.tar.gz -> cawbird-1.5.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=91e384b0d6a29b2b9a055b7a783cf478
+_md5_=42f884a463a0bea17c42c463c28b17dc
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index ebd6718a3efe..d29a35924a89 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-4.1.1 b/metadata/md5-cache/sci-astronomy/pyephem-4.1.1
index c6f9ba02a5ac..3cc70f854513 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-4.1.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-4.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://rhodesmill.org/pyephem/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandon-rhodes/pyephem/archive/refs/tags/4.1.1.tar.gz -> pyephem-4.1.1.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=cf8a6190b38c350c477bb012245a78e6
+_md5_=71d8dccc5107ffea30d46bf225b2924b
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 0b96007aab73..6eaa4f64d7d3 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/hpssacli-5.30.6.0 b/metadata/md5-cache/sys-block/hpssacli-5.30.6.0
index 77e509d2e304..9abf77c7a1c2 100644
--- a/metadata/md5-cache/sys-block/hpssacli-5.30.6.0
+++ b/metadata/md5-cache/sys-block/hpssacli-5.30.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HP
 EAPI=8
 HOMEPAGE=https://support.hpe.com/connect/s/softwaredetails?softwareId=MTX_1b5853f050a24da4be479f680e
 INHERIT=rpm
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=hp-proliant-essentials
 RDEPEND=sys-libs/glibc
 SLOT=0
 SRC_URI=https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v205349/ssacli-5.30-6.0.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
-_md5_=291d967a08f6ffe6666e32757159800f
+_md5_=acf50769845db22a06ae841be6b5f5e4
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index acfe886b8847..a5cdc3603cab 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.54-r4 b/metadata/md5-cache/www-servers/apache-2.4.54-r4
new file mode 100644
index 000000000000..114f9e04d209
--- /dev/null
+++ b/metadata/md5-cache/www-servers/apache-2.4.54-r4
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
+DESCRIPTION=The Apache Web Server
+EAPI=7
+HOMEPAGE=https://httpd.apache.org/
+INHERIT=apache-2 systemd tmpfiles toolchain-funcs
+IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+LICENSE=Apache-2.0 Apache-1.1
+PDEPEND=~app-admin/apache-tools-2.4.54
+RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
+REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
+SLOT=2
+SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
+_eclasses_=apache-2	d3ca80efce0c66610ad3fbeca0a20b3f	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=91b12451e644d1f65350ea0cd87768ca
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index c33319c9394e..d0a3cf745ea7 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index a31f76a55a1a..eedfe7bfd9a7 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -5,7 +5,7 @@ DESCRIPTION=Fast, feature-rich, GPU-based terminal
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
 INHERIT=optfeature multiprocessing python-single-r1 toolchain-funcs xdg git-r3
-IUSE=+X debug test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=+X test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-9999 ~x11-terms/kitty-terminfo-9999 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_
 RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=10e9bd71220fd5e21058e12202bb3868
+_md5_=77d76b06f71d8da7922f9a34078beb83
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index d5fdd565da24..f4e736dc606c 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/garcon-4.17.1 b/metadata/md5-cache/xfce-base/garcon-4.17.1
new file mode 100644
index 000000000000..16569a8c50fe
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-4.17.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( dev-libs/gobject-introspection )
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/garcon/start
+INHERIT=xdg-utils
+IUSE=introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.17/garcon-4.17.1.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=94abe956d4589459f541810d818558c9
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 80239df28fd6..e6541ef51ce9 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-11T05:39:47Z
+TIMESTAMP 2022-07-11T11:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLLt6NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLMDAJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlCg//fQ557eL4/kqzgOnnG/f9T+/Hj5Uuq/30B3W9VAuUI579QKsLHgNI29y2
-JVUSUg2XHN9xMQJscwosmOMg8czudr6rbLh10T8j0i7SqHfhBsSiAT3l5aRTk48u
-xf9x83oIaNagR/HavctrHVy/lA/kPLGVUfd8P5s7iBRcE3IiXzQmLA2YRVsdrN/p
-TzVT7RaMx5OAXVXbBlUGbyLRvlIEX4DxDxA1MwTH4cwSQ/uA0uKU5ATXFl3W46yJ
-hBpFZV+zOaP1yb80Pjwmpwe1dp2vREk/Q01PgIZ/1ivsCVAjzY2Yjmj+PS3tDhOw
-YuICp6x57+mZrQvlfscNLDw0noXYrgij7wiN594BoYNjX+4Jx7qLNnwvXUA3sG6g
-jAi8wN2kkywXIEFHsM+LtPJ72poePpaeiM49CPAPaa4TSSfwMDW+4SVIhKNlU+HF
-UAhJB7gnHXe3DVR07hzntqi0wAJaH8hoHZWjUrcYIl7IGqMJGxjllnNPKEfqewlr
-5wCSrS+mJNi84PFj8VDlDF/zbtrZ5iuTUgRar6WhWjs0b7Oc9h4KlmXyoRvFw5xH
-6ygjP71kPj2MOsNlt8YqyPwgiQMl7JKXBj4FSope/UrTv10ASnqnY0SePe5LguoM
-ZE/jaD09n89D3FbxRCl7W6wZu9X2O+sF1hLEgssExLkjHFNcK6w=
-=9RxB
+klAdiA//V4D7iVJD55Kcx/Oy1Q24QPK+IeuTSg8PcOibhqV18eEdd9JWf597CuIE
+uZoyw/h14tDJ+llgO+WdqNy6NqSnxR0k6/JEHC14yK0GFiceSo6mHmqddwXTiD73
+p/Je+7WXrCKwSf+q2RVmatZWTaDMoyEYa+z4ANlDjeqB22mjx/m0vC3Q+qYIIy+a
+tEyZX99aVyjsFgEGdgRaTNn643+smjH8py+EftvfITMgrGFwvsFtfmnhuOJh9kEV
+lZvmRS+a5jAiuYM4VgrWJPv+9Vop/2FpDyvj3OuyOaHiDMQHmO5KknhTGOyz3fuz
+TdJWgd3zRyOdbA5Gc1FphMZZcS+pHxudvcnx/mvFWaWwMQ2Au1OK9BbiP+jioxDr
++BXBDzhBvNa9W1iPaC83fRduC6tD5ooA+9SUidnNKKV2pSF1LE9E6FHCYFW4LLIS
+s8pxk6SOSV6/5w7igeiEzArPk8xT51rUW2ySqLYdal5GiYi9lMqqiU5h9qn9N6jx
+dESYViB7FHay+EhVNEsuTPnSR/TGKBf2e9Z8JfYDQqMj/yApx67DbPw6VZjt1iO6
+wFPRSgLfGBsvjZTQjarf25hRl9t6s+mUazloJ24AQkdqcIxMxDngqQXivHA46S+0
+UPNjK5f/IMobuQKNyI4pPfcC8auyII+jLTU6fV8ZutQL2FbfjfM=
+=vf5g
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7897ba37d138..505c140cf07b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Jul 2022 05:39:44 +0000
+Mon, 11 Jul 2022 11:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4611bbe0a529..b35c5c731c3b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jul 11 05:39:43 AM UTC 2022
+Mon Jul 11 11:39:42 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4429471be95c..74cbbd60328b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Jul 2022 05:45:01 +0000
+Mon, 11 Jul 2022 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c6caf3c59b66..cdcd5108235a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-15148d323f83a623e0192d7fcb23bf761b09fba1 1657515924 2022-07-11T05:05:24+00:00
+c7277d3fc1c2e283d3feb27cc42299dd2ba225cf 1657539283 2022-07-11T11:34:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ec5b91a2a5f7..09fadffcb151 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657518001 Mon 11 Jul 2022 05:40:01 AM UTC
+1657539601 Mon 11 Jul 2022 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7897ba37d138..505c140cf07b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Jul 2022 05:39:44 +0000
+Mon, 11 Jul 2022 11:39:42 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ccfb46b70a50..17085427a0dc 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest
index be4a30564295..8e1e3e820984 100644
--- a/net-im/cawbird/Manifest
+++ b/net-im/cawbird/Manifest
@@ -1,3 +1,3 @@
 DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1
-EBUILD cawbird-1.5-r2.ebuild 1424 BLAKE2B b533022b087c66ecde5c95e6eec51254ca1eb2a8bb485d200c0945e7ade9b402ffd73ce49ca31241e1a1dc73390f124108a6477a06c31293593514f5350dbaa4 SHA512 f6c85400e496d88a1e8d0aa1b5072912fcbc2fd52a5f7df7ab5c672a04e6f34f21964bf3e7c1b000c41f15b19d4694ad0fe2d7b3e0d800cdfe065992d56349aa
+EBUILD cawbird-1.5-r2.ebuild 1423 BLAKE2B 5cc7a0b3cf04f9e58bcfb56b69c47ac0770e9188875bb8ebfd363aae67b3b6f80c9c2cd65f63c68b4c54586955207255c147f5fcb7454e6646cbda16a9c7af83 SHA512 4d7da3f9e491c462f6a729925c681f809a106e6f88a790852cf3cae222938923681b482f2607e298b502f4af44668739c4e105c6f614581473eb57028b380c63
 MISC metadata.xml 324 BLAKE2B f548750610b0b02bf35efb78ee01ef1d2d7a68d65d9d1e88b29639ad576b139fecd3d8b40a2c9ff88f4613a1b6e8fea28efccfcdbc6e83d32855c4414ede7728 SHA512 4aed49f42c279faf8c819e1a1cb1bf0aad5ccd46de295fff062734e68f98aee1cdc96f383a3c45a452fb7cf9e344ddde1f33e3b9287535fec1edfb4f710d6a8a
diff --git a/net-im/cawbird/cawbird-1.5-r2.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild
index aee227728983..831986e3389c 100644
--- a/net-im/cawbird/cawbird-1.5-r2.ebuild
+++ b/net-im/cawbird/cawbird-1.5-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="CC-BY-3.0 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gstreamer spell"
 
 RDEPEND="
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 525f090bf616..76d70d85312b 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index c1a466a6d937..c9306878ec42 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -2,6 +2,6 @@ DIST pyephem-3.7.7.1.tar.gz 1622306 BLAKE2B aefdd7b7e4471140f1c2b5c065f663dfb109
 DIST pyephem-4.1.1.gh.tar.gz 2659977 BLAKE2B e373857d3fb66e742f9db992165dbd1d50afbb6b91588f2cfcd299409d491ef1174c54a182dd59b5a8e298a07312899c8f8b5a8aaa63e6b31deb5f8b1cd3131e SHA512 2539f36b7110cacd6cf95e9ba0be26ca837a66ba81f092d4be01405029adf22478184861f46ecf09d6cd35927140874e0f0d228b06537d05f3e2eddbcb35da85
 DIST pyephem-4.1.3.gh.tar.gz 2660800 BLAKE2B 272a96dfe5debe083274f911737246ea90dc15b12b141e41c018d0b4eff13e548fe1d99cfb75ea7d06d7784cd9cbce7f43149a08de051cd9e12a4b5d6a306607 SHA512 1d113e1adbe5c8175364a29ae405d80005e54a4f60d475534d6721dc51b4f58d314ad161ddaf791614fcd4b0550e4b2142f4e52ec4771ca0d1be6b10f3f8cc4d
 EBUILD pyephem-3.7.7.1.ebuild 1067 BLAKE2B 45c390e9a9e361bc8c817b83c07b240c1706a182e47f3455f75cf0e6559207c6d177cd170f902c08c287df40308df7fe73ca666b5c802a192549673b46f164c2 SHA512 d4555ab691276a8e5557f34ad36f0fdc541b4029e89a1be166730dc7987fe1cf3644fea30d182d19067b2d19bff56032457d16981921307bd4583d4f2443f324
-EBUILD pyephem-4.1.1.ebuild 1217 BLAKE2B 5cfd5c9545b4fbf16b5e432cb79ebbf0007be8d931ea9c668b7e731ede84dd542ae726d5050d756a0c29de37700e6af39df6dca2b6a707745d0f023f952ff225 SHA512 51d1dce42ae410d84603a1216a162e62af1fd7c8a8e392746f691f0eb069c45c2e7db241c76580c76aa72c036b4bb5014fd9786e010b2a32ff09a56e0851468d
+EBUILD pyephem-4.1.1.ebuild 1215 BLAKE2B 969f13d53df7534d38ccc6d4f665c8fcfc42ef438886618f93bce50f9dfefc3631d32c2c8c2eea121a7efe02d60627438f287a7781cff7431ac8989dc11168da SHA512 d67c63022b7839cfdd3f5ecd45b483837ac4fefcce2def5c53341c3744ab2451b744ed587c195eb14374c335eb1c03e3303a71d473b92f8f741c7bdc0d4861c7
 EBUILD pyephem-4.1.3.ebuild 1217 BLAKE2B 5cfd5c9545b4fbf16b5e432cb79ebbf0007be8d931ea9c668b7e731ede84dd542ae726d5050d756a0c29de37700e6af39df6dca2b6a707745d0f023f952ff225 SHA512 51d1dce42ae410d84603a1216a162e62af1fd7c8a8e392746f691f0eb069c45c2e7db241c76580c76aa72c036b4bb5014fd9786e010b2a32ff09a56e0851468d
 MISC metadata.xml 948 BLAKE2B f59f025e5ef3d44d0d7b53a82cbbe217b16a1fcf8ffad27e8c00a7faf705aa9d61434b0bc732bdb8b13917ea68532584809aac031f6884252c456fe025d3b07e SHA512 7f0a1edc80a06ac1ef41a18adfa0237700b4b2aef1d8ca48c51242ff8b2ef0d4bc983b7a2419d5f6033fdbaf5a7d8e3a53b57e40b315b8e1a5717572c2811c24
diff --git a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
index 423ccb34c62e..4d4caf4a9ef0 100644
--- a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index a5f38024bcc6..b387c887fd0b 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest
index 325da97b48ad..420317793813 100644
--- a/sys-block/hpssacli/Manifest
+++ b/sys-block/hpssacli/Manifest
@@ -7,5 +7,5 @@ DIST ssacli-5.30-6.0.x86_64.rpm 16639836 BLAKE2B 6df471b0db7ad948adf7d135b724800
 EBUILD hpssacli-2.40.13.0-r1.ebuild 1813 BLAKE2B 38a6dfaaaf13ad267ee68dbf98e0070f0083dbbd3b7a69b86f68ca7c72409dee5088d913129dae0ada17b3018fa989384553055f491b8684d4a64bbfe965a131 SHA512 ec7c7e0c0118332eff213066a74699d91803317b3a06a1f4d28eebd50d0103dc2baa786747cf9feb901c94ee3e387afcb1680c088be53ef12040467ecadeac5f
 EBUILD hpssacli-3.40.3.0.ebuild 1824 BLAKE2B 97784741cdcee9cd8228a6f87fce6c25058f727feea5067413482fabf520e116b22cfbe953d7b63185c9247e4fdf6a5bbce7336994f94bc00617e6d22242e7c3 SHA512 0748ef6142865d403851e82852ddbe041386d9900fb7ec73924b66b7a520705bec7a48a0abc510ddaf08b4b34d4f0113e9e0848e93c7bd974a53bf60c7062b0c
 EBUILD hpssacli-4.21.7.0.ebuild 845 BLAKE2B 5b6daabba59f0bcd28bf752d1fb43c6a2a94c7077debb4c57debf4d28635945052949f59039bbc92b34e145d0f8bd53c2a24c5cff7c104259118240c2de454db SHA512 48722a44c23204b6b4a6a05fa63a2cbc3d35fccd4de263d2d2e89fafd85efbe36e693659dcf0990bf5c05fcc1e11a663f2ef1fcb4bd867bb83ea2281aba329d7
-EBUILD hpssacli-5.30.6.0.ebuild 954 BLAKE2B d471d7a44743fca0ee1d9acde14889b58e6d75fefb6f65e8ff5877fec489d72de18f401c097234635b5137ceeaed1a3a77df799d8bac1a668d89607c043255f5 SHA512 82e8e9bf19e0e29c1e40a94d6e15cd6679bfc14f70d4d6847f3de194456669b4031bab6fe5eeb43bb17ea716d8bb1e52cdd8f80adc2f61f110db22a26054fa03
+EBUILD hpssacli-5.30.6.0.ebuild 953 BLAKE2B 0b58af75ee392a0ed4f8ec4e342f4eadba35b73fa0f029ea3b5504946ad7537b8c69ad3b5c7e4c11259879e08450c45b856adbca1cd68f544f2e79dfe46d1efe SHA512 1c2c4bff91e3e84eb57cc96f827fa1461799968afef8b6bc0565f68bee25ef746e2502bf46273d3b88a0edd0fa67ba8769c84f88b810c5e8222ec07116b5c185
 MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild b/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
index 0bedb3614f76..faecf2d242c6 100644
--- a/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
+++ b/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p173609780
 
 LICENSE="hp-proliant-essentials"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 S="${WORKDIR}"
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 3aa669f12a55..1594ee88c3e0 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 339cf677e6d5..46e56e709ffd 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,9 +1,10 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
 AUX apache-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd
-AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
+AUX apache.conf 94 BLAKE2B b0330849adfc5fc048622b3a256ecb727f3bfa339e6cc7f50843597d3e8d7b6d4463986d8f9a73f3580c93ce571d01f9ba571e0328356b62e5680ede913acc4b SHA512 e954c66da825fd6f84753cd7a50ae2da86daf5da27b37dba484019e8e1adaeb57122ba9a8fd1222e80edac04ca78d807265ef8b275278e4eeef12feb6043597b
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 EBUILD apache-2.4.54-r2.ebuild 7923 BLAKE2B 41b3e091d8b06f114aa9ccae5861b56a8d4b99f1a7077d8701fa9a31ccd76e266ab71aa7346789f78106590ab66e4ef92bd12c7b205da1e0216d38e14629d704 SHA512 e442300b4f4aa87045abecc13d4bbca90df27c75591e5d43a30df4135cdc2da2f4f756f6301f8d90a6556c5034e39c0cc1cefda7d4767029f9384b2c3ad9a02a
 EBUILD apache-2.4.54-r3.ebuild 8000 BLAKE2B 6c314bfffd06f463fb7920a7db83268a8709eb87bfe5fe11682d24de3ea7973538dd5b44e840a2cedd28971dc0abe57d03706dbb4b2d928d6ea25bc2d4d3d535 SHA512 9d1505706847510270b4a63b10b5ac90b8c61c626a7566a5d13f2bde18224c7784fe817cd0d2c90769c162011aaa91d40713a382b89b3a21384fd30df6504f99
+EBUILD apache-2.4.54-r4.ebuild 8000 BLAKE2B 6c314bfffd06f463fb7920a7db83268a8709eb87bfe5fe11682d24de3ea7973538dd5b44e840a2cedd28971dc0abe57d03706dbb4b2d928d6ea25bc2d4d3d535 SHA512 9d1505706847510270b4a63b10b5ac90b8c61c626a7566a5d13f2bde18224c7784fe817cd0d2c90769c162011aaa91d40713a382b89b3a21384fd30df6504f99
 MISC metadata.xml 901 BLAKE2B 126de8b6d9c924dc1bfedecc23b0ea5b5b3881b13cda7dd35d1ba04c30dabef619b2a57ac83e65695ce5e6e51b0f17c69cf752d6505c0d146dca8e2b7d90cbc6 SHA512 453b98f9ee9af6ebfc11d55e2218d1877a5a3f45fd969f6b3708f97216776c41deb651116826b15d744ea54fdd283497bc4f14917a9b00ae8b6e7af126441263
diff --git a/www-servers/apache/apache-2.4.54-r4.ebuild b/www-servers/apache/apache-2.4.54-r4.ebuild
new file mode 100644
index 000000000000..a2b75c48a3c1
--- /dev/null
+++ b/www-servers/apache/apache-2.4.54-r4.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20210212"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
+authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
+dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
+ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
+lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
+proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
+session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
+socache_shmcb speling status substitute systemd unique_id userdir usertrack
+unixd version vhost_alias watchdog xml2enc"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	auth_form:session
+	brotli:filter
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	cache_disk:cache
+	ext_filter:filter
+	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
+	log_forensic:log_config
+	logio:log_config
+	cache_disk:cache
+	cache_socache:cache
+	md:watchdog
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_balancer:slotmem_shm
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_hcheck:proxy
+	proxy_hcheck:watchdog
+	proxy_html:proxy
+	proxy_html:xml2enc
+	proxy_http:proxy
+	proxy_http2:proxy
+	proxy_scgi:proxy
+	proxy_uwsgi:proxy
+	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
+	session_cookie:session
+	session_dbd:dbd
+	session_dbd:session
+	socache_memcache:cache
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	cache_disk:CACHE
+	cache_socache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	file_cache:CACHE
+	http2:HTTP2
+	info:INFO
+	ldap:LDAP
+	lua:LUA
+	md:SSL
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_html:PROXY
+	proxy_http:PROXY
+	proxy_hcheck:PROXY
+	proxy_fcgi:PROXY
+	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
+	socache_shmcb:SSL
+	socache_memcache:CACHE
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	systemd:SYSTEMD
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authn_core
+	authz_core
+	authz_host
+	dir
+	mime
+	unixd
+"
+inherit apache-2 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="https://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
+)
+
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler ; then
+		# This header is the same across targets, so use the build compiler.
+		pushd server >/dev/null
+		emake gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+		popd >/dev/null
+	fi
+
+	default
+}
+
+src_install() {
+	apache-2_src_install
+	local i
+	local apache_tools_prune_list=(
+		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
+		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
+		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
+		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
+	)
+	for i in ${apache_tools_prune_list[@]} ; do
+		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
+	done
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	dobin support/apxs
+	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
+
+	# Note: wait for mod_systemd to be included in some forthcoming release,
+	# Then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
+	dotmpfiles "${FILESDIR}/apache.conf"
+	#insinto /etc/apache2/modules.d
+	#doins "${FILESDIR}/00_systemd.conf"
+
+	# Install http2 module config
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}"/41_mod_http2.conf
+
+	# Fix path to apache libdir
+	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
+}
+
+pkg_postinst() {
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+
+	tmpfiles_process apache.conf #662544
+
+	# warnings that default config might not work out of the box
+	local mod cmod
+	for mod in ${MODULE_CRITICAL} ; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in ${MODULE_CRITICAL} ; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [[ ! ${lbset} ]] ; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
+}
diff --git a/www-servers/apache/files/apache.conf b/www-servers/apache/files/apache.conf
index 56e23aefaf8e..74888d81a752 100644
--- a/www-servers/apache/files/apache.conf
+++ b/www-servers/apache/files/apache.conf
@@ -1,2 +1,3 @@
 d /run/apache2 710 root apache
 d /run/apache_ssl_mutex
+d /var/cache/apache2 750 apache apache
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 2531f6a29829..538e44049b20 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 6f04c990b8b6..89ba5b23a883 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -2,5 +2,5 @@ AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce476
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
 EBUILD kitty-0.25.2.ebuild 3519 BLAKE2B a2e4526d6449e83e68dd31370fc1b8df7037c7439dd9881f7214addfe7d5ea6e6ebedebded50fcb3b74176c6a469ee2c2be0bec6876e4c14e13fe7e50e48085c SHA512 aea90a245183698729866da0c687e943f636cee01cfc609bd6694e88cc912834e34a69cdca2305146774805bb0fd08307dc0807649bda7c544b85ef9d8475e6c
-EBUILD kitty-9999.ebuild 3521 BLAKE2B 46b78faae65e9a50fd9bcf5747922418da5c605e62e8c90cdac9b333b951314b79e68ea5817b4867e3ffb171061692afffb8fc680149066f4f2c801d0c6341f1 SHA512 7f6f3de88a3d5a87a07946c78bc0318a80c847fc8e3e28dffdff7d4d972662c0d8cd3d0eaedcd4714f1e2b121dd1ce7432250d16bc78b51d96eb19f76c02f5c5
+EBUILD kitty-9999.ebuild 3489 BLAKE2B dcae41cba89bee79302cf74f03d3b97fd4f495882c5b5653e42007871f173909bed260dcb527f126f8fe83a7e1d1d9613c6014b8804535dc76ccbc2a2e2f1fc0 SHA512 69ddf5b59bb1722605383b30b2d45242439c55b11ca4f5fec08d5baca5b6bb05b280fbfd2dbac321ba030d56286f4dcd7cd5506d0e17bd6f4ec89cc70a6b6824
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 531d4fb7df94..b915b34e33d7 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+X debug test transfer wayland"
+IUSE="+X test transfer wayland"
 REQUIRED_USE="
 	|| ( X wayland )
 	${PYTHON_REQUIRED_USE}"
@@ -64,15 +64,12 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )"
 [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23.1-flags.patch
-)
-
 src_prepare() {
 	default
 
 	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
 		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
+		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
 		-i setup.py || die
 
 	if use !transfer; then
@@ -102,7 +99,6 @@ src_compile() {
 		--shell-integration="enabled no-rc"
 		--update-check-interval=0
 		--verbose
-		$(usev debug --debug)
 	)
 
 	echo "${setup[*]}"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 769cd91d44f9..292022312257 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 0bdab0ecbd57..1ea3597cbda7 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,7 @@
 DIST garcon-0.8.0.tar.bz2 539061 BLAKE2B 8d7b207fdb325d060c3ecfa5e2574961082706c5a4af59cabebad9d3c915228085dc32442521018bfb7da2d3c169445ac270c00c381e666bfda8774329a60cfc SHA512 708c68c31c0d3d89ecdde4790594837af0d065ecb805131fd7db2eb4c433c0523f44d51f2040f7bf9af729537e5f9e89ed06a435fc0c4e6113db00ad78ba8ce0
 DIST garcon-4.17.0.tar.bz2 545911 BLAKE2B 0286233a5fc7769955eeb8901a64cd2087d47b28bbb05ae884c6d867e4374191d7dbb0bbc54decf7d4370ae31127d6d5acf63c77d1d18889efa5388bc5d4e5e3 SHA512 6fc88177b8f1b8630fe1f0954151ff60a9957bd7239452317e5e942e70576b996aa59f87e249feb4dfaa256972c3a028323a6fd02826d9b5e4a90df47c7f2361
+DIST garcon-4.17.1.tar.bz2 546754 BLAKE2B b84e502cda113719454353af80a6436f2a4ee1ca132a9d795f49fddeeb7d30abdac3468c6d40b0f23cb68e0584aa7f51c844ca5496a0bf4fa7c60b2d9bbdb3af SHA512 52bd03d7a4b5675b113b14f9acb56a2fb1d60c60a65b06b06376661228bea675e3c8be397b45d7d525fccd21c1bee9802378d11f51ed1f6229a4a5a73b607fe9
 EBUILD garcon-0.8.0.ebuild 1154 BLAKE2B ee97767e67f83e9f34b56ee6e7d0190a9dc3a25741f46c2c05089a00ee69d45960dca30a3aaf639c1c93b397b943d16d307c97a785f8720f2298fdebff885d6f SHA512 faafa8105c8e31b8c8e11689f87b894262c39b4c825c990b49ea0f136634bcb75b2954512d4cb92e463f3e9ec14617ce0f9bfb14642f6d28fba1edfc57978eb7
 EBUILD garcon-4.17.0.ebuild 1170 BLAKE2B ba41fde7cb08aa04c83012eb8d8f77faa79b6161ffe8f16a30a94c247fa1742b1cd842afd1814ba64b1b80948fd4a2bec40a22e61a3a3f9787d2bf5c461e949a SHA512 af38c17b57957ba8c18973805d3355ecb10ac6c3e3fae700d90723868608807a185843813fe04048b7a8049a09fcca418f7ce98946d0cf9c035f6d222a155231
+EBUILD garcon-4.17.1.ebuild 1170 BLAKE2B ba41fde7cb08aa04c83012eb8d8f77faa79b6161ffe8f16a30a94c247fa1742b1cd842afd1814ba64b1b80948fd4a2bec40a22e61a3a3f9787d2bf5c461e949a SHA512 af38c17b57957ba8c18973805d3355ecb10ac6c3e3fae700d90723868608807a185843813fe04048b7a8049a09fcca418f7ce98946d0cf9c035f6d222a155231
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/garcon/garcon-4.17.1.ebuild b/xfce-base/garcon/garcon-4.17.1.ebuild
new file mode 100644
index 000000000000..c96238763769
--- /dev/null
+++ b/xfce-base/garcon/garcon-4.17.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="https://docs.xfce.org/xfce/garcon/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	>=x11-libs/gtk+-3.20:3
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-11 13:30:03 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-11 13:30:03 +0100
commit	5305195b55d8632768f01d641fabf2af7b0df2aa (patch)
tree	6ebf505cc679c8af44183ec10eeec80cb58fab9c
parent	fbe1e64cf651fcf73e25d2d3115003bf59e231cd (diff)