gentoo auto-resync : 14:07:2022 - 13:40:00

221 files changed, 3701 insertions, 550 deletions

diff --git a/Manifest b/Manifest
index 68a23d5230ad..a4f5b681ad13 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29618 BLAKE2B a1dc776029368b0ba32e5bea34f815b0002c34269a2bbde48cea7b92e2d3bd9bc26775f17c4bf3fde2d8c273924e9813d80ac41d2c6fd02e36ada20a5a46546e SHA512 4f7127915a4b17ac39e6d3e907ef376a4a253256f9661c009517ef5f87589a729a18b2ecd2b5d0152fbfd6351bcbde1973b08e838fc2f192b074324f5fae27de
-TIMESTAMP 2022-07-14T05:39:54Z
+MANIFEST Manifest.files.gz 29617 BLAKE2B c91f705262d51426823716930e010c88beadd3d1bfdbcdd7170fe6c1c83a0e504c24d964fb4589ddc36fc0a599c90019346f1d525c18370d1d4444a656818392 SHA512 d53d474c66da5e47be515b51b125a27259e166a365b871b8973ee5595fce967f63a274806436e6eaf1a6596f42b0ce16fa0aa35f1a7b9a1d37851772c0177b97
+TIMESTAMP 2022-07-14T11:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLPrCpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQAIlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDbQA/+LwOOVdxRSFXMtu0kmqYuSUM29xGcMyC3JbncX/siF5GEwpXHxd9Q+eBr
-sO5IBVmUrY19YApYH6eZbvGcA3hJkFjW0bcx7FvMrXTSz+MoKHxUoOGoHHw3IPv4
-QD6wiaoK24+eJN2yrcGBdoY15/GFpktGbvhXNoBTkGMkF3Klf6ppmVivFT0ztfLs
-M8jPE/+wZm7mVebP3yW4nQTFlwYCF3qAle2xAJ2grJ6C7pBahNG09sxiv42qn9Xj
-WT6NZDz3j7rva+T0+fT9ViyaLuHgj0tcru8o6wK+zywp5k4KTBPtbERz6J4kLt0Y
-UF+hlVNNxvagnrvHINyQOzkrOr8Qvg8+tEk9y7qhV5RJuwD0Llgy0Hk3QPVShH6b
-S0TnQzxDMm74XWp0g8YLirV5jJzzbZnEkytpoQXDZUT7/cfarUbkzmDBRxgOsrJ2
-RvL1bE1LLO2INivOBKkys5ieFn63w4/IWwp9+wcb2KK+U6MyrlQMzzYwLKxNl38K
-Z/RP4d23+XDUQDgbj43Iz6HIAtrNCJtx+MzQ3iKgF539XxuJ3RUqRbjV0V5JAB+C
-FEyA1K3FWyUxqigrj6qRLOO4rzFX59B+62w3ImEUcNY3oPGpDKhBOohMGREE42rS
-nRBOLt1ZP7W7R+67Rrzm0VRWtVWyfJZUHNnA2UVuFmcmpAg0RgY=
-=ygzb
+klBg4w//dGvKjJIox64UYOdcml7wfOS2BHFiW222OGY2KRsPPTJ86ddSbt65tfYK
+UiKknq33zlDs6KAORrLP0BOZfGR61a4usv41hTDsFg7XXWBVXS73ErNI1gAFcfeg
+6Vfp9JP6Hxv95OSzhJovvLT9A1Qtmp2jVApO4/GygSqE1zNOpgwYgP9aOR8Dl31q
+paAbDve/lbAwvCrFLvSkiOLIjXX7GbVt0ltXf/evZ/x/xSpt016t0kJOz/0ULiV7
+HAHL+Fgmlnumb2lX6qzywXvzStbcoGEgdNZjMkpZjNNsPqn61UL3NJOwrTq7zjGA
+XYpU3MT+gYdYYvGpo4QpFBW3xhnn/QtQQ0oLy2GZAHRbPsMJcr28gBltDnQuFy6B
+0Sjfhglhyoam0bOtd/tNcy9bI/jADT7Za0ZGNJ6NAGupG00uI+GYDLgtn6sTvnUi
+nK7AujUndc6RvHtt6GW6+uh0QmWwXWmTp617SEDl8ke9Big/iV6jK5Elmw/MEPHI
+yP21dzYTuxMak5m564ovCYek+vxc7C+PWldPDoFtJiMUH4QxKldD09KnAnqzHAV2
+qpU20GleD+jw/1brajq6ZCiuIxjHkr9mfNiH0MKHy0iXAo5MJNFZiyOiAZ7xi4uJ
+zcWCmcvNAaPld6Bo6kr6eDSL8+l4QQVS298Cmb0xgvQVfirSy1o=
+=DwUC
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a473c6913ea6..57ed0683d73b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7fff58d2aef3..54923cc644c5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index dfc1a1960499..f411ca3699f0 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9
 DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
 DIST aws-cli-1.25.27.gh.tar.gz 2230639 BLAKE2B 80101fe2e2b58e7b626c546178ccab45108985d827db2b162d86e4271d5cb105dad2dfe36b807e88372af9cf14b706fda8928c0ccbbd97a49f2f1cf73bbff74f SHA512 2e88950c40dcf64b6911ca02ede7d9790a0ff3f3beb4c4fe3d4087b82100d49df00a90e254c9ff58e09132e4ab79ac3861480eeb1a3603c95aba0093fdb90554
 DIST aws-cli-1.25.28.gh.tar.gz 2231756 BLAKE2B b10d54b79bf16d88c4bd0256a970a640e9d64f903cdd250899f86a73cf6bb4de43d6ad83bddb24fa87684cb50b6c8f286553a609a0a04e8f18dd3428efa1f577 SHA512 a6a1f0ccefc4d9a6dde9efe8908f74b0ba72edcaec1955ebef7d0f7ce8cf4f3cc71fc298ce5120e02173553a22383bcc68fe965c77b77299fbc6e8353ec7cdb6
+DIST aws-cli-1.25.29.gh.tar.gz 2231889 BLAKE2B d487859c3b8ec6cc75f5c8ee54f9b0adf0bf0fdec8f36262533b98454c580692566f49daea867453a7f2b240228149e8d031d903b56809adf4d8f60525e25a08 SHA512 913273355f1907d08bac0b1c3f74aeb13966c1bc44c6499a1655c74048e6e711fe9442f5592344478ee4cf292b9fbe573a91c74c4fcf7481f24249e1001d9247
 EBUILD awscli-1.25.17-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.27.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.28.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.29.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.29.ebuild b/app-admin/awscli/awscli-1.25.29.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.29.ebuild
@@ -0,0 +1,72 @@
+# 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 bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 477fd745c8fd..2e94acb978e3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index f655ce45c43f..a92ca8ecf49b 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -1,6 +1,4 @@
 AUX par2cmdline-0.8.1-big-endian.patch 2911 BLAKE2B 749e0f955997d52da1b676d750057724e78302cdf70bff777b1bbf68945faedabbd050339950a96121a4aa197af0b0520a4e9665f3d3767fbacdf60a6baa2f55 SHA512 4186f8b3506dab8128abae28549fd2af4200aa656c65682fe68f02c04c1b0bc45144d24851ff54ef82ac4d40d7f1eb3ae9fae31d426a1092447cee339e3c0016
-DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
 DIST par2cmdline-0.8.1.tar.bz2 3213343 BLAKE2B 4778fd32012c61739e04a4e564eaedf48527c04b0d83c5467c34808913e81cd5459a6a5bfabe79ca74f520761ebd3592e80b714f3ef45cc98866da919757a176 SHA512 b33ee654bd14269afb02d48175abf183281270c3e0dad9ffcaa0aa69c4271715a85e550d6d56fe5460ebfe9a37dc53b7d2210cd79a6f55d3921dc5dd5972c846
-EBUILD par2cmdline-0.8.0.ebuild 768 BLAKE2B 884c01c68cf08b345dee94c4db74f15648f01d5b14c6e211937dc6d79b5c64ca28feda23179bf148c73fd65eed1a4ac3fa7215b155ccac202afe1db86ae6b1a9 SHA512 e98ad86ee881a190855fdaf263cda584e7de277960d31b3b7bf0d80c8944adf5ba6c6a7d916168e7a158c9daf344136d0ea34b0d2395c1932f8bfb07401bf918
-EBUILD par2cmdline-0.8.1.ebuild 817 BLAKE2B 58636a417626901a302f369338fe262a326e6b43bfd9f1255fea226b60bbaac5f504a53c302d4e18400b85bb0db4ee87f573ef9a9737e2746ec9716e50e12315 SHA512 d54e28b92f56002e8fcfb727a4299b4668b80cc1622469157340b6cb9b0283c55379190459af3e29093b160cc191500c2a4fc001025ca455aeebfb6fd0284bab
+EBUILD par2cmdline-0.8.1-r1.ebuild 730 BLAKE2B 5f65c18c03a8a1328b09a302dd176d9ca01b03e78d0b1722b03b8559aa78ba6559fab139afafdf2f6ea0a4daf496d9099a80a371a96e8488e123f620b41258bb SHA512 cefef3a28ee98a32c0370a5931d63bcf8cea3412ab612d5a4742e8679805c6fde9722e51040e46764ed5c2db61c0a4463123ee5e9a8dec9e5fd9c4c538dc6b03
 MISC metadata.xml 313 BLAKE2B 13e31cd90dad938be801aba6086fa8234878f9b691decd84e1fb56108a10e368c6442098b8574874f5c405f33d85c6236eb30e21e8f57e7e7c09deefe541a1d8 SHA512 88cd31f008359d686c66f9813f498c5c4c3f7662a5acfe5c7eac7c244bc0688fc544b36dd711c1949624c186e143f0d46e9c636b7ff54f401f67d95f3d33d69d
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1-r1.ebuild
index 9432c3b8930f..2c68a78dc0f9 100644
--- a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="openmp"
 
-DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+PATCHES=( "${FILESDIR}"/${P}-big-endian.patch )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild
deleted file mode 100644
index adeb06611a33..000000000000
--- a/app-arch/par2cmdline/par2cmdline-0.8.1.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="A PAR-2.0 file verification and repair tool"
-HOMEPAGE="https://github.com/Parchive/par2cmdline"
-SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="openmp"
-
-PATCHES=( "${FILESDIR}"/${P}-big-endian.patch )
-DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_test() {
-	# test22 fails when run in parallel
-	emake -j1 check
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6fbe11fb0dc5..ef8ed2186ccb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7ab413503cb1..19fbb2ee08df 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,8 +18,9 @@ EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf
 EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
 EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
 EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c
-EBUILD emacs-28.1.90.ebuild 14797 BLAKE2B 1e781ab85ddfd1ac3e699c89ebf5ca08f127437a0a1fdb254ce85fa0a550abc2e650d2e81829b61d96dcc2567228e5bc0a083651af4a5a0dda8e4454da77a458 SHA512 d286a760d36d98ea0b445384e28049d519959b716fc85a5bbf6ff2b1d07fbf793b7238cc7fbed58463992ad0cd47dc89d47f5d750a58d71cf0a621eb2a40a210
-EBUILD emacs-28.1.9999.ebuild 14795 BLAKE2B 9c3e4056feb08a72443cae30db1a1bbe555b7b454964bd5e6ba7663e0b92a4276641c19018f117f7fdf6548d18872a32956aeb727bf25e9530aa7179b1d91581 SHA512 447012b92de8f4ae909e2a8233e8ff02353095960300a9a31d2edc6ccb536f1a2b69f65d09b30f6d26ca19bf990081181f68ea82b785da754d4565f54cb6c049
+EBUILD emacs-28.1-r2.ebuild 15037 BLAKE2B 985440b0c7b7f30e52127e8938da63af03d69a172a32490ba87f15e0d4b3baeeb9086a0d2121c1d61efd423f6b8935657c820e3790fdbd4964894aa3140bee54 SHA512 a43637d2d466a5a687874646b6b897e0fb00c24e5ea09e6d051cdc9029df0aa810d2b9e8a17699b93dae32f5402e5980dde23cdd486341df0e61cd38e71437c6
+EBUILD emacs-28.1.90-r2.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
+EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
 EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670
-EBUILD emacs-29.0.9999.ebuild 16277 BLAKE2B 1c2ac9eca96417bd14d115d060411fb3d0999f9b0c9cd77afaa65163b7eab525e4ff816d2c90253bbd9304955ddd600f965df97c4d6520c12dfae1ff46e12443 SHA512 e9794123c564caf3bec05ac041e5ebb73622c073fa1f2c8a04f9a900aa259d65a33d5f4260bc4004282e9477535c3b9b02eb171e163b02a40dd8f5bf18f02ff4
+EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1-r2.ebuild b/app-editors/emacs/emacs-28.1-r2.ebuild
new file mode 100644
index 000000000000..29813e2a063f
--- /dev/null
+++ b/app-editors/emacs/emacs-28.1-r2.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-28"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? ( sys-devel/gcc:=[jit(-)] )
+	json? ( dev-libs/jansson:= )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	if use jit; then
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=" --with-dumping=unexec"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.1.90.ebuild b/app-editors/emacs/emacs-28.1.90-r2.ebuild
index 7875c15c2dcd..ce9357f531fc 100644
--- a/app-editors/emacs/emacs-28.1.90.ebuild
+++ b/app-editors/emacs/emacs-28.1.90-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -165,7 +165,12 @@ src_prepare() {
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
-	#AT_M4DIR=m4 eautoreconf
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index a3ba699d12bc..ce9357f531fc 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -165,6 +165,11 @@ src_prepare() {
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
 	AT_M4DIR=m4 eautoreconf
 }
 
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 571ff6e3636c..0fde98bc4137 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -187,6 +187,11 @@ src_prepare() {
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
 	AT_M4DIR=m4 eautoreconf
 }
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e625a0ff55fe..c229f58665f5 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/pandoc-mode/Manifest b/app-emacs/pandoc-mode/Manifest
new file mode 100644
index 000000000000..62d0dd4a06d5
--- /dev/null
+++ b/app-emacs/pandoc-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50pandoc-mode-gentoo.el 254 BLAKE2B f979086ad1a06836f67c6fff750ef0a28f7e3a9fbbed996305d4b2c55e2f40ec5ba1c446680d9eaed499a400091000d02f397ab88949ec86ca4d95508b4a718f SHA512 dce6c925f16627fe1d572816a3304a5d605e0fbef9c3f4b5044c461d8ac0d5f47ee426d7b2faa1d6c163da7364f02255ee258e7aefc2c94e70e7430aabc95505
+DIST pandoc-mode-2.32.tar.gz 97596 BLAKE2B 2a1c8a6080fbba1cf278d78f9dbe4e6824daed52ad6422378d6b5c00fd4ec9466391474fdbaad5f1cd96d89080c24968b33c0911cb5f834ddd64dc1339b78c01 SHA512 6717bf238a9f71acce8135d5fa0542c23f2b48d78415f92dda2ef58aa0355ca0fe900e1015d0da674abf7780ed614bd7d4414519bf6d0d7f5aee7e3b7a7f447f
+EBUILD pandoc-mode-2.32-r1.ebuild 598 BLAKE2B 5f7120a6b9de6e35921e7a8368f47ddfd1888c86e61c13193828897d4b6ce70f2382634fe72ee596df158247ec4b8edf41b8fed687edd206235e1c9a25efa797 SHA512 1cad1707611e4b4cd3c48ea595bda4cd3dda8ca97a5203349cb448d3feeffa3f26d72f21edd23a204ee04ac8882e65ad2408997a222de44e4e7d9c82f01aa60c
+MISC metadata.xml 798 BLAKE2B 2925d06732675f3478e4a7e57f077b1878c94c3f7986aae722867bab0654ce1aa77cc8b00a6ec2a08cfd1a8066670699ad59fda1504f4f4dbfc2bb23ab0a1d36 SHA512 7e4d3a0fc951f1f18f117c42bbb9f37aa90adb9412dcfec2e1461550fe1310784ffde6bd7097cf0708e1dd685f75eb139cde0c4cd8cbe1e6dd698234bc63f3f2
diff --git a/app-emacs/pandoc-mode/files/50pandoc-mode-gentoo.el b/app-emacs/pandoc-mode/files/50pandoc-mode-gentoo.el
new file mode 100644
index 000000000000..7b5175907861
--- /dev/null
+++ b/app-emacs/pandoc-mode/files/50pandoc-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'conditionally-turn-on-pandoc "pandoc-mode"
+  "Turn on pandoc-mode if a pandoc settings file exists.")  ; non-interactive
+(autoload 'pandoc-mode "pandoc-mode"
+  "Minor mode for interacting with Pandoc." t)
diff --git a/app-emacs/pandoc-mode/metadata.xml b/app-emacs/pandoc-mode/metadata.xml
new file mode 100644
index 000000000000..2836a8a3bb27
--- /dev/null
+++ b/app-emacs/pandoc-mode/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    pandoc-mode is an Emacs mode for interacting with Pandoc. pandoc-mode is
+    implemented as a minor mode that can be activated alongside the major mode
+    for any of Pandoc's supported input formats. It provides facilities to set
+    the various options that Pandoc accepts and to run Pandoc on the input
+    file.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/joostkremers/pandoc-mode/issues/</bugs-to>
+    <remote-id type="github">joostkremers/pandoc-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/pandoc-mode/pandoc-mode-2.32-r1.ebuild b/app-emacs/pandoc-mode/pandoc-mode-2.32-r1.ebuild
new file mode 100644
index 000000000000..4d7d1760c9a9
--- /dev/null
+++ b/app-emacs/pandoc-mode/pandoc-mode-2.32-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/pandoc-mode/
+	https://github.com/joostkremers/pandoc-mode/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="
+	app-emacs/dash
+	app-emacs/hydra
+"
+RDEPEND="
+	${BDEPEND}
+	virtual/pandoc
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d39537644cff..bddd9bb9169b 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 2636938273ab..1e4908447621 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -28,7 +28,9 @@ DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b
 DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
 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-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
+DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
 DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
 EBUILD xen-tools-4.15.3.ebuild 16673 BLAKE2B 5564ae42258c6eb413b4b29730d6fa5823f4479dd8b483d2ef093ab1d1ae9e234d3b42bcfd1fdb1667f0584604cc54fcef76be6f2bb03e862fc8302053e89999 SHA512 9c774445827cca9995f488e1bd5ae37a6a3402774e45c62a984fc3331ba53f5546f664504fb487474e4dd856f541263dc1de1ffbd909b6a1318db24916e0dc65
+EBUILD xen-tools-4.15.4_pre.ebuild 16707 BLAKE2B abed0efd8aeafa933f1a94edefa27dcb0b0e4ff9537639742a4d492174ab14dd612329b125cdd561c5ff0b72d710c6d553ef8f1dde39824d24840271c9197bd1 SHA512 8c90c61f52e76b8d4ad2db5eb43a98f61868cf8dbb49bfb5bef3148368166191066c1874c7889ab5db6c92520b99fb7ac7fbe604592cd5025c08cf2677933ad7
 EBUILD xen-tools-4.16.2_pre2-r1.ebuild 16110 BLAKE2B f7f320b4a1bff2daf4a15af3f0014774b17c0da45baef1de66ba270480f78533738606bb4f1d1cdebb00a1836ed1700f69892ab2c6e42ecda5abd3f657d5e7d7 SHA512 7f72e87ae75123222f54731808117f26a50323fde8ae0de26fea2c1ba9735e1e6131e13da6f68b9bb8fdb574bd19f11f272a86ad38372ddd24dd7779b9f4d312
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild b/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
new file mode 100644
index 000000000000..6e8b7325cf79
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
@@ -0,0 +1,532 @@
+# 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=0.1
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_PRE_VERSION_BASE=4.15.3
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="
+	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+	)
+	"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org"
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios"
+
+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
+	)
+	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_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	arm64? ( sys-power/iasl
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		dev-util/meson
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		dev-lang/ocaml[ocamlopt] )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+	# collisions with app-emulation/qemu.
+	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+		tools/qemu-xen/include/net/net.h \
+		tools/qemu-xen/Makefile \
+		tools/qemu-xen/qemu-bridge-helper.c \
+		tools/qemu-xen/qemu-options.hx \
+		|| die
+
+	if use ovmf; then
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+
+		# Bug #816987
+		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
+			eapply "${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)
+		--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 6cd0b871de6a..46017f6509bb 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -5,7 +5,9 @@ AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95a
 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-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
+DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
 DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
 EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
+EBUILD xen-4.15.4_pre.ebuild 4679 BLAKE2B 8315ca4a195503e25c8ee6dfb693dae124e100285841ead6779a56cfb99500736a0ea53601fd6fc34d2e9381c9dc663452a95cb6370f8784cd45c877dea443a5 SHA512 352f9732a7f9181a52e3ba3296129142c3810325bc1322251afd08111cc4b4aac6b7a8e1ef87d80da83a9cf0d09e0f20a329338db9479051524829ba97a81bfd
 EBUILD xen-4.16.2_pre2.ebuild 4386 BLAKE2B 22dd2b553f0fb8c08e47989b7c911d1685ebe93ec523340e5f7c7fdfd954ab702df480f4314d9dabea366b286053e2ebde51a7bfec7c0fc31f7abd4dfebdc387 SHA512 a2057f44df2b7b52cee23a1e089ebf1e4830e1032329c9e3014580988ff431890d4d617d9f877433235cadc6bd3acb0ff0c075de30a18bc03a7ee59f5f7e3bca
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.4_pre.ebuild b/app-emulation/xen/xen-4.15.4_pre.ebuild
new file mode 100644
index 000000000000..c231b44c827f
--- /dev/null
+++ b/app-emulation/xen/xen-4.15.4_pre.ebuild
@@ -0,0 +1,183 @@
+# 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=0.1
+	XEN_GENTOO_PATCHSET_NUM=
+	XEN_PRE_VERSION_BASE=4.15.3
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="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.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
+}
+
+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/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d2af020e9c73..c5dedc833b74 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/plod/Manifest b/app-misc/plod/Manifest
index b69c996a01ed..d5b709a4d86f 100644
--- a/app-misc/plod/Manifest
+++ b/app-misc/plod/Manifest
@@ -1,4 +1,4 @@
 AUX plodrc 54 BLAKE2B 38a8751fb721690a46098b65f5cedff27cb4035124a4daeab32f2f76ea4f622718cf14915804e5b0d312d1432b521aee7dffbe3dbf79fb7dab66dce218317c28 SHA512 2ad257ddb80bc94cd53e83dbe861ada8ea583eb419472f4488b4b567effa33ea8ada8c450dcf08c42a84c8874e5db85f1c4076b96e2f6228d0b14937830bcec2
 DIST plod-1.9.tar.gz 29551 BLAKE2B 6aa0a5857ab1f29263393c63d8b122d6197c75abaa1579ceea5709a61a62e007238caee9aa0513e1e7ee50d0c34e5d478c8ff4014fa47e7b2f27dc05123f590f SHA512 0cf1365963ee0f5a8db445c16ce37890429a4c951ce547560e845316950b4f485ecdc0885e2d35cb240bf9d7bec587c0d913774b05cfca8a145c1837281cad88
-EBUILD plod-1.9-r2.ebuild 765 BLAKE2B 50e4f6e948f04dd1e8b12b14081ccccce16e5f9c2afbb30a2d09bc5c7e346bc0b815c07a4125e4781be0f2c3b0fcd23d663f1de67864acd468b28391a39d17aa SHA512 9382457e075d3f48eebdc881b229d3605a768ef9217c286151fc850bd09bd24ea6c4442b1c53060df3aa205db062874363728c0fa3cdad3cd63605761d63cbab
+EBUILD plod-1.9-r3.ebuild 762 BLAKE2B e874112f3238bd4252c44127481f6b5a3148e8e80fd1769265088f8d89dfc7286c06d3629203ef28ea320b261f4d21c2c47c74e39dc3e495b2c6308ea8970bd9 SHA512 629a70b6dd7bcc0961f99b5f4d13ddfa3dd239152eb7c1a5357771d68076460562fbaa5139c807b90f594cc07c25c143ad9c5ae0e157a397c1dbf7afbaeccb00
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/plod/plod-1.9-r2.ebuild b/app-misc/plod/plod-1.9-r3.ebuild
index 10ebf32c09e9..5c24b32bc242 100644
--- a/app-misc/plod/plod-1.9-r2.ebuild
+++ b/app-misc/plod/plod-1.9-r3.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A tool to help administrators keep track of daily activities"
-HOMEPAGE="http://www.deer-run.com/~hal/"
+HOMEPAGE="https://www.deer-run.com/~hal/"
 SRC_URI="http://www.far2wise.net/plod/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
 
 src_unpack() {
 	default
 
-	# Bug 619934. Change directories first to ensure that "unpack" outputs
+	# Bug #619934. Change directories first to ensure that "unpack" outputs
 	# to ${S} and not to ${WORKDIR}.
 	cd "${S}" || die
-	unpack "${S}/${PN}.1.gz"
+	unpack "${S}"/${PN}.1.gz
 }
 
 src_prepare() {
 	default
+
 	sed -i -e 's#/usr/local#/usr#' "${PN}" || die
 }
 
@@ -32,11 +33,11 @@ src_compile() {
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
+	dobin ${PN}
+	doman ${PN}.1
 
 	insinto /etc
-	doins "${FILESDIR}/${PN}rc"
+	doins "${FILESDIR}"/${PN}rc
 
 	dodoc README TODO
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 151f60c91059..8d664861cff4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index 959531d87aa8..37995978417c 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,7 +1,3 @@
-AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
-DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
-DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
 DIST wsdl4j-src-1.6.3.zip 173137 BLAKE2B 85ffe7a53b281307cd2d7072f611aa7ecbc10a5e13125f44f0dc934218b8d31ad15438adfc46a89431a5fc1ac68d4896c2415a95ee87c227d74babe664202e4f SHA512 eb5e16b0b51530a27b12aae5d897384d2a03db2e4df70f23ab435af5e8444f828dacfdb0ab0807a9e0b3423eebb165eea8790c129a173d376fc929a1c222be6e
-EBUILD wsdl4j-1.6.2-r1.ebuild 1376 BLAKE2B cb0628a913a4d93b32f8d2db8e59757bf31500ebfc7bbf7899e2f08e60e82ecfef6609dba997ec17aeaa9a96782326e3055e8a7808c52d9257010249d0cc53cb SHA512 32e0c7d1cd69884104ae305d7dd3e24e92fbb6f26c7e2eda07ba4ddc814f700b8c8986a8cfadc89bd4b57203b6219abcc2db30104ec929677036e63153303e00
 EBUILD wsdl4j-1.6.3.ebuild 597 BLAKE2B 1fa1cfbea02d915133fae7a7cdbb3b22fdf3bff6da0aba80991363c70d0cf0362e37dff6d94584688177232ccefe115e45c0da250983d9f4c4a2bc989f9bbeb2 SHA512 dacbdd6d2257d53a8079f96d905c5e480d5c55e1a92643dbd7d68d1db27127c4c1821797b56a010d6c47d55be5321b9c54c6b168a4ab9d64390f2ea8132dfdeb
 MISC metadata.xml 313 BLAKE2B aabc90f625441d1325eb089a25545ba18a7e323c758d183b8e5ca2c1531c12f33e71404209f8c7c70713cb9ecfac806ce1d59aceb34b21c1c83f44b409433f5d SHA512 13071d1d4f65f3e9ce63df3e7b15289167c9bd83b0a83df6b40faec8da89a69d271f83e22ceff5e003ca230259a986c96cf5765a94ec5c03d6cffac3ef4632ce
diff --git a/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch b/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
deleted file mode 100644
index 7901a11a6fc0..000000000000
--- a/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur wsdl4j-1_6_2.old/build.xml wsdl4j-1_6_2/build.xml
---- wsdl4j-1_6_2.old/build.xml	2007-06-09 01:12:11.000000000 +0300
-+++ wsdl4j-1_6_2/build.xml	2007-06-09 01:13:09.000000000 +0300
-@@ -279,6 +279,7 @@
-   <target name="test" depends="compile" if="junit.present">
-     <junit printsummary="on">
-       <sysproperty key="jwsdltck_home" value="./test"/>
-+	  <sysproperty key="java.home" value="${temp.dir}"/>
-       <sysproperty key="javax.wsdl.factory.WSDLFactoryCandidate"
-                    value="com.ibm.wsdl.factory.WSDLFactoryImpl"/>
- 
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
deleted file mode 100644
index 2543074e32b0..000000000000
--- a/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
-HOMEPAGE="http://wsdl4j.sourceforge.net"
-
-TCK="jwsdltck"
-TCK_V="1.2"
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
-	test? ( mirror://sourceforge/${TCK}/${TCK}-bin-${TCK_V}.zip )"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-# tests fail with encoding errors
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/junit:0 )
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P//./_}"
-TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
-
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
-src_prepare() {
-	default
-	if use test; then
-		rm -v "${TCK_S}"/lib/*.jar || die
-		eapply "${FILESDIR}/1.6.2-tests-sandbox.patch"
-	fi
-}
-
-src_test() {
-	ln -s "${TCK_S}" test || die
-	cd "${TCK_S}" || die
-	java-ant_rewrite-classpath
-	local junit="$(java-pkg_getjars junit)"
-	eant -Dbuild.lib="${S}/test/lib" compile \
-		-Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
-	cd "${S}" || die
-	mkdir "${T}/lib" || die
-	ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/*.jar
-
-	use doc && java-pkg_dojavadoc build/javadocs/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d45e2745d40b..9df2ae0e6b10 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 7cc4dc21969a..e12663309057 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,7 @@
 DIST libgit2-1.3.2.tar.gz 5824473 BLAKE2B 521512721d5959274898046e4341e000c3d0bb28cffde9c1c5f9640f73c74fb3b5330a2329b57a92490acd93f6b59f9b53d9940b50a1056c15f52632db9fdfe6 SHA512 580ad6f3e2cb992014d7fecef4d834dd0fda169c4439ec5d566322edb457b2173910b25a49ba50d5bd05518ad771ee2f42e47ab48ce417c297b6a93dd0cb502d
 DIST libgit2-1.4.4.tar.gz 5855349 BLAKE2B 2668e351521e1cd9d2998c45c65e2a8c30f3436d94f86ebaa10382d01afb136bbde28c71d359fb57757ebbd44b1cef1bacd302023d0803a23697aee10f03ebac SHA512 8f4cc43de9b92866ac12e01613efe0ff808deca29ff82b6da98a38c814bb711ff3133145d0219210af7015955fbe381be6f1cb98915811d3c37e92b01eb522e9
+DIST libgit2-1.5.0.tar.gz 5893437 BLAKE2B 4108de0e8fc6a02e4172f47cb69cdfe8c85a0a72235432ca58b02d94e0bcb8390caf0c710060772551cc3a392291778ae14b561256c6d88058d0ae5a277f2fbf SHA512 7a32b27cd32bd03ce7be6c127317f82a4ac6f16615c3234699676781f4858d057edb0410b2fe36fd2e634b00748a8b0be17f23809e09a7602ba48185134300f7
 EBUILD libgit2-1.3.2.ebuild 1698 BLAKE2B 2dc3632795ce43e35c4f8f0d8b0a9e6eece80299c6c6cae21f7a6c8fedfc9c2da3021b97495968a17b966f90bbf48072a79c39757e4adf37aa25999a9f2aad7d SHA512 0ac8c62508780fecccf0052c8545afa9fd49dc8ec908cf83ebb064f1257330009fb728c11d7f7bb19b6c59d457b526ed919dd9b1375f8b33e1945d8d8d4d7989
 EBUILD libgit2-1.4.4.ebuild 1655 BLAKE2B 395acbb358de3c8b5f6dc1ebb7194ccc72ce43fee00b40e57cd6510c9019269f544d2838d05df1b0bb565e783fbd3ec6028398b19c52e2e4c6cfaa73cfab2d3f SHA512 5167d46a27a52272c85cfb191c1e8596034ada2e6580e35ae0bf7ea0f5426fd5e8c0eb5b2f6a481885d30dc7621aefc089762b30be41a7231e8d87a979cf072c
+EBUILD libgit2-1.5.0.ebuild 1673 BLAKE2B b5297c647b8cb5f8334aa949c437b70b7e2bd04d8a1735169cfe61fe7f4c085e22f15d81db2b006a2da59ef3c6827a61502933dfda3abb24234a108cf001eb09 SHA512 5675d9726a1ebb74e4bd543b83150ee5d2d77475ec6b81a8a4b5355b550cf2b2ee78306e033c6a79fed70f37f03dcbdd14094abb79df265df03d7e2e12bbdcbe
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.5.0.ebuild b/dev-libs/libgit2/libgit2-1.5.0.ebuild
new file mode 100644
index 000000000000..c6bf49f120a5
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.5.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' \
+		tests/libgit2/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f5e4ecb75476..f42b70857362 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index feef469ba769..77a662f40707 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,5 @@
 DIST alembic-1.8.0.tar.gz 1252636 BLAKE2B dfe6130a08a8bfcdeb10e02187a9f597bb55de8194c91909ab06d72f5daaaaf4c7154570a141a82be8568195d8f5f76db661f1dd192b92a5991434ade1a389ed SHA512 601366f21bcadaef1a5b7f7d4a1edfd9c146340f8a5d07b41e3b381e1e00866e79520d8393330e4a80369664b36b549c9d5ab3ea13ad7aa8010b165e73038bcd
+DIST alembic-1.8.1.tar.gz 1255927 BLAKE2B dbf40f9ca12171d99ad46bec6bf1841799226887a55a815db5c7a69cbcb7d861ede774aa35e1018e1a57bec26a8ddf7ee311e0b4396ebddd5477c67a4ad11876 SHA512 51f210447172d08eb94c41a962ddecc593a665790aa6f5badb771dccc882e0d653dcf153ebb04b9824dabcaeb1ac08e3747c2e3c74d8584a24b35662778de8dd
 EBUILD alembic-1.8.0.ebuild 923 BLAKE2B edeacc8b0f178566fd2aa0d2dac803546333ac2075419163bb8eb263b4425775b45645b1c3269ff5b9d0fd863d4870353494c0e2d62cdd9de2edcd6c9fc4897b SHA512 c0a2850ebd134208a7a61bd7e2aa56f782f93e010e14927c2f35e639a816b7d729a3203af24a9468df8e5d302e976771174e28c471bdf2012cc41dc27de83a33
+EBUILD alembic-1.8.1.ebuild 964 BLAKE2B 8df7637bbf593fe7e7e7beeb86a44fdfa8f0050651a1926cf8eb400819bf44e331249158bac58edade634f14cfc8c5450c6516b999f90276f8e0477c984ab609 SHA512 96f96d1c751258584f6073f21204162314dfc37bed0d617ce55ddd39c71d3a57d06c80e99efc87337a5783939edda9c6f5ba4843dd007adcd97ff38b4ab8cc4a
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.8.1.ebuild b/dev-python/alembic/alembic-1.8.1.ebuild
new file mode 100644
index 000000000000..be24ef80d028
--- /dev/null
+++ b/dev-python/alembic/alembic-1.8.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=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index e4d5c3f3daa0..99815f089c54 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,3 +1,5 @@
 DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
+DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136
 EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 429e761c9a8dc220ef53274cba9f0da1a1647ee483e6afb0bf98fe14e25507d907b4515d4fc266ddbd53cc96cb105c172fc800c98c2a1becbc85c43900f64be6 SHA512 8c299014a4005e2a6e199e848e8829b792368c1862311c07b77d8df258ef6b16ec2bca27c2cf3a78f879052aa883267f37f91b2ac725a53787bb84923d1d7e62
+EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 18b983fbaa4703f3cb6722af2ca267892a1976af3a12bdb8032a1844a0d9f24e2f1e746a610590cc865d0b4e0df64d2cb31d32ff952c0b6dce3067a08d945c6c SHA512 42df422e2736d933b1f54a3af171c9e40ad45a5df57e91b8da1b5255a6de7777e840a3cdb6f983cb16f255ac324935d5d69f86ee8f351ce1f048a3b59486b6bf
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
new file mode 100644
index 000000000000..36ec1e075135
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
@@ -0,0 +1,63 @@
+# 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="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-markdown[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+distutils_enable_sphinx docs \
+	dev-python/ansible-pygments \
+	dev-python/myst_parser \
+	dev-python/sphinx_ansible_theme
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p pytest_markdown.plugin
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 059879891f53..2ff0bbf35890 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e9415
 DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661ce454a7af16be6856053af1bfac69b7f56ada5b154fb625fe2ba1fb22fbe34b5150c550890e46a923b48f2466b06b SHA512 a3980ec79abd5e2656d7d02b36dff6b8c2acb67033eff134d96dccbb9d8bbc2d711698b87d08d537256fad7e3b3cd7af008018ef567b12d63ef0fc871a8f3b3e
 DIST boto3-1.24.27.gh.tar.gz 516237 BLAKE2B 968d48e9f1bf888df5dfc2ebb2d926d918121f96246e8d36ff872e93e347db3d97db42304e148cd21845bc3904977e0000a0e846bb104990cee23343c5995776 SHA512 3ff77f52a5236b12a7344ee9279cbfd53d6847f5afd980820f46971e62ebfa0f2639634c23cd962dfd087af1176596484dbedda6dee3674816a7a569f528caf5
 DIST boto3-1.24.28.gh.tar.gz 516274 BLAKE2B 846de56cdd94cb63f855086b051bf8a282cde2dcfb7e581cd35bbe684f71aec3a8c8c451163814f66d7935a8947da4573b9283de8a24a4b1d6b543d7bf5a9323 SHA512 135ffb89fd008d41eb0054b4d746b32f2861520573604714240ccf15d6a2563e3a03179daa13bf153e047e0239ffa1c1884a0f4ee71cf5ca595c5f1ddc521477
+DIST boto3-1.24.29.gh.tar.gz 516486 BLAKE2B 0850ca719fe367fc25ae96fae20a341e5f95d30dc47c7b4176d14516202f54036ff0195520c314c24ee09db8a00a880ab4c8d4146ff4c6570aa56c055bf64dd2 SHA512 9d286d25ab9093778b4027c43d0909630b9b8685fb92b498bcca71ab7ca0406985b7a117e74cf41e3f13923eec3152d6b8142c92b398f3244b4fc78649d5fdd0
 EBUILD boto3-1.24.17.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.22.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.26.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.27.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.28.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.29.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.29.ebuild b/dev-python/boto3/boto3-1.24.29.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.29.ebuild
@@ -0,0 +1,68 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a362f513a5a5..fa08e0706295 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af7
 DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92cc86768c5e3999f99fb8e2a4a888309d72d4d3d66a1ebf9c1e2b6ccab6265a1d94ad9dcbf9da22aa1ae012aa2bfb3 SHA512 bbb563c2bc8eb3fe022f0b7be263ef16de93aadb02fb7a8e242f53a957a97e8f8b5d043ea8897a7b268d4d64b1e4972f2ccc91b8255f232c858f6a9ba1d93f34
 DIST botocore-1.27.27.tar.gz 9168895 BLAKE2B 71cc1d94a570110305a37c6813e626bf2c06189692af6a0c1c751f63b329fb13c41e048103b1938f680cf00d08b2c16d253fcee0d559716ccc411be4635f8741 SHA512 d974824a5f1d6bdf332c49682fede28b1b2c464928595929c5f7e8c2cbcdc8216cd590dfdf2dadffbd4cd21e1aeefc89744424e09eab876ad77280e6023b362f
 DIST botocore-1.27.28.tar.gz 9170693 BLAKE2B 9efecb772f0a84edf61f9556bc3c2081fc4681b922c176ba56a42a951e18959ab135d80183e3667df6b21a1a129bc09b5e223d69081c45f33f3aebf7599e03e3 SHA512 22286e962a6e2f90d37e004e78b8b55cd446141f0c0dd2e21ac54b9ee2eb2a00dd791f10eaf511b0f31d93795fee042985cea431a7ced4ded2de5f174cfe9c8b
+DIST botocore-1.27.29.tar.gz 9172216 BLAKE2B 9ebf2594a21d3b48ce13bac6901884db14ef1216cbb73783a30390ef67973cca24aa50e1226e836124c97512a8f3307b2c18dbfcd52cbf01e69c44046d1f572a SHA512 8897209c8edef1f8e1f5a877e62809760b62a2009f8c0bf59922fde7193fe60b49a15d9eecb6d6bf647418d35b580e277eff2bb14152be301ce67b4dc8dd6f1d
 EBUILD botocore-1.27.17.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.22.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.26.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.27.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.28.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.29.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-9999.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.29.ebuild b/dev-python/botocore/botocore-1.27.29.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.29.ebuild
@@ -0,0 +1,66 @@
+# 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 7b574d144fd1..a7df13ccbbf1 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,4 +1,6 @@
 AUX cmd2-2.4.1-py311.patch 1303 BLAKE2B 611d6270470b838cbe7551ac1019323217e7f3d68efe9c17d81a09a2124707f63af51ef5ed7adf0b3e8e6548dc7c55f5d1be29258f5e44d1be03d59ba583b482 SHA512 1e7893e4c2c0286dfe29d7688200a1878069cad46ded7d4ba8921944d47a5e3626324a5cb59ba38ecb20d8bfa87ecd5e5105295595982a33f44a3cd4ae1fe887
 DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
+DIST cmd2-2.4.2.tar.gz 677598 BLAKE2B 38b767e70d42125639578a906a6bd0ac737ee1e3be2951b122f91a1a2bfe366ea23db2d7d7350842b667aca7614a3520057f689cb1c253d1c4b11e164c2ee4a1 SHA512 d70d264671db2783526c589199ff74cc70d53a4fbaa1d78636a508dbf8216aefab17f5764bf25b2b86e9c1413e0e61977819fbb0dec59d3209195df522d3fa5f
 EBUILD cmd2-2.4.1.ebuild 1546 BLAKE2B c0cc684936461acf7ea790dac74b03c186674ee6a7650a8826c676487bb82f53a4debcc663ec5152473566a962fc89226239c7e4b762a6448c3e8d98d67e5d02 SHA512 5f7769893acad0d1bc677c5304c1ae14fc7dfcb0132c70762bb61e18aaba5ccb176e6ce0e383ca4e237750635f1ac206943aed82f42a5c1a7ee551938949d3eb
+EBUILD cmd2-2.4.2.ebuild 1506 BLAKE2B 23a67b03214ab67ad0f0f3b442e0ea3819686d557b6af6aadccaf8ca508db20811f5c1fd2061efb60aa4579ca1a212df6247fe72182db7554c1b578f1f162d99 SHA512 5920d3cfbd0c9472d4360b800dc84e8c4b19c558056fbc88ca7a5fec58bdbf9267933cd30b462dbbacaf94601ada12003762ef4c9ff83b33e0eb18ed043456c1
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.2.ebuild b/dev-python/cmd2/cmd2-2.4.2.ebuild
new file mode 100644
index 000000000000..72245e3bb12b
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.4.2.ebuild
@@ -0,0 +1,60 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="
+	https://github.com/python-cmd2/cmd2/
+	https://pypi.org/project/cmd2/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p no:pytest-qt || die
+}
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 36ec908f5fe0..1da19734b5a5 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-2.1.2.tar.gz 631846 BLAKE2B 9024a12dd6fabeffcf5939e2852734b278f25fb99830bb165cf46a09e3fd67d0997558d1b06a0dec3425d9b750be25bde147341c937e874811fe2496224a1f3e SHA512 65ca756d63da05e74863fbfd2ae574d6e75d6fab683dd08ea97b22a9b27be4f9a03ce7be44312a1f2c6a802bdf77ede3899734f3f1546000dd8b9c592571deec
+DIST Flask-2.1.3.tar.gz 630206 BLAKE2B 83c876fe94d2cb1b35677227214664b35b6908270097d3ef0e1150a7259cdce82fb91fa6ba7cc90e819623bb9cc79f8254cc5688c6dd1e1dedaa673f23591bfb SHA512 6289bcaa295265c501fda1292b496911768525acf4155c856e14479a213aec4ca50a45ddd81b30ccd31fd684da1942ec10400f2dc8280ceff6ded9baf55494e5
 EBUILD flask-2.1.2.ebuild 1512 BLAKE2B 4c087e67a6aac823a44f27a9040ba4af1b3e1d083043be671a39bfccfc4369490e746a869aeea137877c229b50a77da4dcc1e56907c2b0fb0c1f3dd6550a8e52 SHA512 dc6b6ecc43fecf840ac2fff079f9b9fc8e9650fa0ad761c1b4b9726935038f4685084a782fae385212be01ae640404ad53e12af5bf9a10fe988200cad86425aa
+EBUILD flask-2.1.3.ebuild 1520 BLAKE2B e9677b4637436038576b85d6b7b022a180b5db935f71ef1abbb3c1cae2e461f9ab18f634265d2c010134bd89f3de84685adb02a78727fb2e60d5d5bb6809a692 SHA512 44d8d8af5978da14bdef4490acf54e54c0cd3ced026a16df571142886ce4a436cbe3f961773db5efd5b23c935427f0cd3b5886dccf4fe3600d74b8bd15145489
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.1.3.ebuild b/dev-python/flask/flask-2.1.3.ebuild
new file mode 100644
index 000000000000..1173c5e5bd45
--- /dev/null
+++ b/dev-python/flask/flask-2.1.3.ebuild
@@ -0,0 +1,63 @@
+# 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="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="
+	https://palletsprojects.com/p/flask/
+	https://github.com/pallets/flask/
+	https://pypi.org/project/Flask/
+"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs \
+	dev-python/sphinxcontrib-log_cabinet
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mrcfile/Manifest b/dev-python/mrcfile/Manifest
index 157542fe7ca2..6c679b4a608b 100644
--- a/dev-python/mrcfile/Manifest
+++ b/dev-python/mrcfile/Manifest
@@ -1,5 +1,7 @@
 DIST mrcfile-1.3.0.gh.tar.gz 148140808 BLAKE2B 8ede240df4a3d0132a3bfa230377f496db84c56074450e5744c696158b2afd2c091719fbb314a04eff7f21f10eaeaa9cc6347e45bf82b0c4972db4ecc4a111a4 SHA512 57fff6e7c71b41681c94c60fbb69d0712ec7e342329624d8c20e212560eaa0f2b573d02ec5fcce39b9b7077e66d9bab463afc227d6b1f24134eddb17e56fdff1
 DIST mrcfile-1.4.0.gh.tar.gz 148151643 BLAKE2B d9a5c8c3535402e00f971da0032e32b8c4e86fbabf9774b00fa5c7565e560e2bcbf50cba07458926bcda0c62071b18144a7d6016a1e8928ca031e8e54e63b0c4 SHA512 078e5f1c933b42116908995665cf0f222208e35b6e79e65724f26b6e9a2f7a19f5e1763369b99f4a03449f2fb10c2dac2201de88086d08da727fa5580a07e440
+DIST mrcfile-1.4.1.gh.tar.gz 148152857 BLAKE2B 6bfa9216465f147964ff3ad0065e6e2cae3a5c5ba226ddeead2c7f6c38f49f19cb83ee1dfb2f74adca87dba1504d908b846225f2b7b281153a8896bb49eb9653 SHA512 d0d3c12e38b2d9195c4ae65586e25abf483108582af467b22cb60cbc82572243ba213d5c89bff24c80f9189a961ac3bf78f7a884ddd3ea32666c5199facad7d3
 EBUILD mrcfile-1.3.0.ebuild 547 BLAKE2B 2c595a2d3ecd63d0c6522d36963f8b9e90a280146a3d415f47b02ceb733a99060c6631468dfc77107b97ba8bb62391728241b36cf75a24f4d635df8dc07c9a68 SHA512 d46df6f7286e3cd07c337c6a320f0b78be595b8cd2dc1997095e9bf16666a197b6967612219ad3fddece2b71dec8bc4f2bae2987af91a7d0603e877713b9a4b2
 EBUILD mrcfile-1.4.0.ebuild 547 BLAKE2B 6ac6fda19c9c629cc21522d31b59e86f45fbcecacd889ccba1c8e67de58cf6d548baa08bb98fbc390e8c673d72c32676aa928938115bd9f14673af722d6272a0 SHA512 b286668d2b814574196d6d49d1bd2fc739e6b3e20d9d5de96400a515e84bcb0dba7ce18d0cf926620d3e193a4019c3b0f47946f60785316a5f3410ca06f31a3d
+EBUILD mrcfile-1.4.1.ebuild 547 BLAKE2B f61f035fddce7d4ecb11026b13c8dd358256446b7ce77e8f1dfd6b79c1cfa62afab9dfb4f7289701d17d276ad01aa8d22fd1d032ff49ddde6d5d831cf7d84c04 SHA512 59f0aa4f10042a0ca32d068cedb5dfb2a60fcbbe456440601f581b2c53c27ab83e8ec4407a71b8f3c0126897dc15763457c8b18e00b5ee1b75b1ddcc4f3c3aca
 MISC metadata.xml 388 BLAKE2B 7327577122145fab2e580fa79005b7be4a61c6e65c68433230b737f5bd3e988150999bab5b9f4ee7878a9757a40133796a7b15b80c023f585f0c6c1fb30af730 SHA512 55efedf64a9fdf287874eb9345b3bfad5a4281c98e46b4fd43a4ba2f1a3ca5af68c1047779bf811679ff953e54adb4b3bc32fd97f137287ed291e89fafb2ffd6
diff --git a/dev-python/mrcfile/mrcfile-1.4.1.ebuild b/dev-python/mrcfile/mrcfile-1.4.1.ebuild
new file mode 100644
index 000000000000..62786145a366
--- /dev/null
+++ b/dev-python/mrcfile/mrcfile-1.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="MRC2014 file format I/O library"
+HOMEPAGE="
+	https://pypi.org/project/mrcfile/
+	https://github.com/ccpem/mrcfile/
+"
+SRC_URI="
+	https://github.com/ccpem/mrcfile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/numpy-1.16.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 479478b7e598..c843c1fb0da3 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,5 +1,7 @@
 DIST pocketlint-0.22.tar.gz 23779 BLAKE2B 3698927cc4a3f6ee6de74d205b5a7f937405e7ce2e9d987e34b35ce209635cab37357d0221a6762deb66350cd2b991420a9b12af2c9e6792f713e5c95dfedb59 SHA512 7ee9e6b969975274e7697d1d16fadaac82fa0a1855401d9f240aaae123831dc32e381dd24f88a3f004ab45df9f0251c408ed8f60a08fe99caf629af617c80ea0
 DIST pocketlint-0.23.gh.tar.gz 23854 BLAKE2B 2ff3388b639ba29ae60ccd0013cea9b1f437d03d552c03089c91ba65f4fdf7b6b739ac2b926248bc5738e29cd41fa104d7c2742385cfe7a454841f2ed252b0fa SHA512 36a6f7fbc5b9475a145bc03ccf9a6918e49ed29279913b1bcc7090961bcc842333a4d31b4eb809a7ca7b384e79c186d1e6397c379c1921943ddd49c3c736aaed
+DIST pocketlint-0.24.gh.tar.gz 23875 BLAKE2B b4699d1f0633ed6a3f84b97db972818c00a1d382a48648fd4fe6870f4c54f983fd36366f85a409a99b860f385902a9a05adec63199e35d1264a522a7a3086e31 SHA512 21c4055dd42c244760950b64ec4cd9359fc589014953be6f9296e0265101f098fbe34351e87f92630751fa0055de20281974a04b425f691acc4608cf929d4bf4
 EBUILD pocketlint-0.22.ebuild 487 BLAKE2B ddb58387ad3830f65c4b44cb627e86bbfdd4bf0210bd106071fa70a9e3a5fefc1ee0c4ac91fd6bde07abfce72dff455f1a32501e381460a2d192f4458a7b44cf SHA512 96bf0eb52b41e9696c97fb4161ff526fb9f3acf4fc1f3d83fa13c9f0166eec59e93382d3908257950649058ca522bcb1254984c30291dfcd3789db19b7b0ff97
 EBUILD pocketlint-0.23.ebuild 575 BLAKE2B 96eea8110471e78a93387adaf951758d84415e8488eedfab83f2dc231bb89690806750acecec28e3c3a31e110082bf0a51ffbbba271f83ec02246c7ebbad774b SHA512 a6a2693cfe1124ebf8dc7e6d1ed050076b6d3e0b8af45b2ee57307bad0922b1b551cc4e089942a3b2e5c7b77705866fd46c2f35c8cb5df98bbd0539d41ebd125
+EBUILD pocketlint-0.24.ebuild 658 BLAKE2B 07012aad8df4b7bf7cae37f00fb1161204c79e333ee1a77f2508a52a773b17e35c56e0a208a3e1f7bd21c5644af5dbe49ef97de6fdd3bb9bb87289fc187d5c96 SHA512 36ca02a98184b9dccd9b533cc64b309e37284063716d301a85a268edd2ad181554a2aebd942bace70b74805ed370fef6e8aa5d9921fd21d23b3a3b05be380a48
 MISC metadata.xml 303 BLAKE2B fd0ac0ccb8faa5f3e9b7074f238915f2b7babb9dc3af3b1574dd3f98e2970182d4cc0e579f59388601e43bd8991fa7cbca570c499f48060a25bdf8279a5c0751 SHA512 9f916df92044f8b6c2351e094e0ffdee2cf039e4d2d2d101ecc5a5e10af58dd4bafa19dc6cba47af87aaf73ad22abd64b50803c5e77cb283ae12c1f9e1653f43
diff --git a/dev-python/pocketlint/pocketlint-0.24.ebuild b/dev-python/pocketlint/pocketlint-0.24.ebuild
new file mode 100644
index 000000000000..c6c11e93d7a8
--- /dev/null
+++ b/dev-python/pocketlint/pocketlint-0.24.ebuild
@@ -0,0 +1,28 @@
+# 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="Shared code for running pylint against rhinstaller projects"
+HOMEPAGE="
+	https://github.com/rhinstaller/pocketlint/
+	https://pypi.org/project/pocketlint/
+"
+SRC_URI="
+	https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 64e8b335d1df..ab46c31506e7 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,5 +1,7 @@
 DIST pyfakefs-4.5.6.tar.gz 206310 BLAKE2B c37cb4709a285bfba411cd76da4f158cfe682d210411290ed3e06456ceb5b6de99ecc320da748c8d9b0e230b6384290638d3fd22f0e1388c1965b2b2806d2d30 SHA512 c7a31cc94eaa2b1830d4da355bf4d3de5cbdc8851561ec82fd2de9fe845457f13bcc25aa58a50afb862f396cb0e83c8bf71bb8be51cc3b628ff01b25db62eca6
 DIST pyfakefs-4.6.0.gh.tar.gz 208832 BLAKE2B 60a8c3223fc92e366beb8907ea0c8f242b91ddd422ab0b551d04d7c24ed3d4202b7c42b8971eef0f15fa27b7ed0821637e9341b3feeaf02232948a50898213d6 SHA512 9f507c7b0e28591886cb91c36dad22d6c55d123a447070c2fdc6573d2db1e2bb79cd5c203a9fce762882de680feacaf7e3b57f9bebf6922c643bf61fe44878f2
+DIST pyfakefs-4.6.1.gh.tar.gz 209134 BLAKE2B 81dc53dad9e815eaf3024f157aab36afcfd6547485b92b47e5acf2b03f49eb6ffe0d07da1c4d16b82585870535ba9d44580f190c28856dba6906d07996aba2f7 SHA512 ef2defe59e84e6e85408e7369efc86c1d6f3981456a2628552b63b8fca959ff8536b41fb006bd8b291bef9fb3dba17126c4e211a21f0d11cc29da8f7d5addce2
 EBUILD pyfakefs-4.5.6.ebuild 1553 BLAKE2B 115f6b5b6ec93d47e45fb46c2a6acfdbddd535e1f2bf5edc5a470dea6814d50076fb9df51c7edd8b996d3c0a07c2e08fc2f69076826419fb9b20cf1d263652ad SHA512 4d540e284764f87545e4b284dcfb666943d173f3ca00228f2dcdab0ab6b046eab29926216e87668e5a0193f6ae4bfa2d6b3c2c00c19f84ef1c13de59445ee3fd
 EBUILD pyfakefs-4.6.0.ebuild 1478 BLAKE2B 22a3f52c585cdd23edd0ce8e6ba22b807436f9f243fe0b048386f9d2d769e1aeb66855b5961dad4869838b8dadbb31d194d5c1ca68d272e84c2b8b1d07aa1525 SHA512 789acb3e32a066104ed9d419d507de224e586d1daff0f1f6c9a47b741c589edf04b36ba17c041ec656f0aa4590e1ac34d5b50bb053ec5b5130447b828ff106c6
+EBUILD pyfakefs-4.6.1.ebuild 739 BLAKE2B 106b475508e75d0cc59630362ac5b424330ff9bbab6521b9b1fd4e47a8a6a828a03a1d65c26d625c9d0e73fa1d00ca94a05f8707fd33439f8235cdded55051c9 SHA512 f64f1538e124fbd96d49c8323dda92f6b21f4f69d67f974f8b6c42a32a89ac567ebf749dda480ef6a35eac8ee950c657a10c74aaca80881d40573612b86eb569
 MISC metadata.xml 395 BLAKE2B 8db2ffc4bcdcf27ed640f08d3f79b1dac72f3609d2113c5e2590c9b127ba0e20bf27f040976a34fd8a08166c455140cbc586da72d22ca67c329717bf5d54798d SHA512 86850a2bdfbc39096105db00d9b249224ab57c1fac71738f0a5df2b83bec7773f4150f7480b18fb066122fe0ed46fbc923a72e837db429b5b322e658bb340010
diff --git a/dev-python/pyfakefs/pyfakefs-4.6.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.6.1.ebuild
new file mode 100644
index 000000000000..54098f2af2c1
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.6.1.ebuild
@@ -0,0 +1,30 @@
+# 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="A fake file system that mocks the Python file system modules"
+HOMEPAGE="
+	https://github.com/jmcgeheeiv/pyfakefs/
+	https://pypi.org/project/pyfakefs/
+"
+SRC_URI="
+	https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pyfakefs.pytest_plugin
+}
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index ef6de5b63979..046d894f6b89 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,7 +1,9 @@
 DIST pyghmi-1.5.48.tar.gz 243927 BLAKE2B 8395aa3bbba752654c2ad73f76735370f31f9548f91e7e0bbb3e52afd2d67a00b316f7e1e25a49ad16004308a635104fa57a00a6bed63639068de86d96e44316 SHA512 f3ee4d44504b2fa5950817e1957ac23c666af6ba36b0ba65dafa5b42036d12d204accf996c75947ecdb5f9533025b9b0d17b0e96612019d622fee678fd0ff592
 DIST pyghmi-1.5.49.tar.gz 244142 BLAKE2B f35b483cc4d48c5bc3fe6bd5c6ac3ea320d7c131a0e77f8ff8af1d14ecdc38972170d93b830070ab8c2d27ec8b8f1607ea0c065af4ad402bd0ee2e25307b9658 SHA512 9c8ce9ddf61b613cba59a49af4f5ebc40e37f83debf10854d2781f6b47fb0fff058cb9f784ed2d527f84ed1bad7c12acb97460fbab6a8552876510634c1bf5dd
 DIST pyghmi-1.5.50.tar.gz 244226 BLAKE2B 461bc9598497ae1f61d772ff223e7e4d2dc62660d41da2b660c4d71241c73c9107e8b0f74e5cf33fa8c9a8e79afaa834e4fb72e584ab2234a2874f9b23927208 SHA512 96fd274d8c7e55b6efc23612f145575e27a9a4949e20495ccfe023ff37dd7103cf0f42134350bf5fc0d1e4f86416981d01c18bd00d97a0b7a738fb5b363da457
+DIST pyghmi-1.5.51.tar.gz 244303 BLAKE2B 9d675de9a3df5c314d5d0bf73cb0086297cf67d07d0f4488c65cbcb7ffa68aaccb9149666eded4c40984c1936a46294f113be07dd5b4e9ad772e3f40d9d29f19 SHA512 ab7f650f984f7677fcac4895c9d75f4184ae3268793c4c6682e2150c2e433b0b6c15ea7008cdd2389b5f2db992e3cae117c2bc2dc13b7d7cb3a19172fc12783c
 EBUILD pyghmi-1.5.48.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 EBUILD pyghmi-1.5.49.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 EBUILD pyghmi-1.5.50.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
+EBUILD pyghmi-1.5.51.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 MISC metadata.xml 439 BLAKE2B 0c7ccbc424041a506c60bb0934e40465b64a9779d4d2b6992ba5d4c8563b114da1470a1b221798773824b92fc7b5d6e7b2f0b0afff7f266ea1fbf450f336c497 SHA512 0c919c41bbef88b080cd5941d767cb3f79e935dfedb6da16353b80da2966d488936768b8ad04c7fc695b3c6376143430115f5533b3492816bf293ab2ccf37fb8
diff --git a/dev-python/pyghmi/pyghmi-1.5.51.ebuild b/dev-python/pyghmi/pyghmi-1.5.51.ebuild
new file mode 100644
index 000000000000..1844c945d4be
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.51.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 pure python implementation of IPMI protocol"
+HOMEPAGE="
+	https://opendev.org/x/pyghmi/
+	https://pypi.org/project/pyghmi/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 31f8883c0fd3..3eefc7bbe29e 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,3 +1,4 @@
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
 EBUILD python-editor-1.0.4-r1.ebuild 413 BLAKE2B b396cfb29e900b833d3e9de1f245f723f57417ba3833556cff2213c560e911ac0e09d7a48e023eef3b8f570f1ae086ff85d7088a219ad335308f7c42b6669a35 SHA512 57604bbb882e8e487f0808d19449294dc21ac0bc503ba272b974a8af1799164345bc206c19bd758ed43e586c7b3c30759aaab8ecbc8c1b4d8b49bc9888c26645
+EBUILD python-editor-1.0.4-r2.ebuild 493 BLAKE2B eae45c16ec69ca447c6ee5a53e12d39f7a9938ab8c755b7ebe8a132bac21c869d31a2fdac3f7b1df33a9867e9eb47674c6a4d1f80ceaee279f43cffaaf00bad8 SHA512 53d41607c163519093d143b5682395d3d163bfe461aaef0479c923cacce45f40a23dc70344a8fef5cacfdf090fc3deffc9f4906390847fde8206261ac59628fb
 MISC metadata.xml 479 BLAKE2B f34e8a8eddc2cf672c14027217798582df17f1a396d9b29bdcbc31dc523e718364ae0cf8254c2145e80ead1a8c1433eed0da7999fdb7bc0a952d6bfa8ec231c9 SHA512 d9a8cfa2722de34a33cf6db2f512e3407dc9aff72b7525cd798ac33efe26550f21e1db5ccda9610799d64e3fc5e9d4e02f0151200369f3c661e44e2a7aa3e71e
diff --git a/dev-python/python-editor/python-editor-1.0.4-r2.ebuild b/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..dc43d461812a
--- /dev/null
+++ b/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
@@ -0,0 +1,20 @@
+# 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="Programmatically open an editor, capture the result"
+HOMEPAGE="
+	https://github.com/fmoo/python-editor/
+	https://pypi.org/project/python-editor/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index cf6bece89ea9..9afde18e4003 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-glanceclient-4.0.0.tar.gz 202815 BLAKE2B a1d6dc46ca77c67bd42e6603b36652cc2ad9464b172b0bea778aa87130a6ed68613dda68db1ad5215e6d2ea34b9ecd96bc0ce853b94fc137b80aa7c85763622e SHA512 31ce9ee865ba543674a9ccc0267f1e02308e444bedfe1728ed59c20abe77cd7936b059c5adb0a8f73e5bf999c5ac5a34ac3cafe2e695718535ead786916e2414
+DIST python-glanceclient-4.0.1.tar.gz 202810 BLAKE2B ccc328aac739979d9ef3b3c4b6cccbef0865860827112c73a7d15d257f1735c69bac54d5771a27d6e6dbfaada4825b624d312a17195b081f3b5800b662c3f926 SHA512 23e931741430c0ba9606b5f013c6724285f8d49691c092c11db97434d963bd257639df769cdbc0e18ea2f5a57c13b03c887e8a091fdb40b292ae6a33f28b4e31
 EBUILD python-glanceclient-4.0.0.ebuild 1368 BLAKE2B c214037962e915dd7cc819fe0cb7e909f6339fbd5c0c4cf062784bbc03bfab6315b5b77b4e0d6188934c6bc998208b37387e659e481075f3703610e2db32a760 SHA512 42546dfe8a3785af744be30a4eee98311dde31a0732d5b021be26b3c239465c46c87278936f81d67eb09bd51ce3d415c6819db629f8c6d072fd4b9f30da59dbc
+EBUILD python-glanceclient-4.0.1.ebuild 1371 BLAKE2B 996adf0be8d7a17b7d055ba49ac0637d932941990d355659659ca46205bde78799a23f260388b506251c02e86d7b2a0f3aa01b50f3be95a837a2c864abf3da62 SHA512 fbdf8ff51ec8bce53bdfca4f24215d0d709ef3b9b3618bfb5f89857a8f5abeaae18911cf023fb7c067d0efd220ba46f228ea97b33bb4763c8827f8fd2c2b1faf
 MISC metadata.xml 663 BLAKE2B 642540f3f4d577797725731f2374b5801ec2d4ad799ee4ccfaa4e29d955bd93a8ade0e6c9ec7712ee27d9f1f93186854472d301016a732020575b8f7bc1c5138 SHA512 fa9b88dce5a10824dd0d6987698587666343c95d8b6c607e466f14883c34fb0ebc846b683ae7d8bb65efe88007e6db0d2b1b41ba389c3b656a24f1839d03d9e2
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild
new file mode 100644
index 000000000000..448af8dee379
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild
@@ -0,0 +1,48 @@
+# 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 client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b glanceclient/tests/unit
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 3211e777c1b2..82ff837488f3 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,9 @@
 DIST sentry-sdk-1.5.12.tar.gz 247388 BLAKE2B 72dc4a5df97656074243045f20cfdbcb15b3d40bb58be06f458a31b52f0168be6f543f83d4641528cb7310f3f5ac1459218397e0e7c0a5131c9bf462e8cfcfb1 SHA512 4d39ba8fd2f490b4e8e5584207c17ace9055668d34a1c43e74a5f05c740b0f38d0794a90cd27edf221d35f5ad76aa6551e117f48167186ce630f7f64200cdad4
 DIST sentry-sdk-1.6.0.gh.tar.gz 249637 BLAKE2B c4d6788c80184ce9127ed85dfb5305363fd27bcbebd74763e4c14c4fed35dd05069ad4a244fa2d8a59f8cb618df22d4d864bf72510fe42600d23fcc6bf8228cf SHA512 d2999831af595ed7f1861ec78887e46887eea8c4c931f22bd4003aede508511287f67eb6100232362a110d16b7bdec892572225440be52a9bd37952c30478f15
 DIST sentry-sdk-1.7.0.gh.tar.gz 251695 BLAKE2B b31a11ee6dcd55960b2d267c26cabdb35a463ab8c081889dceca55ae9ad87c90827875fb75f0912e98457391f24263816d5e61c59551121fe8dede8bb4921a8b SHA512 5595266185618630493eb9bf84c8570f419339b37e8f4afcd4feee80d62d9f678da68d58df081a5361380fe166df589029606ba1d7b70c1844fe174e3292f54c
+DIST sentry-sdk-1.7.1.gh.tar.gz 251834 BLAKE2B e12c16780c3748754b9b104fbb38c7f7aba5fba3186c0ea00f40e742095828bedc926d6c8ed3cae05cc324fde8dac14053035ea4f75fa8f7669dc953e844ea0c SHA512 92d6e04cc6efb3d3272e3afdeb302115d8dfed9907db914bdf387bb257a8175f3d0713041e8c86c64a8d027fbcd3d6d03b4cccba55e6c76e52412ae404de7dc5
 EBUILD sentry-sdk-1.5.12.ebuild 2867 BLAKE2B 713c54d0b7774765790baa3db1631023e16291796d33a1481adef9db6daaa5548a899393d28a68ff3dd1df2df86f6c935c53f410dd9a91d5d7837a0ed11ad0e2 SHA512 1a259533119f6d72f04229d48ad8ae33379c345d08f5ea2c51f75bdf44534de69da266a60db06dcdb6c3fcac21a592a518d0bdffbda8e53b664328919adceadb
 EBUILD sentry-sdk-1.6.0.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
 EBUILD sentry-sdk-1.7.0.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
+EBUILD sentry-sdk-1.7.1.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.7.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.7.1.ebuild
new file mode 100644
index 000000000000..45d775960169
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.7.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+)
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 29ece84ed725..4b7147e09fce 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,10 +6,12 @@ DIST setuptools-62.4.0.tar.gz 2592908 BLAKE2B 5221c32545d451fe9e80f6c78296044fc8
 DIST setuptools-62.5.0.tar.gz 2596847 BLAKE2B 62bfd0271404dd77fbc1085ce8f6b8977d1f2fd3b1ccf5fc260df8875a2cfab9570db466c29646e7123404d9308765ef6cc6b4524b8c8dd3df9912c11b989e31 SHA512 32a9511ed9b2973cd81641458f8e9172b97d95a7dc10535a670ee1fe2ea3cba27ac9f93909c1d508c83293e6a20ab816bb899aaccf449823b5d67ac98bdf2718
 DIST setuptools-62.6.0.tar.gz 2599326 BLAKE2B 7f4200f9d9e94fca17fad2c37dab6c2175f5562703d2913ac11cf34020e65dd6aa7d024536e5294de5fb5e9523419526f0b56282da62ba0ca40e7e164c97260e SHA512 d67c438d507fc7959162b5e8c2a15e9c36d37e5cd7052e16eeb58d8a9bcf19b725a0e7b840e101500799d725bbc4c1872d0f79eead66a538e891cc7cfbe3d979
 DIST setuptools-63.1.0.tar.gz 2599380 BLAKE2B 532f484ea0e40a820ac266e878e6210c953a37f32f6ec51032c2570395c71fe7d59b30f8787a1127c7c2ebfcd76985bd3f6f57b558f01a34eced8797cc6d1aa6 SHA512 367b52dfbd5d1a6980d061a47c1948ee8efd9632f694c21e8d518639b8097fbda8f1735641c25d7528bc11beeffc42d6bcba9e0d9b755d5b6fbb74d26bf7cc5c
+DIST setuptools-63.2.0.tar.gz 2605892 BLAKE2B c9475a64fbe22be348277d25582a0c1789544822a891ebfb8e8e79b122631d31bf3535aac1b408a254c1f29ea9ca20bd9b270e4d78ddc539aea4e3c59a6e7f7b SHA512 e55c19bb95415a5f831fd23dfc32cb79fdad71867bc225f2a76caecb3c188fa6a5dac8d13e131a97d1833672a245b28a53a11ceafd67ac19cacd4a247ba7d291
 EBUILD setuptools-62.3.3.ebuild 4803 BLAKE2B 1b1c45e86f35f7993451244ceb1d89406867cb270100b56d5b61035d760c9a5ddd32126b8b32586b9cbcd7368bfacf770980a029cf9b516de05c6154c0f0d990 SHA512 b8e9c91c91418ac017f9c032c360bd430b9d43e23a50c7c317579b211c9d2f6ea805af3d3384a4a72766913d2e4ce3fd87d775291b9a91b195526060646147b2
 EBUILD setuptools-62.3.4.ebuild 4811 BLAKE2B 690ec6aab3b8fb8b1ece7e0c55a8e7eb92e6ab17270c260aef1c62abd63984bb1231678114a26fcee71c892153a91ed2b1ecf7364e1f0b7d4c550b81deab7c89 SHA512 6e9f1f18746abb4d6c1204eb9e104827d1e49964e296739527a1c64d9009c07f9bb93f9220917dcbb053f8dc74e3974a9fd77917eb3dd98eb887ec103813a379
 EBUILD setuptools-62.4.0.ebuild 4563 BLAKE2B ba1208f6c321c2905b96ecfd7cdc068ef87b5ac43db018c0790149aab910d902c39c35a65459c365a6a04fad7066a000adf0f450d01310b088f05ed2e721a27b SHA512 348b957cbf4f2b97372a2ec74d59b8e0e78bdd605b2c3275aa563f1e6e232b779f2ee569594b6a97776fadfcd251cd1b797ac10db03cc513bba0f2574ad61179
 EBUILD setuptools-62.5.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-62.6.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-63.1.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
+EBUILD setuptools-63.2.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-63.2.0.ebuild b/dev-python/setuptools/setuptools-63.2.0.ebuild
new file mode 100644
index 000000000000..4133756fb9e7
--- /dev/null
+++ b/dev-python/setuptools/setuptools-63.2.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 461a7e29a4ce..6e28e924d31a 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,5 @@
+DIST sphinx-notfound-page-0.8.3.gh.tar.gz 59219 BLAKE2B cdb95906dba4d51aee88b220f094204575f2800737f160c7c028033002d41d2c793a91e1c61101f7c7c960ddf3b4d2ef83fbd285dd73ff5aed6c6c933b1fc1e7 SHA512 8d43ccfd3f83ff25b7a20ee3f5352489092dc641b4a794199c06c0971078a132a42b05c85588508ec38487f2915eedec98c2deac02d6c4576828be2fbc7f13b0
 DIST sphinx-notfound-page-0.8.gh.tar.gz 57650 BLAKE2B e57634ba9a7faf81e6ee8d9b082d96742b580606f2e2fd559842049ba2e80bcb44bb6bd7a9c7eed6038e4c3ddb0416e32fceb4d47a72b8a600443e0020ff33d6 SHA512 eeb5b8da24ecb8f9814540a126f08204ae623705068608c2ee32a4f90303bdaab5f3934bdc36dd06dff047beb0225603f8cfc9b736769836385837047a36a674
+EBUILD sphinx-notfound-page-0.8.3.ebuild 851 BLAKE2B 61b2f12016a962a34246d9f5aff01990eaa63860b15662e4784972eb3a402f28a116ad2172d9c96e9a8df341396764bd8bbb27e1a64a889f103802ec6434073c SHA512 8ae791ee7566315326bd5e4551111eac5b9f868e2d80cc8ee0ac2615b8a4cfacdc13b0cd9c8e7c764f264880cbdb1153604b454dd0b8789c4a18bb11d72fc010
 EBUILD sphinx-notfound-page-0.8.ebuild 684 BLAKE2B 196fc0767066e1dfe51ef8f66665f746901b606bde13a8952bc72c93403d1ecc09cfe68c195fe535b6b5ca859a9d11168e8f8ca2a010df753c546bcf698aa5f0 SHA512 8b06394539060cf62c182575cacf281010c05ddae56cb54cf5ca9eecec64c561bdda1509e1ca39c2d66eb557d0d050a555bd1dea3bb3029f5b9af6bbcd453ac3
 MISC metadata.xml 651 BLAKE2B 7b4c1c58782b6a1e6118744d4933d8bfc1391fef578350f9622dddfb911a4319be8fc2cd2a297d5ac84bb97249d520a1cb740ed00d6314cb3cbf1dce5c119dfd SHA512 4b531fde722c6f0f0709405669efe61cfe2fd14e52f627ee67001b81d5268444b226630f55c6dc6a149ea86699379289368826429754abbad6cdaf36f1f4a673
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild
new file mode 100644
index 000000000000..4d240a8aa65b
--- /dev/null
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded"
+HOMEPAGE="
+	https://sphinx-notfound-page.readthedocs.io/
+	https://github.com/readthedocs/sphinx-notfound-page/
+	https://pypi.org/project/sphinx-notfound-page/
+"
+SRC_URI="
+	https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# calls sphinx-build directly, works around venv
+	tests/test_urls.py::test_parallel_build
+)
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index c498152519b2..5247cb86067e 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,5 @@
 DIST trimesh-3.12.7.gh.tar.gz 10756892 BLAKE2B af1f40b5de1eb60ec3241d342b3ed99fc7dc5e906c71a7669578e539d7c45ab4b037038423efb324cc462dc34a8ac1d1a8134f6b775f1965f2512acd76a8af14 SHA512 35f8039e46f55a3b2e713249d66a658ef48eb8c4a0a6e196f34933fc28052ad0a73953cc4736377bb7b79606ea08b78b132bb9d709fc50da11b2e96aa0e231e6
+DIST trimesh-3.12.8.gh.tar.gz 10758444 BLAKE2B d26fa059d4015bd8b1185665d00da619471908d60dd612a6e761a2334b4f78d21bda5bc25f469be23185964f8b068977208a4e7b41591b20f7669c8f193e926d SHA512 ea6ff5577a72dc56ce89076cdee942b41866ce7bdef1971f86ec680e0ae34fad8c7038741a4a19cb83d355891d415b5e88561ae83ae13d0fc2448c08e06b2ba8
 EBUILD trimesh-3.12.7.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
+EBUILD trimesh-3.12.8.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.12.8.ebuild b/dev-python/trimesh/trimesh-3.12.8.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.12.8.ebuild
@@ -0,0 +1,65 @@
+# 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 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 446cc130d84c..2187a50eb35a 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
index 30426219e374..6bf7a44fcd85 100644
--- a/dev-ruby/classifier-reborn/Manifest
+++ b/dev-ruby/classifier-reborn/Manifest
@@ -1,3 +1,5 @@
 DIST classifier-reborn-2.2.0.tar.gz 319010 BLAKE2B f4bd3259b9d6e324f3f0feb06dfd1c8736eaa8ae0f687e488b6e11b9cda8e6bf9e56a175c01dfb9352184da1a030d1330e22917c7bfdcb4242fa0102f6291940 SHA512 d299ce8f3b96de5c6194e816d880ebb895faaacdc2a19985166bdc3d9760242ec41d85f22167ea66e9afd743f5d91d63881da02882d1a412fc95a0c5db63d04c
+DIST classifier-reborn-2.3.0.tar.gz 325647 BLAKE2B eb663b0e12440e508bbd882e4f72c790445916e5e19234d4d50d5f20a692f0a7bbd45348e898a9782798ccc82568ccc825bc1477f02885cf33f9a9aab90ab10b SHA512 428073f63ce93cc6284275f92063fa092e3cbd99817a2d6650bafc46ac91fba240ce5ccb09f428b10818c24b04de56dd88090ab0d1cffd644b381a88d9c92050
 EBUILD classifier-reborn-2.2.0.ebuild 1037 BLAKE2B c58d59a100eb9b5d94f92a7702a8fb66108818ed76b9ba3a0d867b2b6db03d999aa452d7d094d656910ade838cbed49f2001adc567ece206fb00256836deb297 SHA512 b0d3afcc4447980560faed70446360c40fb8c678d64e0eb11f9bcc102bd5130c3dc41b8e3a31cb21ac59e0cb9609fe5bdefd81e314e6e72e89281b90a2b2bb58
+EBUILD classifier-reborn-2.3.0.ebuild 1054 BLAKE2B 63a6febb5dbd3b81865883a00aa168139d4fdda09a62808850d2984f9694dfe68159eebddb0f3f1ef9b0d5a19dfd9e1fd6e949fd201d1beb3332e4d27d39d1e4 SHA512 daac8269c3987569a9450ca78003225c974518571b2382a0e26ce1282da835081d0ff9ccd8aad9e6469ca2f980b75220b9349980faf67ed722b82fdda85ec204
 MISC metadata.xml 351 BLAKE2B 48faea9b6a17e4edc671f8dc753fdb1968422e34c7c4613b9f7a732cc16fa0440b90c2a70e64a2145045bf175cca4b14955de0fd0af55b85273e64ccbdbf5466 SHA512 5de25b87f655d8e8e029a753e8fb27692b32b8050250b92ce8513637321524db56d6061dc0f7b8c94af2e567ce5f073fda3b5977ad00d416107dcc5e2e95e8c0
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.3.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.3.0.ebuild
new file mode 100644
index 000000000000..7991fe3b1ef3
--- /dev/null
+++ b/dev-ruby/classifier-reborn/classifier-reborn-2.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+RUBY_FAKEGEM_GEMSPEC="classifier-reborn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module to allow Bayesian and other types of classifications"
+HOMEPAGE="https://github.com/jekyll/classifier-reborn"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="gsl test"
+
+ruby_add_rdepend "
+	>=dev-ruby/fast-stemmer-1.0.0
+	>=dev-ruby/matrix-0.4:0
+	gsl? ( dev-ruby/rb-gsl )"
+ruby_add_bdepend "test? ( dev-ruby/redis )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	if use !gsl; then
+		sed -e 's/$GSL = true/$GSL = false/'\
+			-e 's/vector_serialize/vector/'\
+			-i lib/${PN}/lsi.rb || die
+	fi
+
+	sed -i -e '/reporters/I s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index d897e6005f27..bfaef2fbf49f 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -2,14 +2,10 @@ DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190
 DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
-DIST minitest-5.16.0.gem 92160 BLAKE2B 2d7b325e9907564aa1763877281b56347511d0e1ce0224642c4fec9f4e43c25449ee285d48e64fc07ffca063c2821209b07a2c2d7e378fdaf41a82d079ea9667 SHA512 97eda6bbd592dd08528cecd8bc85e0dacdc5417ca1204c182cf0833d5ede36f4ccdd56dd23ffe5fd7d9a859d2bfbfe2a59c989dec17e392749980eff9b3e43ce
-DIST minitest-5.16.1.gem 92160 BLAKE2B 18cd40f199aaa97e642a53e744dd773dde18809f4f0635f9921ba7f9db8464402bc8b60b09dbda95a45bf1afd256e65d685b5158b56bbac9831b0e8dccc52ca3 SHA512 ef01144a9b62a8bb987677789d0eda0448d49e663e9d391749762a282c7dc5cb4c44bc1b9de3e1a188e16bbd1333fd8b7f755f3d64d33ed7259d1541266ff9d2
 DIST minitest-5.16.2.gem 93184 BLAKE2B 005af875bf38e3744bf9de90ec6e964487908a817c19094dcee658963ab2c8882bb1cc4e0b19124b83af9f5da019a8d9e611ba21856f50deca8d9eb1757640cb SHA512 714dc201e9a8a45eefa080ee1a45fa66acb2de0cf624e7c6233e7e1745c35ef9e1a8d24236ecf33f440c05c03f09e017c6ff1e077473b22e3abe5d1ff3126989
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
 EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
-EBUILD minitest-5.16.0.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
-EBUILD minitest-5.16.1.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
 EBUILD minitest-5.16.2.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
 MISC metadata.xml 345 BLAKE2B aa5fc9309fc2803a64737c45818f713867ae504409b879c1481125131fb661a1c71f99d3facb5c7253561b62c32ea4d27c9344bfa0c6ad66a15eb1daea81ff42 SHA512 df9736bf7588243c9d1ff886c8b428237cf96f239fccbfe6561d60b910a07f70750db6576d3aa4597746d18fcce8a708f1aa9be4f9f2796823d1a4e154c6fb4a
diff --git a/dev-ruby/minitest/minitest-5.16.0.ebuild b/dev-ruby/minitest/minitest-5.16.0.ebuild
deleted file mode 100644
index 82de4175ebb6..000000000000
--- a/dev-ruby/minitest/minitest-5.16.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	export -n A
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.16.1.ebuild b/dev-ruby/minitest/minitest-5.16.1.ebuild
deleted file mode 100644
index 82de4175ebb6..000000000000
--- a/dev-ruby/minitest/minitest-5.16.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	export -n A
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index df5d76a5f35e..a61b2a2d75fc 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,3 +1,5 @@
 DIST nokogiri-1.13.6-git.tgz 6249974 BLAKE2B db6a7fd70cd88fa784e70fd33102ad2a0d65a848a713bd93907d3c77b7ecc101a4f0a38febf3265b25967e045bf9091e46cf319702c08319e32f94d57a946985 SHA512 96f4e52332052bfae0d88d8c93cf334f8484b51290cafe8c1d43c820ba6ac5aa74b187c37e7177e62435d6101d859c16555b715fa88fcb06da742c84fd0e7486
+DIST nokogiri-1.13.7-git.tgz 6250903 BLAKE2B b8756a8af2428518451acabf629e5f634a526bcd184c6884ff90f3014ae71d700895527ff571f743929e168e39c1fd9a83cb55a8327c3b12e069c0804f765579 SHA512 34f406681fab399221306366ba8c82a2030164641bd9ec8502c8e0ecfd02423b5635517d2c6015f97cc80bcc2be83d81bda6038f61b59352d7348b591c411711
 EBUILD nokogiri-1.13.6.ebuild 2670 BLAKE2B 6009f73f5b582d3878493e3ab0f7b59cbeb50913b1e09ea13f0a49a840ad6bfc2fdfe7deb140881b257b13c3d9f57049859a4d01dfe646bc41d4f7c0dd4373a2 SHA512 c322190d601225828de7552499025653186648706aa467c542c68c2d6e0f1f625a4f3b2a24f9aa76e983fc52f4a98c8bf3dfb1a27aec64613342334a482bbcba
+EBUILD nokogiri-1.13.7.ebuild 2677 BLAKE2B 1ae1bf065c3b133079db326680678175c5cbf6e03e1d593488846ac8caaf47c5d47d030eabba77f5be4b646b10bdffee2fdc8cbb7cfbfa9ad59430fd41bb6118 SHA512 d1578456113d75e9e289c6a5e4a2bdc982ea2f46c17d66e4a773f327c17249f23afd85d3d2fa10a46f0ddf78b2afa508ca1230eb98af02595f5c313686ab8572
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.7.ebuild
new file mode 100644
index 000000000000..d3d2a1eac8bd
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.13.7.ebuild
@@ -0,0 +1,95 @@
+# 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_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://www.nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.14:=
+	>=dev-libs/libxslt-1.1.35
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.14
+	>=dev-libs/libxslt-1.1.35
+	sys-libs/zlib
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9d12534bcd74..01ad964160b1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 4163ad1ed541..71c8630f101c 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -44,5 +44,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.24.2.ebuild 1547 BLAKE2B 5cf029c39359a849967442ee3514e218e084e914e04fc6c16206d7be0f38960f7b2d2efc3ba74ea9e9a0fd11d34c8ccd440adbcc4f8e613cb9fa84b2ba9bc5d5 SHA512 80f6ea412c6a3f6cca90b0b98104da20607038f228bf34805a6f89ab352b39eebcff58899783a3ca9f6378cd4bbcb2dac707dc7a36ecc565358af535507d8071
-EBUILD cbindgen-0.24.3.ebuild 1548 BLAKE2B 6fb8024e057fbcc2119da52521bc10e63ebc393fbb759c2818c3c71d03dd1fc62f8b9ee28d567c52d3ba13f0aa6e2d31e87bd9ac48b91d831449fa61f8874311 SHA512 5f61df0b3057e13d4afc38eaa26953dbdd7d4d07e5128261fba989a5d1df6ef7daaa34891fb81389a206e08e0e3db12328ca1e5f47c1dec01d2d5b2a7e462f5f
+EBUILD cbindgen-0.24.3.ebuild 1547 BLAKE2B 5cf029c39359a849967442ee3514e218e084e914e04fc6c16206d7be0f38960f7b2d2efc3ba74ea9e9a0fd11d34c8ccd440adbcc4f8e613cb9fa84b2ba9bc5d5 SHA512 80f6ea412c6a3f6cca90b0b98104da20607038f228bf34805a6f89ab352b39eebcff58899783a3ca9f6378cd4bbcb2dac707dc7a36ecc565358af535507d8071
 MISC metadata.xml 335 BLAKE2B ec3adc5159ac8268dc5c075840ae2999fcb90287bad12dd094f6ac7d5f810b6adf2a83f66daaf211ceab5f11ce1e1184d8e451de8ad5e16f9cc8cd7114246585 SHA512 e4033b997924d22d914efc9867f95a1e4ce09790862f9e0929de93832f5fc779537312f1e8c1dc17462e5543f599181104079bfc59305450fdeb375279bd1b29
diff --git a/dev-util/cbindgen/cbindgen-0.24.3.ebuild b/dev-util/cbindgen/cbindgen-0.24.3.ebuild
index 64d96a7c0000..83bedb2ad35b 100644
--- a/dev-util/cbindgen/cbindgen-0.24.3.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.24.3.ebuild
@@ -64,7 +64,7 @@ SRC_URI="$(cargo_crate_uris)
 # use cargo-license for a more accurate license picture
 LICENSE="Apache-2.0 BSD Boost-1.0 MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RESTRICT="test"
 QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 6e6af94ac729..98145d148853 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -2,5 +2,5 @@ DIST cucumber-html-formatter-17.0.0.gem 434176 BLAKE2B 9bab7b11d2a17b6bb7fb1a812
 DIST cucumber-html-formatter-19.2.0.gem 478720 BLAKE2B 1f2f6b2f93d63207cb2bb6e23ad14d71eb06a8363c7af7f417e4755ffffb2beabe8502ed5d82a881c072b911a42cb1fc2f1809e7326c223c00c25a36482d052b SHA512 c5f1453677b4df5e9091721bbb15a522f5c91cbcb2cb11a8c1d8f2577d8b3b93810698447a1fe1f2b80dc52a1bf798ffcb876b2c728ceaf109f1997a2fdde249
 EBUILD cucumber-html-formatter-17.0.0-r1.ebuild 735 BLAKE2B ed8d7ec94b48832259dd17e2f12040be23a43f2b4fca8c5291f863ebe0619d982c3bd9eb7ea026e2c96f0c6655d8720c142fb94218e2af75bd4b6c831c7b5fa9 SHA512 4333c64c181032bd77160a9dfc6d892484c20fb4aaf68f9ca1cd50a9257707f6949922549f7850be0ce82ee75cb9997f4bb4e701c3e6f8566493e142d8c739e3
 EBUILD cucumber-html-formatter-17.0.0.ebuild 704 BLAKE2B 29616fce3908431d835aa648a448c50bd5d199e5bbb5a4e8fc7efeca21a5a443d143eec2d674fd7407d261e03d5df342030dd8e391104a75ab68f588db1d046b SHA512 a7b8cb61f15d74b69599fcacbc833fda58a5043b1b22b8accdbe8d38512c0e1942f7001d459179c9a10942c43e385cd3ca2c4a5662fef2a15ff3cb2c8a0da498
-EBUILD cucumber-html-formatter-19.2.0.ebuild 755 BLAKE2B 31bccc1212ec20b157b92243fe3b5404e9fcb0ff4598b0261cbb55dc941044fea86f814ef644ad6bb28e1fd4d7350e9b9f6454a9934066a465f31d8584011577 SHA512 8c5d5173e62c96ce75ccc3aacb922334c9286107006462d8d767b6cbf3aa1046af1e3bb389fa4a7c77e15767510d454e589983d9d5d89746cef70f9067ba1d82
+EBUILD cucumber-html-formatter-19.2.0.ebuild 834 BLAKE2B 7f550c77a00874d1c343f7f6a5aa48764c89bc4a5e946ef0fc2c3320ab03471eab31b3f2928fe6664065b97db7a9691a995269500527b01bdb6392b6d2503962 SHA512 f946f7acc8b980c1e68260cd6922777e90019ede7a60310206d6c429c83e2749fa3cb92294b523592e3756c8650baf1c46092b4bbc50255c5c6619308042fb39
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild
index b0b901679b89..d0858f840aed 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild
@@ -25,6 +25,10 @@ ruby_add_rdepend "
 	!<dev-util/cucumber-html-formatter-17.0.0-r1
 "
 
+ruby_add_bdepend "
+	test? ( >=dev-util/cucumber-compatibility-kit-9.2.0:9 )
+"
+
 all_ruby_prepare() {
 	sed -i -e '1igem "cucumber-messages", "~>18.0"' spec/html_formatter_spec.rb || die
 }
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index b1e1f986b758..4ff127629031 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,8 +4,10 @@ AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090b
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 DIST jenkins-bin-2.332.4.war 94930441 BLAKE2B 9502d7fd91d0ffc6871ff0613061883bef98442cf69469ef6bd1cc23fb1849d0b8e70aacf27e2807281a575889c34c574a84caae0226c8fd922fea0bdf334485 SHA512 e187804f8ab1454b56e88b89b258ee57e1c4c2069ef33d87e78e2797252498817edbed15208ec3644a77d51d51afebc0c12e226cb24068bb21a415f21d9727bb
 DIST jenkins-bin-2.346.1.war 91193351 BLAKE2B 21a0f2ec258498e447a25527e82ad6e7e0b061daaa9647f244930471629de4805755648f6a689598e048e3ffa72879d1dba88a7a4d5ce3fe5bff287f6cd395ca SHA512 63a34dcf66714b6db405a46ca6677693458f49cb61ff413c8c4bcffe6e10eff33ead5dc2e4f3eb3560980c33f1dbd67c3f51655d578ce5cbb19e1ddf871aa545
+DIST jenkins-bin-2.346.2.war 91198171 BLAKE2B 074bd7004d6244233da563c3d64626d0532f76b802ebd9056230cbbbef3381503b80daf4bfa0ec8866c3fcf9596cb0f8b53fe725f340452b755b092334437b5a SHA512 c1f579a667cabd1de00bb5b6db82c60b2089a82126ea07efe7bb1c987fff96f1e05bc20c28abc97c7e05be158df59968ac4ed330e8459bc438e3e7169d84a5dc
 DIST jenkins-bin-2.356.war 90781388 BLAKE2B d65e1642a118cfcad66c4585bfe4e30cea8a5e8b598a6ba33b298a158fb2901d0b388aec9087d243648f51067661cccfb610948129f35c40c5c5bba4d3fb89e0 SHA512 2b602cac61101e4f47a23727b682684cec6afac7a867606f5210f5213a78ced0d0b1a2bf10507c26c58e480217a59b906626c80d133504f8d195a6e9e8fed94c
 EBUILD jenkins-bin-2.332.4.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
 EBUILD jenkins-bin-2.346.1.ebuild 1123 BLAKE2B 8a494477de627fa4c185d560621ab910783d11320b0b500cfe738ad5cd3bd6820faed9c8b72345ed60aa9984cbb2e4b6060319bc23c9f38f499413df66994ee8 SHA512 b6280a876876976f3380440e7795ae043262d5315bba75e3531abfcaf629dc657e4e77e7e4a31b3473c34095da0bd8af8aa5bebfbb4cbc9171d3029e85036b75
+EBUILD jenkins-bin-2.346.2.ebuild 1123 BLAKE2B 8a494477de627fa4c185d560621ab910783d11320b0b500cfe738ad5cd3bd6820faed9c8b72345ed60aa9984cbb2e4b6060319bc23c9f38f499413df66994ee8 SHA512 b6280a876876976f3380440e7795ae043262d5315bba75e3531abfcaf629dc657e4e77e7e4a31b3473c34095da0bd8af8aa5bebfbb4cbc9171d3029e85036b75
 EBUILD jenkins-bin-2.356.ebuild 1116 BLAKE2B 645d4d7c3df6e0461fc6ddf2579b3c361fedcceeeff651ad9758d0240d66c70b7d0f83e6c8ca59f07df4094b56001f2d610f6fd607e56fe3de93cdc504270776 SHA512 c905cc7fa57702c542ceb856b5420903412ce035270a0c3aba2d5f2282d5fdce5a9dfe0a8750fda034ae0aba6d2b74912f8694ec2159b17d54185a1da008721e
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.346.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.346.2.ebuild
new file mode 100644
index 000000000000..eb0ff122fdeb
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.346.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 98aac9e201a0..8e1598cc3fa3 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 6e23323c879e..e2db311f0956 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,6 @@
+AUX kitinerary-22.04.3-zxing-cpp-1.4.0.patch 2462 BLAKE2B a2010dadb224c7c50f28a14aa4197db6dc7298768f929d9d773358308f04e76bd3bf3c52f7a2383712dc5000488070f0abee09068c790505e6c7c735ae527842 SHA512 5fbf56603b346a44de87de04fbc332db120398e4d43c3828657667b804626b6272e0e63d26dce2ba6130477f23d3b587fe0555976989ba0e1b95c58ce558ef32
 DIST kitinerary-21.12.3.tar.xz 1860556 BLAKE2B 86e0d690f6dc865ac9af5866a89bf75afb7ea6b5440487755eecc7c2961f914ac39a1aa47c2d12333961f8e42c47840184f7812ea1fdfd94b61ab283d41b410b SHA512 8c02158a2ee18815e0d7e51c82d318a3a37c9269ef9e51e66af1bf2b4c93fb97597f5ee7ed2eaa8dda8c85207256286a8dd5904031b87a7474b53ae28853e3e5
 DIST kitinerary-22.04.3.tar.xz 1530056 BLAKE2B e5439361dfe7e027c3faa160a83947d3d13ac900e4ec6fc8d110a057c5879856d9d91e6127f7b78a18218e55a7140a7469ad68507f0e6f104a4ccdc8e5557a6c SHA512 c3ce7c2890023df35f11566cf8dcc43381b0a8b282dfe39057bf3de74dbd485532253636d9e0903520e851b5ea29133cc5a984ca0451b0d3ab7acdd4a97a3094
 EBUILD kitinerary-21.12.3.ebuild 1220 BLAKE2B 3870601287a20f2ff6f9396af162fe06cd4105bc1f951f0d06fd6c4f954f660ca63ffcb1ca02c29a52c41615ef6cc3d20eff89ed76ee06a03b8118e6a88fffc6 SHA512 bd1b0912678036310aa1bb3dbc7ceceec399efc3cb1967e05f9b4f53b99c22259b85fc3f1cf3f03b1567b809a140902a35a372916cd3f6b27cba2765f56e2d95
-EBUILD kitinerary-22.04.3.ebuild 1228 BLAKE2B dc828c3016b8ecc3a5fdb019d6d513b5ac94641922eb71a1832c59c83f593fe7bbf236deefff6ea81a711f2938c58ff44b1d2841ba11d830399c8a6e418b1ac8 SHA512 a3a252584616f9da621f5c1e961960663717d15fa9c3753e784cffbaaf88dca9403dcdd8124c0434b9b0294a38aaadbb36b7a839ce866e02e44191d09dd33d6b
+EBUILD kitinerary-22.04.3-r1.ebuild 1284 BLAKE2B b9ae48a6126855b5e0f594bef14ae4f5ad12feb05342c37f672a2ae0afacdce5b8a46a859ff5d9ae01ea4e2a9fe5cb5b4dd131d738cf63d9f4fcc40cdc984744 SHA512 82062e57c6a2d96002adcd015fd965677182713dbb171bb813ec4219fd0ce9207421782ae8bf65e14d14d27c812ca2629c78d1d9ccfdd5608a011280af9e6da1
 MISC metadata.xml 454 BLAKE2B 47c8910a8a5d54d2ae4242734dd99c24bfc2aa9a753dc4732433717975dada407d62f2487f6ac57724087e73a622dd9056ab0487183cd411b971200d40736dc4 SHA512 e23256862ef83d5b99bfe3bfd1bedab7b1c1a50cb204e5aa1d431a17afb1450e0caf6460c804dc1f907f3ce9089d51d4742192e668a01408a7b4d2b332b6c00f
diff --git a/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch b/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch
new file mode 100644
index 000000000000..a208d2bfaed7
--- /dev/null
+++ b/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch
@@ -0,0 +1,68 @@
+From bf83f8bd974925aec07a2e8dbfd50ad39995b428 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Fri, 8 Jul 2022 16:04:19 +0200
+Subject: [PATCH] Support ZXing 1.4.0
+
+The previous code crashes (if it builds at all) with ZXing 1.4.0, so
+distributions updating to 1.4.0 would need to apply this patch on top
+of 22.04.3 as well.
+
+(cherry picked from commit e60195421aa159462353892ed32bf46ac8c57d19)
+---
+ src/lib/barcodedecoder.cpp | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/src/lib/barcodedecoder.cpp b/src/lib/barcodedecoder.cpp
+index b38140a..40e0c64 100644
+--- a/src/lib/barcodedecoder.cpp
++++ b/src/lib/barcodedecoder.cpp
+@@ -15,6 +15,7 @@
+ #include <QString>
+ 
+ #ifdef HAVE_ZXING
++#define ZX_USE_UTF8 1
+ #ifdef ZXING_USE_READBARCODE
+ #include <ZXing/ReadBarcode.h>
+ #else
+@@ -244,6 +245,30 @@ void BarcodeDecoder::decodeZxing(const QImage &img, BarcodeDecoder::BarcodeTypes
+ #endif
+ 
+     if (res.isValid()) {
++#if ZXING_VERSION >= QT_VERSION_CHECK(1, 4, 0)
++        // detect content type
++        std::string zxUtf8Text;
++        if (res.contentType() == ZXing::ContentType::Text) {
++            result.contentType = Result::Any;
++            zxUtf8Text = res.text();
++            // check if the text is ASCII-only (in which case we allow access as byte array as well)
++            if (std::any_of(zxUtf8Text.begin(), zxUtf8Text.end(), [](unsigned char c) { return c > 0x7F; })) {
++                result.contentType &= ~Result::ByteArray;
++            }
++        } else {
++            result.contentType = Result::ByteArray;
++        }
++
++        // decode content
++        if (result.contentType & Result::ByteArray) {
++            QByteArray b;
++            b.resize(res.bytes().size());
++            std::copy(res.bytes().begin(), res.bytes().end(), b.begin());
++            result.content = b;
++        } else {
++            result.content = QString::fromStdString(zxUtf8Text);
++        }
++#else
+         // detect content type
+         result.contentType = Result::Any;
+         if (std::any_of(res.text().begin(), res.text().end(), [](const auto c) { return c > 255; })) {
+@@ -262,6 +287,7 @@ void BarcodeDecoder::decodeZxing(const QImage &img, BarcodeDecoder::BarcodeTypes
+         } else {
+             result.content = QString::fromStdWString(res.text());
+         }
++#endif
+         result.positive |= formatToType(res.format());
+     } else {
+         result.negative |= format;
+-- 
+2.35.1
+
diff --git a/kde-apps/kitinerary/kitinerary-22.04.3.ebuild b/kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild
index 9bdd9db4d9d9..75600a759039 100644
--- a/kde-apps/kitinerary/kitinerary-22.04.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild
@@ -34,12 +34,14 @@ DEPEND="
 	>=kde-frameworks/kcontacts-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	sys-libs/zlib
-	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
+	barcode? ( >=media-libs/zxing-cpp-1.1.0:= )
 	pdf? ( app-text/poppler:=[qt5] )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="x11-misc/shared-mime-info"
 
+PATCHES=( "${FILESDIR}/${P}-zxing-cpp-1.4.0.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		# sci-geosciences/osmctools; TODO: useful at all?
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 960a99f64f0d..0d8bd8444bd1 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 642f23674f7c..21676bd448c3 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,7 +1,8 @@
+AUX prison-5.96.0-zxing-cpp-1.4.0.patch 3823 BLAKE2B dca7abe43f82012a23504779556940c039de12ba0154e76d6450026c265c5be7d1af3462fa54ccd12e5c2eae7bbd641a3a0631768932a888f9658e75410a6e62 SHA512 3f3f059440392443c5c4594192b6a9d3597b2af2a11bb960d98269c86448d4740739c497e2b043446a4aca88d5bb5b99d2797849af8271207be9d982cd4503da
 DIST prison-5.92.0.tar.xz 47936 BLAKE2B 72b919e042d471dbcd87faa081b00abdcdb9b708b4cfdeba4ba09c0d013b3b8cbf35220768b821e198b2fefc916472117e50be320268707ff1a5e44ff31074dd SHA512 18bb9f5a804cc80cf3770c1d4149ef075650357e81642a230810a08b780c35c563a3c629839bf8a0ca39d9b1ea01d24862a6cf1992dc5577fd1d853c8ab87b5f
 DIST prison-5.95.0.tar.xz 55364 BLAKE2B 1ac147e0967080ca3fa920f83da42f72edddddeea52dbbfb08f85575b48bd95573e046187c8ce505ea02d44adbecc7ad9a91b91c1222316cbbeb1aa644e2a5c3 SHA512 83369da86f9b7ddd813f7a90367943ffc4eb066260ad9999545aa77cab0f6783531d2cf2081715e3ffd70fac377cdea221b79b626127c8773bf96c249536f990
 DIST prison-5.96.0.tar.xz 55380 BLAKE2B f6fd3467283a1d7980d070f77031d72bec4d94da0da30f99e360ec6cc160c1041d0025227df41649a0c20c4c247e99269c28e146aacbe5dae293a2f13457e562 SHA512 1bb85d4e8e6cd349cae559d5a933e606896ced077b850b4cac1a50f374ac2b938d01095c83a8bdb76af31069c17dfb07102a3a9f3c62ae9832f5b3846335a078
 EBUILD prison-5.92.0.ebuild 642 BLAKE2B deb3edce82f6ae3a545505bda1530f6d6ed0d90f3816647d2f020ff8cd7cc6fd4ab4c9500f59c5cd458f7bbde2af0c6c5e0b09c3d99bd42ec25eef33187cad75 SHA512 1980afcfb4b1e46884c2600bafb046f7dc7adad522f0e11563edec60d6cf92874e98e5a992b0a0160c8a73e24de44f1165f9c10fb4a57e1217d1e0da18c3a51d
 EBUILD prison-5.95.0.ebuild 686 BLAKE2B ca129f97595bf978e7cc3752e712364e890220d8d097029874c08fc5d7fcc270232d3ef5ee6a29c30ebb177e778bb758bfdc2c2e0d57b85aa06f37477b4b7ca9 SHA512 f7692a21c38560e016e73024c6a9c26b86e4451b94ef76fea28a411ab31f83e94e33fc571934635f33bb9a2b42bf2b1808d8873cd24c9b8b783d3bee5557bf3b
-EBUILD prison-5.96.0.ebuild 697 BLAKE2B 7c0828a494cb22ce6574a93af94f55036954c7fb3249512d67c05d1ffd12f9f7dac9d4e4c210db5ddc5a27fef75e3e14564cf8a8f7907dea51c5e8b8618ac90e SHA512 d717572a22f7d5d4467e4a567670dabeb0316210e1f23782dde323aaba2c4b8fe11d5c79902f6ab3faee2fa6498852b409515d9096b3abd4e9ddc2b9159ad98c
+EBUILD prison-5.96.0-r1.ebuild 753 BLAKE2B bc8c3f7fa733acf20017529885c41af537b73bd807d76cba1970310e939f862ab1ea970afac1c4fae94bb68935bed1e32c3780b771e3c7949b3937dacfc721c1 SHA512 d0a62e6396dec36fdddad8a7aa8e9be265fea2c7fdee9acc94f29e8cfa0ad66b393fbd6c4384bb5059e32f62beab7979f78907ac2e5704f180560441add7f0a8
 MISC metadata.xml 560 BLAKE2B 3c60b8b8f04fb43ee27b250985d080758dfb521e4ed3ec0ee94dc36c57db90701504490a0b56bfad2ea9bfc7c6d3e76a4f68995c1b7d9213104d13a8de622259 SHA512 7c3c097098192485a17926575bc5d9a008c480ad01fbd89f94b218f709a2d8b7d913f067548cd51579a65e43c3d0847b0567e37ce9bf1b8ada53f212650f0144
diff --git a/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch b/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch
new file mode 100644
index 000000000000..8971bd919a08
--- /dev/null
+++ b/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch
@@ -0,0 +1,107 @@
+From 74e34fa35a59098db7c4358b788ad3ac0a5745f7 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Fri, 8 Jul 2022 16:18:47 +0200
+Subject: [PATCH] Support ZXing 1.4.0
+
+The previous code doesn't build (and when made to build, crashes) with
+ZXing 1.4.0.
+---
+ src/scanner/CMakeLists.txt             |  2 ++
+ src/scanner/config-prison-scanner.h.in | 14 ++++++++++++++
+ src/scanner/videoscannerworker.cpp     | 17 +++++++++++++++++
+ 3 files changed, 33 insertions(+)
+ create mode 100644 src/scanner/config-prison-scanner.h.in
+
+diff --git a/src/scanner/CMakeLists.txt b/src/scanner/CMakeLists.txt
+index d5b9cf5..ef690c5 100644
+--- a/src/scanner/CMakeLists.txt
++++ b/src/scanner/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ # SPDX-FileCopyrightText: 2022 Volker Krause <vkrause@kde.org>
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-prison-scanner.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-prison-scanner.h)
++
+ add_library(KF5PrisonScanner)
+ add_library(KF5::PrisonScanner ALIAS KF5PrisonScanner)
+ 
+diff --git a/src/scanner/config-prison-scanner.h.in b/src/scanner/config-prison-scanner.h.in
+new file mode 100644
+index 0000000..d80ceaf
+--- /dev/null
++++ b/src/scanner/config-prison-scanner.h.in
+@@ -0,0 +1,14 @@
++/*
++   SPDX-FileCopyrightText: 2022 Volker Krause <vkrause@kde.org>
++   SPDX-License-Identifier: LGPL-2.0-or-later
++*/
++
++#ifndef CONFIG_PRISON_SCANNER_H
++#define CONFIG_PRISON_SCANNER_H
++
++#define ZXING_VERSION_MAJOR @ZXing_VERSION_MAJOR@
++#define ZXING_VERSION_MINOR @ZXing_VERSION_MINOR@
++#define ZXING_VERSION_PATCH @ZXing_VERSION_PATCH@
++#define ZXING_VERSION ((@ZXing_VERSION_MAJOR@<<16)|(@ZXing_VERSION_MINOR@<<8)|(@ZXing_VERSION_PATCH@))
++
++#endif // CONFIG_PRISON_SCANNER_H
+diff --git a/src/scanner/videoscannerworker.cpp b/src/scanner/videoscannerworker.cpp
+index 45792dc..947367c 100644
+--- a/src/scanner/videoscannerworker.cpp
++++ b/src/scanner/videoscannerworker.cpp
+@@ -3,6 +3,7 @@
+     SPDX-License-Identifier: MIT
+ */
+ 
++#include "config-prison-scanner.h"
+ #include "format_p.h"
+ #include "scanresult_p.h"
+ #include "videoscannerframe_p.h"
+@@ -12,6 +13,7 @@
+ #include <QImage>
+ #include <QTransform>
+ 
++#define ZX_USE_UTF8 1
+ #include <ZXing/ReadBarcode.h>
+ #include <ZXing/TextUtfEncoding.h>
+ 
+@@ -25,7 +27,11 @@ VideoScannerWorker::VideoScannerWorker(QObject *parent)
+ 
+ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame)
+ {
++#if ZXING_VERSION < QT_VERSION_CHECK(1, 4, 0)
+     ZXing::Result zxRes(ZXing::DecodeStatus::FormatError);
++#else
++    ZXing::Result zxRes;
++#endif
+     ZXing::DecodeHints hints;
+     hints.setFormats(frame.formats() == Format::NoFormat ? ZXing::BarcodeFormats::all() : Format::toZXing(frame.formats()));
+ 
+@@ -173,6 +179,7 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame)
+     if (zxRes.isValid()) {
+         auto res = ScanResultPrivate::get(scanResult);
+ 
++#if ZXING_VERSION < QT_VERSION_CHECK(1, 4, 0)
+         // distinguish between binary and text content
+         const auto hasWideChars = std::any_of(zxRes.text().begin(), zxRes.text().end(), [](auto c) {
+             return c > 255;
+@@ -188,6 +195,16 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame)
+             std::copy(zxRes.text().begin(), zxRes.text().end(), b.begin());
+             res->content = b;
+         }
++#else
++        if (zxRes.contentType() == ZXing::ContentType::Text) {
++            res->content = QString::fromStdString(zxRes.text());
++        } else {
++            QByteArray b;
++            b.resize(zxRes.bytes().size());
++            std::copy(zxRes.bytes().begin(), zxRes.bytes().end(), b.begin());
++            res->content = b;
++        }
++#endif
+ 
+         // determine the bounding rect
+         // the cooridinates we get from ZXing are a polygon, we need to determine the
+-- 
+GitLab
+
diff --git a/kde-frameworks/prison/prison-5.96.0.ebuild b/kde-frameworks/prison/prison-5.96.0-r1.ebuild
index 31bf1b57480b..4173c4d0a8ba 100644
--- a/kde-frameworks/prison/prison-5.96.0.ebuild
+++ b/kde-frameworks/prison/prison-5.96.0-r1.ebuild
@@ -18,13 +18,15 @@ RDEPEND="
 	>=dev-qt/qtmultimedia-${QTMIN}:5
 	media-gfx/qrencode:=
 	media-libs/libdmtx
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-zxing-cpp-1.4.0.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt5Quick)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9e5885f4d21f..0c19a0b7c5a7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ttygif/Manifest b/media-gfx/ttygif/Manifest
index 65f06f772bb8..a7a412b08e26 100644
--- a/media-gfx/ttygif/Manifest
+++ b/media-gfx/ttygif/Manifest
@@ -1,4 +1,4 @@
 AUX ldflags-support.patch 550 BLAKE2B 1cf7bc0cb2a9ce13654524204e7b3d47e9df1a0d4ceb5e60e63c52c2d8508d6d8dfb353be35147d8419fa57d4fdde2bc00b9b12292de789d0d559caa25c60b5b SHA512 ec238c42a9b7574ee7b18b8fd2d2aedb23bb4b86981fdccb09aab8e5671c4f9494d448f9d9ecb5f4279cc1c2ca850a64d80364de002430278986155332116dbb
-DIST ttygif-1.80_p20181218.tar.gz 8428 BLAKE2B 376b6dca4d13120b90e3055e8a37acd017aa7966267d6ad76af6eb2cc4155c8b8ce9d618c682cf1c999095c96ae78e11ec343e0752362851f9a2b660820dc403 SHA512 f992094c0baa625106eefdebbde1d91f2686c0b01c4b3ec22ec9339c88df42c830e4417338c685b375646b212db0213983b41b8d6ee9bd9644dfb56f6db31f52
-EBUILD ttygif-1.80_p20181218.ebuild 778 BLAKE2B 33aa6ced690ecc8288bf29280d76b7865d07cade08b1a087d91dca46de00a24217e13daefc128fbbcb9465b8e68c6ad0c5f0f55e54320c42322a95c1277305bf SHA512 f7560108e89aef4fe4884b9e9b31de73fe3baf86a0a709124d67ef5a87d1c6efa2475b26f675340ae24e08d31545bdf848e47070bebd3c6d466b8e8da2cf6906
+DIST ttygif-1.6.0.tar.gz 19288 BLAKE2B cd8a8da6b824f4dc219a9e08bcce7cb1a805d634335fc2bc51b9f79baa96e54ffb4308e4c0924b448ee7a1be53f0391206b3c9eb8705549f41ca7df738cff37f SHA512 3a344d3307a3f2ea96093c39c528452f85c5ee9007a8dd472ad9cd286428753c3b1c11b39c21cf152958e1eee9971798a26bb33374b650b8a7da2f8238c954bf
+EBUILD ttygif-1.6.0.ebuild 694 BLAKE2B 467620c5811294acbb809c76b91d2c974023a184ec6caa11699e1dba6816da60a997bde373ee3e1e4f10d0b623bc102dcc2615f5cd06f2e09273e5aa459d0236 SHA512 b4ad645b897d7cb08dd363cfaaaee8fe90c0102fb9cd599d711ba8644885b83918866b402538f3e516e7d3131395380034884f47aba4ccfdc4eab3733f1bc294
 MISC metadata.xml 340 BLAKE2B f9763d941976e5d058e4de954dd992640b7c66c251b32ef2dd755be4c61b1cf6939decd2e3075cdd30ce41bebbd411333484918dcf3b4c50e9baa7e9c8fb4fb7 SHA512 a3b915f1e53a23515a767fa21a459e6298bedb5acff522a65efd736258a04903efe787784e3a2ba0898a6722cd13a549d19fdd2a83eb85f7333bf08f8a55e371
diff --git a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild b/media-gfx/ttygif/ttygif-1.6.0.ebuild
index 299f1934a05b..f1ba96ef0f4f 100644
--- a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
+++ b/media-gfx/ttygif/ttygif-1.6.0.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit vcs-snapshot toolchain-funcs
-
-# Commit Date: Dec 18th 2018
-COMMIT="362bc381c1c2449509e732d68f07656caf46b420"
+inherit toolchain-funcs
 
 DESCRIPTION="Convert terminal recordings to animated gifs"
 HOMEPAGE="https://github.com/icholy/ttygif"
-SRC_URI="https://github.com/icholy/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/icholy/ttygif/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 DOCS=( LICENSE README.md )
 
-PATCHES=( "${FILESDIR}/ldflags-support.patch" )
+PATCHES=(
+	"${FILESDIR}/ldflags-support.patch"
+)
 
 RDEPEND="
-	x11-apps/xwd
 	app-misc/ttyrec
-	media-gfx/imagemagick"
+	media-gfx/imagemagick
+	x11-apps/xwd
+"
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 699594844aa0..4a57ef3938e4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 154a2a1d7168..96362631e11b 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,4 +1,7 @@
 AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
+AUX mup-6.9-build-system.patch 6205 BLAKE2B f944b6dab3d206dc5fae2c5f08c36bc24310094c5cf9f7ab15098a2ace87d2bb5863eb08f254d0c2e34d0ec2e1c3eaf18f7e6e0161f6829b74fd56d1edbfd7bd SHA512 3a26e09748e89857a8f30c7b3d0fc567e46cb7494148467cac491cc0ccea4aaef25bc7364fe808931000321489a09101d357d996daa24b477c693b4e4b20a329
 DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
+DIST mup69src.tar.gz 3062560 BLAKE2B cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92 SHA512 b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95
 EBUILD mup-6.6.ebuild 905 BLAKE2B f3b807f60097085b05c04689fda392c2b1967ac604cd6884ead3a27356785f58ec78881191b02376af667b24f38cffeceb2e1a04036fdf2099dcf29d279bb68f SHA512 140c359ef8440ee3e88a25fb83f5004f3610abb4ee6bfbf5fcc2f9cca08e4ceb0fd3fdc27675571c34bf77789b0ea4c94d3a667dd09190130ccab7e579cdca02
+EBUILD mup-6.9.ebuild 950 BLAKE2B 8bef011a1927b72ab08c19bee523ed7367d7e85b5341ca81c4ab26750a46453825e6777ca791576bf6f03a9312745a87078e448224b9a1c167a8f6be65aa24fe SHA512 b884343f448468de498ac966e6e072e280534fa9bcb867ba4a1be00e00d1c14042a857cff6eeb82dbf06c1ce3e76b80c7756081db908337c1089b01aac633bac
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/mup/files/mup-6.9-build-system.patch b/media-sound/mup/files/mup-6.9-build-system.patch
new file mode 100644
index 000000000000..07a7dba237bf
--- /dev/null
+++ b/media-sound/mup/files/mup-6.9-build-system.patch
@@ -0,0 +1,125 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,2 @@
+ SUBDIRS = lib tools src doc mup-input packaging
+-EXTRA_DIST = LICENSE simple.makefile
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = LICENSE
++EXTRA_DIST = simple.makefile
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.69])
+ AC_INIT([mup], [6.9], [support@arkkra.com])
+-AM_INIT_AUTOMAKE([-Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+@@ -16,21 +16,21 @@ AC_PROG_SED
+ AC_PROG_MKDIR_P
+ 
+ AC_PATH_PROGS(GS, [gs gs386], [none])
+-test "$GS" == "none" && AC_MSG_ERROR([required ghostscript program 'gs' is missing])
++test "$GS" = "none" && AC_MSG_ERROR([required ghostscript program 'gs' is missing])
+ AC_PATH_PROG(GROFF, [groff], [none])
+-test "$GROFF" == "none" && AC_MSG_ERROR([required program 'groff' is missing])
++test "$GROFF" = "none" && AC_MSG_ERROR([required program 'groff' is missing])
+ AC_PATH_PROG(BISON, [bison], [none])
+-test "$BISON" == "none" && AC_MSG_ERROR([required program 'bison' is missing])
++test "$BISON" = "none" && AC_MSG_ERROR([required program 'bison' is missing])
+ AC_PATH_PROG(PPMTOGIF, [ppmtogif], [none])
+-test "$PPMTOGIF" == "none" && AC_MSG_ERROR([required program 'ppmtogif' is missing])
++test "$PPMTOGIF" = "none" && AC_MSG_ERROR([required program 'ppmtogif' is missing])
+ AC_PATH_PROG(EXPR, [expr], [none])
+-test "$EXPR" == "none" && AC_MSG_ERROR([required program 'expr' is missing])
++test "$EXPR" = "none" && AC_MSG_ERROR([required program 'expr' is missing])
+ AC_PATH_PROG(SORT, [sort], [none])
+-test "$SORT" == "none" && AC_MSG_ERROR([required program 'sort' is missing])
++test "$SORT" = "none" && AC_MSG_ERROR([required program 'sort' is missing])
+ AC_PATH_PROG(CAT, [cat], [none])
+-test "$CAT" == "none" && AC_MSG_ERROR([required program 'cat' is missing])
++test "$CAT" = "none" && AC_MSG_ERROR([required program 'cat' is missing])
+ AC_PATH_PROG(EGREP, [egrep], [none])
+-test "$EGREP" == "none" && AC_MSG_ERROR([required program 'egrep' is missing])
++test "$EGREP" = "none" && AC_MSG_ERROR([required program 'egrep' is missing])
+ 
+ # Need to know if on Windows to install mupprnt.bat rather than shell script
+ AC_CANONICAL_HOST
+@@ -70,7 +70,7 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	# Find fltk-config program
+ 	PATH="$fltk_prefix/bin:$PATH"
+ 	AC_PATH_PROG(FLTK_CONFIG, fltk-config, none, $PATH)
+-	test "$FLTK_CONFIG" == "none" && AC_MSG_ERROR([required program 'fltk-config' is missing])
++	test "$FLTK_CONFIG" = "none" && AC_MSG_ERROR([required program 'fltk-config' is missing])
+ 	# Make sure it is the 1.x API, not 2.x
+ 	fltk_api_version="`$FLTK_CONFIG --api-version`"
+ 	fltk_api_major=`echo $fltk_api_version | sed -e 's/\..*//'`
+@@ -79,13 +79,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	AC_SUBST([FLTK_CXXFLAGS], [`$FLTK_CONFIG --cxxflags`])
+ 	# Red Hat/CentOS 7 version of fltk-config doesn't include -lfltk when using --use_image --ldflags, so fix that
+ 	fltk_ldflags="`$FLTK_CONFIG --use-images --ldflags`"
+-	if test "$fltk_ldflags" == "-lfltk_images"
++	if test "$fltk_ldflags" = "-lfltk_images"
+ 	then
+ 		AC_SUBST([FLTK_LDFLAGS], ["-lfltk -lfltk_images"])
+ 	else
+ 		AC_SUBST([FLTK_LDFLAGS], [`$FLTK_CONFIG --use-images --ldflags`])
+ 	fi
+-	test "$build_mac" == "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
++	test "$build_mac" = "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
+ 	# Check that libraries that Mupmate needs exist
+ 	AC_CHECK_LIB([fltk], [fl_alphasort], [ ])
+ 	AC_CHECK_LIB([fltk_images], [main], [ ])
+@@ -100,13 +100,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	AC_CHECK_LIB([z], [gzgets], [ ])
+ 
+ 	# Programs for Windows icons for Mupmate
+-	test "$build_windows" == "yes" && test "$PAMTOWINICON" == "none" && test "$PPMWINICON" == "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
++	test "$build_windows" = "yes" && test "$PAMTOWINICON" = "none" && test "$PPMWINICON" = "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
+ 	AC_PATH_PROG(XPMTOPPM, xpmtoppm, none, $PATH)
+-	test "$build_windows" == "yes" && test "$XPMTOPPM" == "none" && AC_MSG_ERROR([Need xpmtoppm])
++	test "$build_windows" = "yes" && test "$XPMTOPPM" = "none" && AC_MSG_ERROR([Need xpmtoppm])
+ 	AC_PATH_PROG(PPMTOPGM, ppmtopgm, none, $PATH)
+-	test "$build_windows" == "yes" && test "$PPMTOPGM" == "none" && test "$PAMTOWINICON" == "none" && AC_MSG_ERROR([Need ppmtopgm])
++	test "$build_windows" = "yes" && test "$PPMTOPGM" = "none" && test "$PAMTOWINICON" = "none" && AC_MSG_ERROR([Need ppmtopgm])
+ 	AC_PATH_PROG(WINDRES, i386-mingw32msvc-windres, none, $PATH)
+-	test "$build_windows" == "yes" && test "$WINDRES" == "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
++	test "$build_windows" = "yes" && test "$WINDRES" = "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
+ 	]
+ )
+ 
+@@ -122,7 +122,7 @@ AC_FUNC_MALLOC
+ AC_FUNC_MMAP
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([access alarm atan cos getcwd isascii isspace memcmp memmove memset munmap pow putenv select setenv sin sqrt strcasecmp strchr strcmp strcpy strcspn strdup strerror strncasecmp strncpy strpbrk strrchr strspn strstr strtol tan unlink])
+-test "$build_linux" == "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
++test "$build_linux" = "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
+ 
+ AS_IF([test "x$enable_mupdisp" != xno],
+ 	[
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -208,10 +208,9 @@ uguide_files = \
+ 
+ ps_files = quickref.ps uguide.ps
+ EXTRA_DIST = uguide.t quickref.t charlist $(uguide_files) $(ps_files)
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = $(ps_files)
+-mup_uguide_dir = $(mup_doc_dir)/uguide
+-mup_uguide__DATA = $(uguide_files)
++dist_doc_DATA = $(ps_files)
++mup_uguidedir = $(docdir)/uguide
++mup_uguide_DATA = $(uguide_files)
+ 
+ muschar.ps: ../src/include/muschar.h ../tools/doc/mkmuscharps.sh
+ 	../tools/doc/mkmuscharps.sh < ../src/include/muschar.h
+--- a/doc/htmldocs/Makefile.am
++++ b/doc/htmldocs/Makefile.am
+@@ -1,4 +1,4 @@
+ mup_html_docs = blind.html faq.html Macinst.html mupfeat.html overview.html usercomm.html whatsnew.html winrun.html
+-mup_htmldoc_dir = $(datadir)/doc/packages/$(PACKAGE)
++mup_htmldoc_dir = $(htmldir)
+ mup_htmldoc__DATA = $(mup_html_docs)
+ EXTRA_DIST = $(mup_html_docs)
diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9.ebuild
new file mode 100644
index 000000000000..9284b6f85709
--- /dev/null
+++ b/media-sound/mup/mup-6.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz
+	ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/fltk-1.3:1
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+	sys-apps/groff
+	sys-devel/bison
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.9-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc README
+}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 389d35873ea2..c739ac214942 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,5 +1,3 @@
-DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
 DIST wavpack-5.5.0.tar.xz 797996 BLAKE2B e2a00052ce887c4ac4e767a1852f0b94c7d23071f5974cb15f33700acaf5b6ae9e5e08a7dee8c66520d2178a4f9e3cc2139da78f040803d55d504b949000c8c9 SHA512 9758e8079618e45e585330cd472f8ddae6e0ffd9a79032e7ec60251fff331390a619855dcdcf92942f5192d6ae12e05b6feca36394d30f0fe7e65222ee2696fc
-EBUILD wavpack-5.4.0.ebuild 846 BLAKE2B 94ced432ab59947059e929f939a2a2ff4d7d06221dbbeb5ba5c6c6c5c2d01864d43647f3bf716c30b179518f4fb01d2cee74283791a2dcf7475e558180ce13a6 SHA512 4b0bdeadd930ba09dcfb105a1fb74fddee021038c980fab742525af8d2e5b22260e88d06a1d69558611b51f46935a64c0171ce28483e6f8c9bf17965129eed82
-EBUILD wavpack-5.5.0.ebuild 680 BLAKE2B d3be3f1d9b812a7bd5ecf815c17c30ab2a9df97703edb65b7ff5af6ac0f346258d8d43b2acecdf5d9c083853388333f095f410c9d7596de5ea9a96df3384689f SHA512 e7e61670ebecf00e76d2202fa91462fd840db2a89ac5473c237474f47d8653e250eba423caf939fd6d5b61592754a30709863d3f5a5b21c421cfd22282b17bfb
+EBUILD wavpack-5.5.0.ebuild 678 BLAKE2B 18f421f76ffa98923cd0ec998a86a12b4665f52ebc20aeaa7554e073c91d30051093714cfa11804667a372bf883bc792dcfe057e6b376ad7aadaa5db8d779e03 SHA512 a65fc69c41558ea616ae268e5f1d2e3091548f683d471c262a24e2092b5de3672dd2b43c839a046af1b78c9be1288c2b83a56c3b281152923e96d2c75e758fea
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
deleted file mode 100644
index 7734a2145702..000000000000
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Hybrid lossless audio compression tools"
-HOMEPAGE="https://www.wavpack.com/"
-SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/libiconv-0-r1"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable test tests) \
-		$(multilib_native_enable apps)
-}
-
-multilib_src_test() {
-	emake -C cli wvtest
-	cli/wvtest --default || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/wavpack/wavpack-5.5.0.ebuild b/media-sound/wavpack/wavpack-5.5.0.ebuild
index 6f95a8507add..ce7f2196be26 100644
--- a/media-sound/wavpack/wavpack-5.5.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 976343bee0ee..af13ecec01cb 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ef5ccc260ba5..a774693c32c2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 05:39:49 +0000
+Thu, 14 Jul 2022 11:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0e7924c81472..95415fee7991 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-14T05:39:53Z
+TIMESTAMP 2022-07-14T11:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLPrClfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQAIhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBr9RAAkkQ/yISTnKCl4boNavchENOrmIjqTISUPK6Zbb+vJ7QWg5Wf0S4dY+mQ
-ONMSCM7TALaBUGhS+h9hQ2b6fuKghJ7kvssNvkfcLQCUV4/xOraYnf6YGLzp+mli
-LPDU33Ir0eUHwTh6diK8vmr+S9OyXJ605aadjAVcBWbhFEGbNHDOsQ2qz/ru8ldL
-/KXm9CroDnTmeuzQVpGTa5BWUdHXwWXudLxcEWRoKgEASUHS9XNoh6C+27OS2cYV
-a2E6O2q9Oqjd46YogPBhEkfxfANeFvpuyzWQAqaE79EZuj+Po0b8rdiLmbVaEhPr
-ijMubUlSQjOU4KDOj0fykC4iNABqm7+MFWoEo+JODYm5v9w3Wmf/L9iHi8Wab3UT
-tw5Qv/iF6nsrvEXmdzf+mrkQapi6UiSkVw6iI91tmaqUT4na/j+6L1syxTFIDycs
-+ZPsxRufeJFKIFqDnrJTvcbcU1udgVy0MG0kVGqJ+2iedwXg2gXGpwHTMNPSduXP
-kvhustmaBOT4ZdTu9v0ZwKlXGFjWSuIheOguKB9PvQLnL8ZtgPbrAOAlCh0IPFCW
-bYFFdVobLW1LLd8SPHWyqO3LcHLEAsmIlHeglhpQP+1wouk95pE5ESVl+0Bewyh0
-HqMNXC38NkJue7M5VbJ+AN19mbp7q1toCwPZe7WOxwlS+cCQK3o=
-=Gzfp
+klCiuQ//VYiA9aoecXYAt/tCjSLS8qVBB+izi7WdU1WMjQqVZCnWOFz/Zmdpxuiy
+uHZ7/C8/Yseoh6gtn1jZwQwydFxbTLEVOU6nFKiWQQBXCU22H0AG9IoANX3Zi9r/
+XbVMGXqZFTiiOrWrumXdpdiL6tdx8EFKakxck/kDs4cAgjrLsJ71jyB8vxxte+VU
+DEpk5yHr9LmVBYSb9VZXIUvacpQSiOoJkMFB6STTooqcRAZZtILcCiILVm4i9BwY
+JdN3YR2Z/2/j44epvg/fcmYQmx+npkrs+lgkSZeZ7F5l+m6lkjbaQcqcLRlm/drs
+aOsoks2zgWQLrdu0KtlGPZSXQs7ZaH/TD73gO42iyNJTp1Qf5p48L6VA10u9tLmf
+Av/0j+5RSGHQXpg46va8bxxBRP9IRQ7QOo4R2/Qzaoy1hrZi6mT+QCOGLqajmbfl
+A9T0MYqhLSie/WMF4AIvzCZBhOcQbU2r/LCLn6xFczG4/lXSKwtWaZEAb+j1uR91
+/sOts7cRE1nrXaHbZZX2iVfsCom5d+DWHqF9tkfTFP4g9n17UkU/N5DveEl5xO7A
+PtFooh9CSb8Ynn8ObL4Kc5wavq0CoGDQIQOJ8oUNXV291M1FejUoWKUxPLWVvjMP
+k/x79deVxTtsOW8uhIZCbrAVvmyCYFRNc878/Pp+BwPYKtYUZh0=
+=7YZl
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 62575cb05c06..a774693c32c2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 05:39:50 +0000
+Thu, 14 Jul 2022 11:39:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7feaea30388f..0854c60c5ad3 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 40a5b3f8a8e3..cfa26d226f20 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.29 b/metadata/md5-cache/app-admin/awscli-1.25.29
new file mode 100644
index 000000000000..5449bf7571c8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.29
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=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=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin 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/aws/aws-cli/archive/1.25.29.tar.gz -> aws-cli-1.25.29.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 000432e320a0..420381d88421 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.8.1 b/metadata/md5-cache/app-arch/par2cmdline-0.8.1
deleted file mode 100644
index 8782f5529c43..000000000000
--- a/metadata/md5-cache/app-arch/par2cmdline-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=pretend setup test
-DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=7
-HOMEPAGE=https://github.com/Parchive/par2cmdline
-INHERIT=toolchain-funcs
-IUSE=openmp
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.1/par2cmdline-0.8.1.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2c894c6379ab46bfc36141f7bb19d8fe
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.8.0 b/metadata/md5-cache/app-arch/par2cmdline-0.8.1-r1
index 373906ed7bb5..24633b112e1a 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.8.0
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.8.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=pretend setup test
 DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/Parchive/par2cmdline
 INHERIT=toolchain-funcs
 IUSE=openmp
 KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.0/par2cmdline-0.8.0.tar.bz2
+SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.1/par2cmdline-0.8.1.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d8a07c57f99641f6da64a4ea20cb5a6d
+_md5_=46e960c8dfdb33a2d11e0195cba31c34
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 16bec30d4523..d681bca3991b 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-28.1-r2 b/metadata/md5-cache/app-editors/emacs-28.1-r2
new file mode 100644
index 000000000000..bd4f5801c58a
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-28.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=28
+SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=fb529b72bdf201e729104c9a49e72fc9
diff --git a/metadata/md5-cache/app-editors/emacs-28.1.90 b/metadata/md5-cache/app-editors/emacs-28.1.90-r2
index 23b25cf2ed82..377ed23d8251 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1.90
+++ b/metadata/md5-cache/app-editors/emacs-28.1.90-r2
@@ -1,11 +1,11 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
-INHERIT=elisp-common readme.gentoo-r1 toolchain-funcs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
@@ -13,5 +13,5 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 RESTRICT=test
 SLOT=28-vcs
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.1.90.tar.xz
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=ec66a70583d366ea4b74ae719939c2c6
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1d04ddbbe5f338ca282fc62d210dff3d
diff --git a/metadata/md5-cache/app-editors/emacs-28.1.9999 b/metadata/md5-cache/app-editors/emacs-28.1.9999
index 222e6a48f905..7961136b867f 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.1.9999
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1a8e72c150c065bec336db55425114a1
+_md5_=1d04ddbbe5f338ca282fc62d210dff3d
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.9999 b/metadata/md5-cache/app-editors/emacs-29.0.9999
index bc4fad84aecc..4cdaa4f7b657 100644
--- a/metadata/md5-cache/app-editors/emacs-29.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-29.0.9999
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 RESTRICT=test
 SLOT=29-vcs
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=123a67e736fff0e824283b947e8a1b86
+_md5_=6c2bda1215c044d189e2f335854702c2
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index c55b98a2f55e..2470b99f1c7e 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1 b/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1
new file mode 100644
index 000000000000..ffe1c10c4cb9
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/dash app-emacs/hydra >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=BibTeX database manager for Emacs
+EAPI=8
+HOMEPAGE=https://joostkremers.github.io/pandoc-mode/ https://github.com/joostkremers/pandoc-mode/
+INHERIT=elisp
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-emacs/dash app-emacs/hydra virtual/pandoc >=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/joostkremers/pandoc-mode/archive/2.32.tar.gz -> pandoc-mode-2.32.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=eb322e7cfa0032e51616e3bf49aa505d
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 42079e0ee570..db593a796e23 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.4_pre b/metadata/md5-cache/app-emulation/xen-4.15.4_pre
new file mode 100644
index 000000000000..04c3f1d02554
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.15.4_pre
@@ -0,0 +1,16 @@
+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=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.15.4_pre
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=dac79b312177700e589ef1ef826a95f7
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre b/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre
new file mode 100644
index 000000000000..fd550a7cfd78
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) 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(+)] ) 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 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 ) 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 )
+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-upstream-patches.git/snapshot/xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 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	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3ba87c68fec7887064e81310d219c92d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index ffed830212e7..fc3285a05889 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/plod-1.9-r2 b/metadata/md5-cache/app-misc/plod-1.9-r3
index ba7834456cb9..0f3690668f28 100644
--- a/metadata/md5-cache/app-misc/plod-1.9-r2
+++ b/metadata/md5-cache/app-misc/plod-1.9-r3
@@ -1,10 +1,10 @@
+BDEPEND=dev-lang/perl
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-lang/perl
 DESCRIPTION=A tool to help administrators keep track of daily activities
-EAPI=6
-HOMEPAGE=http://www.deer-run.com/~hal/
+EAPI=8
+HOMEPAGE=https://www.deer-run.com/~hal/
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-2 )
 SLOT=0
 SRC_URI=http://www.far2wise.net/plod/plod-1.9.tar.gz
-_md5_=2795d557d4162c6382c353a9f3326da7
+_md5_=9f1e2090a3af76e9db0b4794371903a9
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4d1d6730225d..f5ea1ed625ca 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/wsdl4j-1.6.2-r1 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
deleted file mode 100644
index a42b2933b500..000000000000
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:0 ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Web Services Description Language for Java Toolkit (WSDL4J)
-EAPI=7
-HOMEPAGE=http://wsdl4j.sourceforge.net
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source test
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=9aa326432167919e4687c68b1949b92b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 06fc8f4e6600..7dfe3a58c870 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.5.0 b/metadata/md5-cache/dev-libs/libgit2-1.5.0
new file mode 100644
index 000000000000..9de589e75ac3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+DESCRIPTION=A linkable library for Git
+EAPI=8
+HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
+IUSE=examples gssapi +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.5
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.5.0.tar.gz -> libgit2-1.5.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2b34a5a5baf43d70c576009c9f4ec129
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e9c6676d2d91..f55483730d5f 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/alembic-1.8.1 b/metadata/md5-cache/dev-python/alembic-1.8.1
new file mode 100644
index 000000000000..441301ff1657
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alembic-1.8.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) >=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_beta4: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=Database migrations tool, written by the author of SQLAlchemy
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/alembic/alembic-1.8.1.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6d416e8e60d66be10cf6852b1db206ba
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.0 b/metadata/md5-cache/dev-python/ansible-compat-2.2.0
new file mode 100644
index 000000000000..6fc9183b1088
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansible-compat-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-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=Contains functions that facilitate working with various versions of Ansible
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.0.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6a1c7bf0627dc8cbeb868f4ea41dfe35
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.29 b/metadata/md5-cache/dev-python/boto3-1.24.29
new file mode 100644
index 000000000000..572f28a310c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.29
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.29.tar.gz -> boto3-1.24.29.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.29 b/metadata/md5-cache/dev-python/botocore-1.27.29
new file mode 100644
index 000000000000..3b2beafccfb1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.29
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[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(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[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(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.29.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/cmd2-2.4.2 b/metadata/md5-cache/dev-python/cmd2-2.4.2
new file mode 100644
index 000000000000..e38e2aad4fc1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cmd2-2.4.2
@@ -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/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extra features for standard library's cmd module
+EAPI=8
+HOMEPAGE=https://github.com/python-cmd2/cmd2/ https://pypi.org/project/cmd2/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cmd2/cmd2-2.4.2.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=e25b41b5cef46b80ee09096ec83ab2fc
diff --git a/metadata/md5-cache/dev-python/flask-2.1.3 b/metadata/md5-cache/dev-python/flask-2.1.3
new file mode 100644
index 000000000000..b39eee866017
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-2.1.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/asgiref-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/shiboken2 ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/pallets-sphinx-themes[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[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/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-tabs[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[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/pallets-sphinx-themes[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] dev-python/sphinx-tabs[python_targets_python3_8(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=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_beta4: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=A microframework based on Werkzeug, Jinja2 and good intentions
+EAPI=8
+HOMEPAGE=https://palletsprojects.com/p/flask/ https://github.com/pallets/flask/ https://pypi.org/project/Flask/
+INHERIT=distutils-r1
+IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask/Flask-2.1.3.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e7dca6d2768f8f99780a3fd33609109f
diff --git a/metadata/md5-cache/dev-python/mrcfile-1.4.1 b/metadata/md5-cache/dev-python/mrcfile-1.4.1
new file mode 100644
index 000000000000..9429089b0620
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mrcfile-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/numpy-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=MRC2014 file format I/O library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/mrcfile/ https://github.com/ccpem/mrcfile/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccpem/mrcfile/archive/v1.4.1.tar.gz -> mrcfile-1.4.1.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bb2536fc3ee22d23593ff7b0c3fdc54e
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.24 b/metadata/md5-cache/dev-python/pocketlint-0.24
new file mode 100644
index 000000000000..c4d8186dcc88
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pocketlint-0.24
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/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=Shared code for running pylint against rhinstaller projects
+EAPI=8
+HOMEPAGE=https://github.com/rhinstaller/pocketlint/ https://pypi.org/project/pocketlint/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pylint[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 )
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.24.tar.gz -> pocketlint-0.24.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=30b0e320d124182a1bbc12381bf518dc
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.6.1 b/metadata/md5-cache/dev-python/pyfakefs-4.6.1
new file mode 100644
index 000000000000..cbdb7e8ceec7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=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_beta4: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=A fake file system that mocks the Python file system modules
+EAPI=8
+HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.6.1.tar.gz -> pyfakefs-4.6.1.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=12c1671b0714b7764dc85be9dc9f8b8d
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.51 b/metadata/md5-cache/dev-python/pyghmi-1.5.51
new file mode 100644
index 000000000000..8651cf8ff991
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.51
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[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 pure python implementation of IPMI protocol
+EAPI=8
+HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
+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/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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/pyghmi/pyghmi-1.5.51.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4-r2 b/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
new file mode 100644
index 000000000000..60b83108de84
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=Programmatically open an editor, capture the result
+EAPI=8
+HOMEPAGE=https://github.com/fmoo/python-editor/ https://pypi.org/project/python-editor/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d47d271a6ab94272bfca1901cdf76824
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-4.0.1 b/metadata/md5-cache/dev-python/python-glanceclient-4.0.1
new file mode 100644
index 000000000000..7ad363c09b45
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-glanceclient-4.0.1
@@ -0,0 +1,16 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ddt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tempest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testscenarios[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/keystoneauth-3.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/warlock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/warlock-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[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 client for the OpenStack Glance API
+EAPI=8
+HOMEPAGE=https://github.com/openstack/python-glanceclient
+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/keystoneauth-3.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/warlock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/warlock-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-4.0.1.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2f7962bd33b229484feda42b8b4fd53a
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.7.1 b/metadata/md5-cache/dev-python/sentry-sdk-1.7.1
new file mode 100644
index 000000000000..1b9bb667c1ba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.7.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fakeredis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-login[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[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=Python client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[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/getsentry/sentry-python/archive/1.7.1.tar.gz -> sentry-sdk-1.7.1.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=92a1cd10940187245c263655270aa7ce
diff --git a/metadata/md5-cache/dev-python/setuptools-63.2.0 b/metadata/md5-cache/dev-python/setuptools-63.2.0
new file mode 100644
index 000000000000..82dd3ecb0baf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-63.2.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[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/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[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(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[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(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[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(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[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(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[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(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=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=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
+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/s/setuptools/setuptools-63.2.0.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d7df155dd4095ff15c6271b211da2bff
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8.3 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8.3
new file mode 100644
index 000000000000..be2871fe1941
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/sphinx[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_beta4: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/flit_core-3.7.1[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=Create a custom 404 page with absolute URLs hardcoded
+EAPI=8
+HOMEPAGE=https://sphinx-notfound-page.readthedocs.io/ https://github.com/readthedocs/sphinx-notfound-page/ https://pypi.org/project/sphinx-notfound-page/
+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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+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/readthedocs/sphinx-notfound-page/archive/0.8.3.tar.gz -> sphinx-notfound-page-0.8.3.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f637342a5e9b68a794f60d0c514d16fb
diff --git a/metadata/md5-cache/dev-python/trimesh-3.12.8 b/metadata/md5-cache/dev-python/trimesh-3.12.8
new file mode 100644
index 000000000000..613beb2063b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.12.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[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=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[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/mikedh/trimesh/archive/3.12.8.tar.gz -> trimesh-3.12.8.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 82960f6317b0..ba7642a20e4e 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/classifier-reborn-2.3.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.3.0
new file mode 100644
index 000000000000..2a8f982db975
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.3.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/matrix-0.4:0[ruby_targets_ruby26(-)] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/matrix-0.4:0[ruby_targets_ruby27(-)] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/redis[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/redis[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Module to allow Bayesian and other types of classifications
+EAPI=8
+HOMEPAGE=https://github.com/jekyll/classifier-reborn
+INHERIT=ruby-fakegem
+IUSE=gsl test test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=LGPL-2.1
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/matrix-0.4:0[ruby_targets_ruby26(-)] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/matrix-0.4:0[ruby_targets_ruby27(-)] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.3.0.tar.gz -> classifier-reborn-2.3.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=be61ad7be2e726deecb0e634e21461fb
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.0 b/metadata/md5-cache/dev-ruby/minitest-5.16.0
deleted file mode 100644
index f9e9126a2960..000000000000
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-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/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
-EAPI=8
-HOMEPAGE=https://github.com/seattlerb/minitest
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~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-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=5
-SRC_URI=https://rubygems.org/gems/minitest-5.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.1 b/metadata/md5-cache/dev-ruby/minitest-5.16.1
deleted file mode 100644
index 1dab4c757dba..000000000000
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.1
+++ /dev/null
@@ -1,17 +0,0 @@
-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/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
-EAPI=8
-HOMEPAGE=https://github.com/seattlerb/minitest
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~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-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=5
-SRC_URI=https://rubygems.org/gems/minitest-5.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.7 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.7
new file mode 100644
index 000000000000..cb3be97f8899
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.13.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby26(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby27(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby30(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby31(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest[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? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[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(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libxml2-2.9.14 >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv 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=Nokogiri is an HTML, XML, SAX, and Reader parser
+EAPI=8
+HOMEPAGE=https://www.nokogiri.org/
+INHERIT=ruby-fakegem multilib
+IUSE=test 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=>=dev-libs/libxml2-2.9.14:= >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[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 ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.7.tar.gz -> nokogiri-1.13.7-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c2054770d025e69bf41f4def338d211a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e95dc1299451..d2229c21fa04 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/cbindgen-0.24.3 b/metadata/md5-cache/dev-util/cbindgen-0.24.3
index 40f1b3c2b3ef..bcd8a23e956f 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.24.3
+++ b/metadata/md5-cache/dev-util/cbindgen-0.24.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eqrion/cbindgen/
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0 BSD Boost-1.0 MIT MPL-2.0 Unlicense
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.6/download -> clap-3.1.6.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.8.0/download -> indexmap-1.8.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/quote/1.0.17/download -> quote-1.0.17.crate https://crates.io/api/v1/crates/redox_syscall/0.2.12/download -> redox_syscall-0.2.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/serde_json/1.0.79/download -> serde_json-1.0.79.crate https://crates.io/api/v1/crates/serial_test/0.5.1/download -> serial_test-0.5.1.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.1/download -> serial_test_derive-0.5.1.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://github.com/eqrion/cbindgen/archive/refs/tags/v0.24.3.tar.gz -> cbindgen-0.24.3.tar.gz
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=011759350372828808e19bf6cf3627bc
+_md5_=f0765843133c8d281ab458602c9d99ab
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0 b/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0
index f14dd47a0295..ffd15dc476a8 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby31(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby31(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby31(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[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? ( 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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby31(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby31(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby31(-)] !<dev-util/cucumber-html-formatter-17.0.0-r1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-util/cucumber-compatibility-kit-9.2.0:9[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-util/cucumber-compatibility-kit-9.2.0:9[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-util/cucumber-compatibility-kit-9.2.0:9[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-util/cucumber-compatibility-kit-9.2.0:9[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? ( 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=HTML formatter for Cucumber
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=19
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-19.2.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0f5ac4bd215745f28a919bd3947bc932
+_md5_=45f02846ff23af81e41c3d1c4fc3d581
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.346.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.346.2
new file mode 100644
index 000000000000..2272d9ee0919
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.346.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 || ( virtual/jre:17 virtual/jre:11 )
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.346.2/jenkins.war -> jenkins-bin-2.346.2.war
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d757885bc81fb70137db1cf525515bbd
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 7424a684b9f9..55b872d0df58 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kitinerary-22.04.3 b/metadata/md5-cache/kde-apps/kitinerary-22.04.3-r1
index 8094766f5ebf..4ef1c697cf67 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-22.04.3
+++ b/metadata/md5-cache/kde-apps/kitinerary-22.04.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=x11-misc/shared-mime-info >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.92.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libphonenumber dev-libs/libxml2:2 dev-libs/openssl:= >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=kde-apps/kmime-22.04.3:5 >=kde-apps/kpkpass-22.04.3:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kcalendarcore-5.92.0:5 >=kde-frameworks/kcontacts-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DEPEND=dev-libs/libphonenumber dev-libs/libxml2:2 dev-libs/openssl:= >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=kde-apps/kmime-22.04.3:5 >=kde-apps/kpkpass-22.04.3:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kcalendarcore-5.92.0:5 >=kde-frameworks/kcontacts-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0:= ) pdf? ( app-text/poppler:=[qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Data Model and Extraction System for Travel Reservation information
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kontact/
@@ -8,10 +8,10 @@ INHERIT=ecm gear.kde.org
 IUSE=+barcode pdf test debug doc test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libphonenumber dev-libs/libxml2:2 dev-libs/openssl:= >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=kde-apps/kmime-22.04.3:5 >=kde-apps/kpkpass-22.04.3:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kcalendarcore-5.92.0:5 >=kde-frameworks/kcontacts-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RDEPEND=dev-libs/libphonenumber dev-libs/libxml2:2 dev-libs/openssl:= >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=kde-apps/kmime-22.04.3:5 >=kde-apps/kpkpass-22.04.3:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kcalendarcore-5.92.0:5 >=kde-frameworks/kcontacts-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0:= ) pdf? ( app-text/poppler:=[qt5] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 REQUIRED_USE=test? ( pdf )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.04.3/src/kitinerary-22.04.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3b75aa72c242c427777db5fa0c34c708
+_md5_=647adde8845b172c184b63ab309bdb34
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 178431b9331c..7f1828b8e872 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.96.0 b/metadata/md5-cache/kde-frameworks/prison-5.96.0-r1
index 3ad35a389078..6759f88ed323 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.96.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.96.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtmultimedia-5.15.4:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( >=dev-qt/qtwidgets-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtmultimedia-5.15.4:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp:= qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( >=dev-qt/qtwidgets-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=QRCode and data matrix barcode library
 EAPI=8
 HOMEPAGE=https://invent.kde.org/frameworks/prison
@@ -8,9 +8,9 @@ INHERIT=ecm frameworks.kde.org
 IUSE=qml debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtmultimedia-5.15.4:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtmultimedia-5.15.4:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp:= qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/prison-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b66844c9a9b9d63e34850c3c5919babf
+_md5_=c78274af3ef01b178680eb96b1a194d3
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 608458f45afe..056b9b57af59 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/ttygif-1.6.0 b/metadata/md5-cache/media-gfx/ttygif-1.6.0
new file mode 100644
index 000000000000..7da35495d654
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ttygif-1.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Convert terminal recordings to animated gifs
+EAPI=8
+HOMEPAGE=https://github.com/icholy/ttygif
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-misc/ttyrec media-gfx/imagemagick x11-apps/xwd
+SLOT=0
+SRC_URI=https://github.com/icholy/ttygif/archive/refs/tags/1.6.0.tar.gz -> ttygif-1.6.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7fe9588ca6f359f2d92db5b770a7acb0
diff --git a/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218 b/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218
deleted file mode 100644
index a031c7be5619..000000000000
--- a/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Convert terminal recordings to animated gifs
-EAPI=6
-HOMEPAGE=https://github.com/icholy/ttygif
-INHERIT=vcs-snapshot toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-apps/xwd app-misc/ttyrec media-gfx/imagemagick
-SLOT=0
-SRC_URI=https://github.com/icholy/ttygif/archive/362bc381c1c2449509e732d68f07656caf46b420.tar.gz -> ttygif-1.80_p20181218.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-snapshot	19dc666868420457132a7514d4621476
-_md5_=da800e1b7b19d5b26d7e7aef217710b6
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 718cf67bc573..3abe8b8a2ee7 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/mup-6.9 b/metadata/md5-cache/media-sound/mup-6.9
new file mode 100644
index 000000000000..07313641d23a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mup-6.9
@@ -0,0 +1,14 @@
+BDEPEND=app-text/ghostscript-gpl media-libs/netpbm sys-apps/groff sys-devel/bison sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libX11 x11-libs/libXext >=x11-libs/fltk-1.3:1 x11-libs/libXpm x11-base/xorg-proto
+DESCRIPTION=Program for printing music scores
+EAPI=8
+HOMEPAGE=http://www.arkkra.com/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=Arkkra
+RDEPEND=media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libX11 x11-libs/libXext >=x11-libs/fltk-1.3:1 x11-libs/libXpm
+SLOT=0
+SRC_URI=http://www.arkkra.com/ftp/pub/unix/mup69src.tar.gz ftp://ftp.arkkra.com/pub/unix/mup69src.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=89644dbb6fd8f8df318c8d1966b5673d
diff --git a/metadata/md5-cache/media-sound/wavpack-5.4.0 b/metadata/md5-cache/media-sound/wavpack-5.4.0
deleted file mode 100644
index 852242c52fb5..000000000000
--- a/metadata/md5-cache/media-sound/wavpack-5.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=virtual/libiconv-0-r1
-DESCRIPTION=Hybrid lossless audio compression tools
-EAPI=7
-HOMEPAGE=https://www.wavpack.com/
-INHERIT=multilib-minimal
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/libiconv-0-r1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dbry/WavPack/releases/download/5.4.0/wavpack-5.4.0.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=15da097770930f2a7e484159ee351a96
diff --git a/metadata/md5-cache/media-sound/wavpack-5.5.0 b/metadata/md5-cache/media-sound/wavpack-5.5.0
index 6a65ac41c80e..4790379c9d3c 100644
--- a/metadata/md5-cache/media-sound/wavpack-5.5.0
+++ b/metadata/md5-cache/media-sound/wavpack-5.5.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.wavpack.com/
 INHERIT=multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/libiconv-0-r1
 SLOT=0
 SRC_URI=https://github.com/dbry/WavPack/releases/download/5.5.0/wavpack-5.5.0.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=42878fd5b1ef3ae23ad81c544bb8ceb5
+_md5_=0966f29f818188d71da9db8c49bfe3e6
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 35aae70817fd..8018e78b8365 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.92 b/metadata/md5-cache/net-analyzer/nmap-7.92-r1
index 0bbb40351d01..f10a37d46733 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.92
+++ b/metadata/md5-cache/net-analyzer/nmap-7.92-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
 INHERIT=autotools lua-single toolchain-funcs verify-sig
-IUSE=ipv6 libssh2 ncat nping +nse ssl +system-lua +lua_single_target_lua5-3 verify-sig
+IUSE=ipv6 libssh2 ncat nping +nse ssl symlink +system-lua +lua_single_target_lua5-3 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( NPSL GPL-2 )
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
-REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
+REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) ) symlink? ( ncat )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.92.tar.bz2 verify-sig? ( https://nmap.org/dist/sigs/nmap-7.92.tar.bz2.asc )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2ff06e68706c35ab24e0c7be97d8858c
+_md5_=47089a2deb0cb4d03704ddf00d4902a2
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index 922952946301..2f6a941501db 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -5,11 +5,11 @@ DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
 INHERIT=autotools lua-single toolchain-funcs git-r3
-IUSE=ipv6 libssh2 ncat nping +nse ssl +system-lua +lua_single_target_lua5-3
+IUSE=ipv6 libssh2 ncat nping +nse ssl symlink +system-lua +lua_single_target_lua5-3
 LICENSE=NPSL
 PROPERTIES=live
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
-REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
+REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) ) symlink? ( ncat )
 SLOT=0
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=06789851de79236c9136fdd266a9b644
+_md5_=1f7c40dbf2221494ec97a4ab0dfce879
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ccaa0c1c5ef2..ffc4075b8592 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/smb4k-3.1.3 b/metadata/md5-cache/net-misc/smb4k-3.1.3
new file mode 100644
index 000000000000..b70ecd740917
--- /dev/null
+++ b/metadata/md5-cache/net-misc/smb4k-3.1.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qttest-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdnssd-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 net-fs/samba[cups] discovery? ( net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) dev-qt/qtcore:5
+DESCRIPTION=Advanced network neighborhood browser
+EAPI=8
+HOMEPAGE=https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/
+INHERIT=ecm kde.org
+IUSE=+discovery plasma debug +handbook
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qttest-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdnssd-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 net-fs/samba[cups] discovery? ( net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) plasma? ( >=dev-qt/qtquickcontrols2-5.15.5:5 >=kde-frameworks/plasma-5.82.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://sourceforge/smb4k/smb4k-3.1.3.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=aca0629485659aa7a3abdc188ca05ad1
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 34cd53b5fb18..769127326722 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.42.1 b/metadata/md5-cache/sci-mathematics/lean-3.45.0
index 38a565bc783f..83c0c33cd4b1 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.42.1
+++ b/metadata/md5-cache/sci-mathematics/lean-3.45.0
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.42.1.tar.gz -> lean-3.42.1.tar.gz
+SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.45.0.tar.gz -> lean-3.45.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 65284b0440ee..8e74c16c202e 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20220622 b/metadata/md5-cache/sys-process/parallel-20220622-r1
index 8d48988bb4f1..d5546d572e99 100644
--- a/metadata/md5-cache/sys-process/parallel-20220622
+++ b/metadata/md5-cache/sys-process/parallel-20220622-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20220622.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220622.tar.bz2.sig )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=50466dedfcbc580db23b257ec5a08fc2
+_md5_=6d88718a9e7cd7555b4b466131c6e24d
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index f52e4f85fa2a..24cd6ec759b2 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.11.0 b/metadata/md5-cache/www-apache/mod_gnutls-0.11.0
deleted file mode 100644
index 7a454a9b70a3..000000000000
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=net-libs/gnutls-3.3.0:=[pkcs11] virtual/pkgconfig || ( ( >=dev-lang/python-3.9.12:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) test? ( app-crypt/monkeysphere >=net-libs/gnutls-3.3.0:=[tools] net-misc/curl || ( www-servers/apache[apache2_mpms_worker,apache2_modules_proxy,apache2_modules_proxy_http] www-servers/apache[apache2_mpms_prefork,apache2_modules_proxy,apache2_modules_proxy_http] www-servers/apache[apache2_mpms_event,apache2_modules_proxy,apache2_modules_proxy_http] ) ) =www-servers/apache-2.4* 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
-DESCRIPTION=mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)
-EAPI=6
-HOMEPAGE=https://mod.gnutls.org/
-INHERIT=autotools apache-module python-any-r1
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=net-libs/gnutls-3.3.0:=[pkcs11] =www-servers/apache-2.4*
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.11.0.tar.bz2
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	2fd69a56a527d12409ba43c733b7ac8f	depend.apache	416d1c5005c5f4594e79812fb7323f0d	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2558a5643a9f66e27d30fbd365241209
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index ea91c4f7121c..06b5fc72240b 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/xrectsel-0.3.2 b/metadata/md5-cache/x11-apps/xrectsel-0.3.2
deleted file mode 100644
index 736f5cf73266..000000000000
--- a/metadata/md5-cache/x11-apps/xrectsel-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 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
-DESCRIPTION=Print the geometry of a rectangular screen region
-EAPI=6
-HOMEPAGE=https://github.com/lolilolicon/xrectsel
-INHERIT=autotools
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/lolilolicon/xrectsel/archive/0.3.2.tar.gz -> xrectsel-0.3.2.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=86c4f7132301ed4756c245a973c50445
diff --git a/metadata/md5-cache/x11-apps/xrectsel-0.3.2-r1 b/metadata/md5-cache/x11-apps/xrectsel-0.3.2-r1
new file mode 100644
index 000000000000..92d9e7be5363
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xrectsel-0.3.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/libX11
+DESCRIPTION=Print the geometry of a rectangular screen region
+EAPI=8
+HOMEPAGE=https://github.com/lolilolicon/xrectsel
+INHERIT=autotools
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/lolilolicon/xrectsel/archive/0.3.2.tar.gz -> xrectsel-0.3.2.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4bb64df78828a6e5189db6c000261bb4
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index e309055baeae..b248d021b13c 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-0.25.2 b/metadata/md5-cache/x11-terms/kitty-0.25.2
index 1cb8a718556a..0758eb9098e4 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.25.2
+++ b/metadata/md5-cache/x11-terms/kitty-0.25.2
@@ -14,4 +14,4 @@ RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.25.2/kitty-0.25.2.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.25.2/kitty-0.25.2.tar.xz.sig )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e7fe6b63dc6a7b9b36844f35db77f83
+_md5_=c25e0604cad044f92418e21d214d2bf4
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 92ecee7b2015..4d881bf676b6 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -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	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=77d76b06f71d8da7922f9a34078beb83
+_md5_=326423448d637edc8d1e6b1f8f32f4b5
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b69666a2e5bf..b598a0cbbd54 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3
new file mode 100644
index 000000000000..db48462abd48
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=gnome-base/librsvg x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=x11-libs/libxklavier-5.3 xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= libnotify? ( x11-libs/libnotify )
+DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
+IUSE=libnotify
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 GPL-2+
+RDEPEND=gnome-base/librsvg x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=x11-libs/libxklavier-5.3 xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= libnotify? ( x11-libs/libnotify ) x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.3.tar.bz2
+_md5_=834c56d11834aa440e6b4e8da4d21632
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 235ab44e1c58..fb96806ea64b 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-14T05:39:53Z
+TIMESTAMP 2022-07-14T11:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLPrClfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQAIhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAM0Q//TBtAInQ2QkfjbaL40/aTsgO9jpjAzwDwx3DDD6eubIMrzO5llSTgOsGI
-ea+ndaapKVMBi0dz+qd34YmYIpTYq+91GjmkKwpQolC1vOB1DIfjbbPCTw1BpddC
-3m41HXPtJHnwc/IZC+F3gDOPEAh9Kan9GnwkiDsH1ds9Jcq6q6ieVqJmxJdM05vN
-U0ZQ7wi0k4vAbuWZH0lKJHsrIsNkbF5PPY1iT/GTjnwE90y4q5g++HA9730wyoB1
-ZW/zzrO/DgBNuaedSRgK55xlNRyk3PG2nLtfrjk6WFUxK9HXG6squ47vO5xQ5/dm
-kvrZXul6EXIP1Ae3SwB/8X2sX9pPozUDRHd1jJeUr89S/RP5DDX3hYmOJ7uYLwgV
-o/csQ5dM2mhiW2rMObEqYDbRD+J3JEXYgJ0p1TCCMIo90ZxH5puJoMOUvqJdDOgx
-c3ecN3kE4A6QQUrS1U4+5ETlmMHvH+ZPqyeT0nWTFIeO2yTuW674rDO/xid1MVaN
-jZbb46A/z1ee9vXTmiJ6hM82Uw+yZBq74UyJmI6OYr1Ush1dGkWGcU/AhaAaxIzH
-vlqdGg0sw7osdVDjx+2mgd/v19N7E5jjGePUejPqYi0MtIlaWL34LAv4IUA+Ren5
-TmQDjOqERCvSAipYckrgD637ISotXFNpl/b1agiZQSWfDwCVrv0=
-=bhmz
+klDWig//QoluHPXD6A4pRqlcFzvI17mi+oAPlovBQyZwWZrNy3xan1do0LWZ5Unh
+9a0HlszXL6ItovInp9Zro9tuD89LfQT9Rx2gymWfPJaSzyWblCG2Fevst5tykr2u
+yJm5PmlZkH/5LKVHkFZppbJOLNYI9BUXSO3r+BtgWtJvqhftlePnqHwLdt6CSdjL
+zSDX+qYJEJ1Auaui/WEZtLfOToX97Z73uFp1sjInkTFCiecQlAsC3s0+bw+MysgP
+PFKqiyiZYB716Q3VhiZU3iUlKsVf6fBuV7uEbA2BcDSruD3V1srGosv66iTKOgNL
+H140rz00OLI+LvCFcWN1bt0LwEkZWCx9f6TvROMnba3I576HwiixsNvpDEcrGvLM
+BzNdPqIM3wPZLZNMX+E3YQBtrWt/7j5laRAwhJdAmeWO47KK4sIo4TMOey8lC2rT
+BnYKyTmFUYsF+tWub6IouXZIJsTjyviVnmEx3YNQp31/EcGPW2yUtAjqjk0qj1Nb
+A/1clkWKVHziwYEM2HapT6S8T8QqAA075HRAaZPYLtEpU0NubaNyIAQ8IVWJUNof
+2xjoeixtZ4IBgLLdWlQBKCEek6MpsxnlCnYRW3tqcVh8TtISEPaTZN+/5MWpHs6M
+dAco3MkyEn/EKVGpBKyqmxBMUf172YntBl7sublwvabnoIdEyb4=
+=paYa
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 62575cb05c06..a774693c32c2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 05:39:50 +0000
+Thu, 14 Jul 2022 11:39:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f447927760ca..943ab1013807 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul 14 05:39:49 AM UTC 2022
+Thu Jul 14 11:39:49 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 198283eb670c..503d89338d07 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 05:45:01 +0000
+Thu, 14 Jul 2022 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 0a19b686b806..c6fbe319df1d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0372ef7872544ba2d39e3aec30843681186c4183 1657776862 2022-07-14T05:34:22+00:00
+8479cc25c9e1386322c358e300e53c8c5900b6af 1657796764 2022-07-14T11:06:04+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 31aaf32499c6..c935f0f8a043 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657777201 Thu 14 Jul 2022 05:40:01 AM UTC
+1657798801 Thu 14 Jul 2022 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 62575cb05c06..a774693c32c2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 05:39:50 +0000
+Thu, 14 Jul 2022 11:39:49 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1a5850330cf6..8d9ee36387da 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index cff47151cf8c..85726ad8e307 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -11,6 +11,6 @@ AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
 DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
-EBUILD nmap-7.92.ebuild 3221 BLAKE2B e9e1e318dc8e760804e5977ebbc24991b92864a81197e8f322f2e979c8feedefff4497b6833b0b0407676929a364adcb6c02e56b3ac05b321e1a9df23e7bc7b8 SHA512 691c1df075ad02e0a5d1fb229c40ae4ee21541e59012d10f34f3cb3530982c267159c6db58b83d1a027908e8992ebc972350f98cad15e7da90f7ed35bd176d7c
-EBUILD nmap-9999.ebuild 3266 BLAKE2B 9631eba23f86f57f32c3cd92df31c5121379cb79e83e6592c414bfd2ebe3ec22a782071b16817bfca9a095cde5f1b449ad08b2e0f9c4d5058402c257279d54e1 SHA512 ff9b02436679b9ac0bf07a08a9879907fb85d28e4d54e4b9ca0f07ee58458dca0ac154cbcd0dacb4e1cd84f1c81c3d83f9a6636042046523cad70a8d64bd0203
-MISC metadata.xml 838 BLAKE2B a0d9278b601c719019a8c7844ffe0b0ad74ff04935b32bd164e93800785f055aa1522a59f0129b473ceb1271d1bf670c5f1d9d3ba5a1261cbf45ef97cbfb9a52 SHA512 1d1aff1360a834a5b767f384efd6fc0fbd613e7da183507f06ce550cd503b50d167384b106acc5451c0414c418b82310ecfcaf2d36b70b6b50bf8f518fbd823e
+EBUILD nmap-7.92-r1.ebuild 3300 BLAKE2B 0cdb706a3590527b08bcc2fd0115d93b56e9626e1e36a773e55b9328cdbe2ac515fa703d9e4e4e37e5afaa359405243f7de09ddeb5fe308c0ca8d03a7691aa69 SHA512 13f8348001d73116dd82064a16ba27b0abd1eaea46e4ac9b84e166fd4ca1fae7698efd16847e6f7d590ba1f79bb37d899c18100e28c82298426ff4a80aa6ba64
+EBUILD nmap-9999.ebuild 3345 BLAKE2B ef52185445ca83c94c79972f54f66104c350720676a60805e7007c15c5b9543d852c6a6d2b4d654bd72fe412b64a654f279a02b69d3924569f6e9bc786bba6de SHA512 8d9096d0b6b82fde48c3efbed3376ad659a8890395eaea44a17d784af2ed3a3f2f9d6967777236da11c30e2cae1058a8581ae172f1ecfba06070b49b07754a3e
+MISC metadata.xml 890 BLAKE2B 4a6a6e4eeb6cdf7165da6f69ac4d8060c73323a6736c920208f485e18606dc45c8af41f81c18f72ce3695c649c83910407f84acd2b2c6ef48bc74459ae973cd9 SHA512 bf75b72c0aa1246fedff3378e9e6fbd42009853058f37ee677213e0e2dbfa7ae6753fc891ad7c9dda5f15d694483c125d335fa8add081d6928d9c2394c2f6c45
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 21fee1f7bbb0..4ca312aa6de6 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="ncat">Install the ncat utility</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
+		<flag name="symlink">Install symlink to nc</flag>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92-r1.ebuild
index 8d80c56138aa..752a2273e4f7 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r1.ebuild
@@ -29,8 +29,11 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	symlink? ( ncat )
+"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -130,4 +133,6 @@ src_install() {
 		install
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 2812d6599000..3b55f48a5dbd 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -29,8 +29,11 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	symlink? ( ncat )
+"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -131,4 +134,6 @@ src_install() {
 		install
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 85d7ba6afe24..4ddae59d24e8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index a6bd6f066160..3d76714ae395 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,5 @@
 DIST smb4k-3.1.2.tar.xz 3189176 BLAKE2B 5d34eca46015a939fe3c0c4e2c73882938e6e462e06d3138429c01f203d894be0625703c38767b0260ea8e349acf9b5ce739fda0daed2091527fc08d6a2fb84f SHA512 6871d831e4b4f1cf471e9b225eb0761549a3a754c82a219041c335f970965d7ffd897cac8becfca5e358e1664dc1afed31febe44531267c272e565d2039b3f4c
+DIST smb4k-3.1.3.tar.xz 3201344 BLAKE2B 09d72664cdc269b1e97471270de2ba0464fcfda268ec3b48643d391c468806618bf26e5b67ecfe14ce36b7667e1bb8c478a19ea23b41693ce7bb00ec6161488a SHA512 1381f09bcdb3b4c7e22cd122706b96a40169a8396e3ab53c5dca89ec856f7cff4e5d2a19345eb3111d709a18954c82f9a5376bc8516d4fab74505738461fa94f
 EBUILD smb4k-3.1.2.ebuild 2049 BLAKE2B 9ab0f18feea03c8474b4a6c24ec8cf0d1adab6ceda8de0c816f6fffced71a8d4bb84c0ed407edf9dc62b0ea13b01f69243d2b10eb125089c81fe574361e1c2ad SHA512 e6cf5a1ca4a6db1c649703ede3468b7183382d1f34e986415e8e7d52bd48ad4fbeaaa335df8781579d4af89139822162a3d8989b3a05cc5b3111ab867fe63355
+EBUILD smb4k-3.1.3.ebuild 2051 BLAKE2B 5c72cb6c92ff44dbf1e60d583aa8f56df2172dc35115bff320f74f4013a790d334f528b960cae2b5d2f1c30da31273764a0b87ac7281c14d0c6e900ee76a7a28 SHA512 543c9ebe74e0b8aa4f42a8fbc94300bb69d678ea51d3c30a0eb2b000833a75e5de14fa97694fff9aba60f7a88cd3bec570cce18a7310d43b3aea6bc5c204900d
 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b
diff --git a/net-misc/smb4k/smb4k-3.1.3.ebuild b/net-misc/smb4k/smb4k-3.1.3.ebuild
new file mode 100644
index 000000000000..5b3c7f425d6f
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.1.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://apps.kde.org/smb4k/
+https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="+discovery plasma"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-fs/samba[cups]
+	discovery? (
+		net-libs/kdsoap:=
+		net-libs/kdsoap-ws-discovery-client
+	)
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
+		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8b7b30fe2550..f8371a6248c6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index fb607b2fe35c..f5d0f205f10e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2022-07-14)
+# Unmaintained, no other major distro carries this, code quality is
+# abysmal, build system has major issues, tons of patches, EAPI 6,
+# no other revdeps in tree. Bug #822762, #831874, removal on 2022-08-13.
+sci-visualization/opendx
+sci-visualization/opendx-samples
+
 # Marek Szuba <marecki@gentoo.org> (2022-07-13)
 # Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them),
 # which have seriously messed up dependency handling and trigger several
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d60e1b7c868c..c12cde37494f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5360,6 +5360,7 @@ net-analyzer/nmap:libssh2 - Enable SSH support through net-libs/libssh2
 net-analyzer/nmap:ncat - Install the ncat utility
 net-analyzer/nmap:nping - Install the nping utility
 net-analyzer/nmap:nse - Include support for the Nmap Scripting Engine (NSE)
+net-analyzer/nmap:symlink - Install symlink to nc
 net-analyzer/nmap:system-lua - Use dev-lang/lua instead of the bundled liblua
 net-analyzer/nrpe:command-args - Build support for specifying the command-line arguments from the Nagios/Icinga master. Make sure you understand the implications of this flag as it can be a security risk.
 net-analyzer/nsca:crypt - Build support for crypted communication with nsca, through dev-libs/libmcrypt. It's recommended not to disable this flag unless all the communication will be handled in an absolutely safe environment.
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 19fef7d57e03..5b045cc665d8 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index d1e531ce735f..91e3fc7c8f3a 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,9 +1,9 @@
 AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b
-DIST lean-3.42.1.tar.gz 1908398 BLAKE2B 7a83269deb3dc7ee60bf7a09b36df332355d9caf575b8435345956697121e95e1fb44cada1237e44bab04a56af4fb40c0d01e49f4cb3e4896e616f2bc58bf9ef SHA512 ab266e385e3026ce3219eef6ef171e243576e291fb26cef3d97ca4cc5190988e3bd6fe93c37a1192b8d2eec0ae7620131826ee1073a038f5a024e706953242d1
 DIST lean-3.43.0.tar.gz 1909158 BLAKE2B 587995afb123e6c74a730f9709a001bab6b2ac82471dcf8b1219dda782853fcdb9735d16038b95a7950f6530dd3cf1e0b13e4d1044d723d3662217951b809928 SHA512 25cbad94b869bb39edaf9ed2478ffc298b130f22cb4db7c116212546583d670079ddde1b524a33499d00ac43fc82b6928e6801c83d613597aae255db9c45d9f3
 DIST lean-3.44.1.tar.gz 1911708 BLAKE2B 33dc94fb1f1eac2684b7a37fda3545ad6d4f6d703e7914c44b9a05fb57e55d4b9bef484ff1f6608f9bb0fe453ca28b7fa5c74e6bce135df06fb25ad6d9d3a37b SHA512 69ffd1a8519b476dd1879bfe2f8f8f4268a5490f11b581ee1e583382e6f03f947d958e8b5ee8ceead562945a406ee2dc9b0ae2da6f29f03a38828eadab88a4f8
-EBUILD lean-3.42.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+DIST lean-3.45.0.tar.gz 1913638 BLAKE2B f36548be556407cbf7b30a7988bb2454542543cafcd2d0f2af90f75f886d4b711c6955503f7241844ffff69400ec354a194cc345feca8f0dbcb06a673cc2d3d4 SHA512 c97c1dc6004823c73d8e40b5587ebbee7bd7a90b65ecdd3a976510d0d335b6df9a26916eedd5524f7137a32254a59dd5a6f15ce67f77d500926c9bc781aa5526
 EBUILD lean-3.43.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
 EBUILD lean-3.44.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.45.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
 EBUILD lean-3.9999.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
 MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7
diff --git a/sci-mathematics/lean/lean-3.42.1.ebuild b/sci-mathematics/lean/lean-3.45.0.ebuild
index 5d8ee8eecd4b..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.42.1.ebuild
+++ b/sci-mathematics/lean/lean-3.45.0.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 63cff137c195..ccf0a8a44db2 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index f53526809625..2ac22cea6184 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,3 +1,4 @@
+AUX parallel-20220622-makefile-completions-deux.patch 3722 BLAKE2B d5a83709b81f11695b6072c24764626308204cee5f1553a54ad5bf71c1231f3e1725aff7a8717466cd9a8798adec95fdab80aa37570f88458b3cf9d878b4b889 SHA512 cda33f64670dd50d05ad92b5b102478a8e8242a7a7a8a847c786ee31d1d8c634da5f59918de9490155215fe3f9487a06c010df6e59b7b540ac4f51a59160232c
 AUX parallel-20220622-makefile-completions.patch 1294 BLAKE2B a2cbf5479649d6413aad9e014621efc2d46cbdb4b9c2a18dc2d865e28c2e697653ea9ed5149041d368a79532f7923c7902bfb72fabf303aa4c41af77db1d6703 SHA512 ab3b39d71ca13a603e4684920d5127d8f35aa280e7e4a2c7e86738932100e7669e888c9a5ac63baa5caa3d7be8065cf7032465d088614245799fddd7c12e6713
 DIST parallel-20220422.tar.bz2 2367837 BLAKE2B 5630c58a15cc6ce0dac0346188afa9916b18545a9da91854f3cae604fc3c2ced33fd3a5f17a2967693a2e28cbddb198a3e63372125721a8dc67af80cbf03e940 SHA512 b4179c5ad936ed01753d91d75a012d6985dd8fb24f1e0d06fa7806352bfc59aeeedd42b15fd31b8294d25671aa474f885362c887875e79b32b613bfe1f9a262e
 DIST parallel-20220422.tar.bz2.sig 2080 BLAKE2B ae87bf4bee2cdd6952e30bb2b65498ca3f4d51452ff8736ac4c8cfbc9bf940eebad48c0c08d474d02d269eb459cb62441067b0c6f6ad69f8beedad40710637a3 SHA512 a8d023d856722fb7528fa67ff1615643e9bf3036c903665ca94e5c7366b402b1bc1b25defd4d3c9dbacc5178a9c584249639e45d3713c991c21da01158fa85da
@@ -7,5 +8,5 @@ DIST parallel-20220622.tar.bz2 2378286 BLAKE2B a0fdb1ab330360c28d85ea5608760a961
 DIST parallel-20220622.tar.bz2.sig 2080 BLAKE2B f013d329dd3e6d46341638965582ef5eb7358b8dff5e858279808a38d8543dd900fcc248433e30a3a715e1726be10dad5597deec23519bb33a904006f72a92d8 SHA512 097ca0f3ca9afe96045738fe050f94ba588e7728ae7cbf4f695b7f1f6c148ccc1565839aec2ba3ce4ccaf888331365b9b7265aa434806ef2c76139e2ba2f0e82
 EBUILD parallel-20220422.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
 EBUILD parallel-20220522.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
-EBUILD parallel-20220622.ebuild 1069 BLAKE2B fd178a351d0375c1a0b53aecba35261bee677592aa015ca618d75010108a906d6c6311c688c702bc22d72ff9c1024bd6ed5f6db026542aaf13bddb351712e4ac SHA512 5e3a6115f2e0cdc928b80aba7d28fd272c6ff69aa025a3c2872e7618bbf380bd0e792183b185ebcba03ff18523ec8b38a7c2605abfd5a38ed64b1929e6f8ea49
+EBUILD parallel-20220622-r1.ebuild 1074 BLAKE2B cf1ec5101469a0ff10f56e78d76e8cea886b822b5282bae5e6545f5f1f2634769c4d0ff5d2590b70a51fcabe4a9182d983e8aa990ad38d47e961f1fc88dba4ff SHA512 cc24de895fd1d80666ed6caca4c171db9e7683119fd042714045c1d067181bac449d8f3508cc253adbd3bf07a69aa80b86f1a250100ce34e8e44247d4b645233
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch b/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch
new file mode 100644
index 000000000000..c15a0dad28b1
--- /dev/null
+++ b/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch
@@ -0,0 +1,83 @@
+https://git.savannah.gnu.org/cgit/parallel.git/commit/?id=2ae4b179ac6caf887af37b1e86ec6cbd8c5706f8
+https://bugs.gentoo.org/856079
+https://bugs.gentoo.org/856076
+
+From 2ae4b179ac6caf887af37b1e86ec6cbd8c5706f8 Mon Sep 17 00:00:00 2001
+From: Ole Tange <ole@tange.dk>
+Date: Sat, 2 Jul 2022 01:54:21 +0800
+Subject: Packaged for old RedHats and SuSEs.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -167,12 +167,20 @@ pack_unpack_and_test_build:
+ 	cd parallel-$(YYYYMMDD) && \
+ 	./configure && make -j && sudo make -j install
+ 
+-zshcompletiondir=${datarootdir}/zsh/site-functions
++# This ought to be correct, but fails on Centos
++# bashcompletiondir=$(DESTDIR)${datarootdir}/bash-completion/completions
++# zshcompletiondir=$(DESTDIR)${datarootdir}/zsh/site-functions
++bashcompletiondir=$(DESTDIR)${prefix}/share/bash-completion/completions
++zshcompletiondir=$(DESTDIR)${prefix}/share/zsh/site-functions
++bashcompletion=${bashcompletiondir}/parallel
+ zshcompletion=${zshcompletiondir}/_parallel
+ install-data-hook:
+-	mkdir -p ${datarootdir}/bash-completion/completions
+-	mkdir -p ${zshcompletiondir}
+-	parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
++	mkdir -p ${zshcompletiondir} ${bashcompletiondir}
++	src/parallel --shell-completion bash > ${bashcompletion}
++# Make zsh eval the --shell-completion code dynamically so if
++# a newer version of GNU Parallel is installed by a normal
++# user, this newer version will generate the
++# --shell-completion code.
+ 	echo '#compdef parallel' > ${zshcompletion}
+ 	echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
+ 	echo '  eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -281,7 +281,13 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src
+-zshcompletiondir = ${datarootdir}/zsh/site-functions
++
++# This ought to be correct, but fails on Centos
++# bashcompletiondir=$(DESTDIR)${datarootdir}/bash-completion/completions
++# zshcompletiondir=$(DESTDIR)${datarootdir}/zsh/site-functions
++bashcompletiondir = $(DESTDIR)${prefix}/share/bash-completion/completions
++zshcompletiondir = $(DESTDIR)${prefix}/share/zsh/site-functions
++bashcompletion = ${bashcompletiondir}/parallel
+ zshcompletion = ${zshcompletiondir}/_parallel
+ EXTRA_DIST = CITATION CITATION.cff CREDITS LICENSES/CC-BY-SA-4.0.txt LICENSES/GFDL-1.3-or-later.txt LICENSES/GPL-3.0-or-later.txt
+ all: config.h
+@@ -929,9 +935,12 @@ pack_unpack_and_test_build:
+ 	cd parallel-$(YYYYMMDD) && \
+ 	./configure && make -j && sudo make -j install
+ install-data-hook:
+-	mkdir -p ${datarootdir}/bash-completion/completions
+-	mkdir -p ${zshcompletiondir}
+-	parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
++	mkdir -p ${zshcompletiondir} ${bashcompletiondir}
++	src/parallel --shell-completion bash > ${bashcompletion}
++# Make zsh eval the --shell-completion code dynamically so if
++# a newer version of GNU Parallel is installed by a normal
++# user, this newer version will generate the
++# --shell-completion code.
+ 	echo '#compdef parallel' > ${zshcompletion}
+ 	echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
+ 	echo '  eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
+--- a/src/parallel.pod
++++ b/src/parallel.pod
+@@ -5654,7 +5654,10 @@ the currently running jobs are finished before exiting.
+ =item $PARALLEL_HOME
+ 
+ Dir where GNU B<parallel> stores config files, semaphores, and caches
+-information between invocations. Default: $HOME/.parallel.
++information between invocations. If set to a non-existent dir, the dir
++will be created.
++
++Default: $HOME/.parallel.
+ 
+ 
+ =item $PARALLEL_ARGHOSTGROUPS
diff --git a/sys-process/parallel/parallel-20220622.ebuild b/sys-process/parallel/parallel-20220622-r1.ebuild
index f286660fe2f8..dded39ea7a57 100644
--- a/sys-process/parallel/parallel-20220622.ebuild
+++ b/sys-process/parallel/parallel-20220622-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20220622-makefile-completions.patch
+	"${FILESDIR}"/${PN}-20220622-makefile-completions-deux.patch
 )
 
 src_prepare() {
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 5891cf953ccb..e07acf1f107a 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 2a096df24ed5..6d77a9f4263d 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,6 +1,4 @@
 AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
-DIST mod_gnutls-0.11.0.tar.bz2 458966 BLAKE2B 6d81be7b7d48255173d028a8e3207badbce0c1ba541124a241b63d4ed4eb36833156e9cd7194318138b6f16667a971d5311d56b9b0036e5b3d9dac8d352a4335 SHA512 090d244823f15a6b23dd2ad9b35db202ebbe96210ec8fd06e06f13e32c327e9d9a449834c899755f1ec8c1a3a71db1b125d436ce661caee1002a8719b4c1320e
 DIST mod_gnutls-0.12.0.tar.bz2 461643 BLAKE2B ffbb4bd50cae7c974c59067908712e104e6d77b121e5e6114a1a45279b9396331f353a53ddae8e3d58259cd7669f047edc4d2b5ebebe94bb40df55f3546b0a02 SHA512 1ec32d0641dc8dc520726a4439edf2e9dbe582651aa4c782047d0499e5e7418b3145eb071d9e97aa4ec803e6818974efea2ed8ed18e5062cd7fdb90ef2e9e0f2
-EBUILD mod_gnutls-0.11.0.ebuild 2011 BLAKE2B 9ba5504d3b8e24f2f6ed1be16a821559799f43e081454b1f45d8a01e263697077fd95b59bb9de74eee22f99246019b529a407081941f1be9a2873c4eab63f445 SHA512 2285ee4e71a949211df2a8251f941f0bad7debb19c9cbbcc0fc615978c3f6a85bc3f89778aba5a1c102108bf8bba5f2864bbcec14c415ba7fe150b4bc183fd47
 EBUILD mod_gnutls-0.12.0-r1.ebuild 1991 BLAKE2B 1aae7bbfc6e9be425abdfb86627fdf7b107e435cfc21d961d75ac0384e038c6c60a44a4ff537c38d25cef7b5eb4b34a5c8fbb153afb4396da42e5b5758411e82 SHA512 5eb05bc71ed94fb1c9430176cdf28c57d828b6f4c446365f4de0850596321389bc7b5e3ecb60f791fd84ec5bf066c3890de765277b2d63cf62f647c9a3b3cf19
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
deleted file mode 100644
index 31e35fdd4786..000000000000
--- a/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# WARNING! Don't switch to EAPI-6 without checking paths of installed files
-# carefully. The .so file might get installed into /
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools apache-module python-any-r1
-
-DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
-HOMEPAGE="https://mod.gnutls.org/"
-SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
-
-TEST_REQUIRED_APACHE_MODULES="apache2_modules_proxy,apache2_modules_proxy_http"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	test? (
-		app-crypt/monkeysphere
-		>=net-libs/gnutls-3.3.0:=[tools]
-		net-misc/curl
-		|| (
-			www-servers/apache[apache2_mpms_worker,${TEST_REQUIRED_APACHE_MODULES}]
-			www-servers/apache[apache2_mpms_prefork,${TEST_REQUIRED_APACHE_MODULES}]
-			www-servers/apache[apache2_mpms_event,${TEST_REQUIRED_APACHE_MODULES}]
-		)
-	)"
-
-RDEPEND="${CDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="GNUTLS"
-
-DOCFILES="CHANGELOG NOTICE README"
-
-need_apache2_4
-
-python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Calling depend.apache_pkg_setup fails because we do not have
-	# "apache2" in IUSE but the function expects this in order to call
-	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
-	_init_apache2
-	_init_apache2_late
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apxs="${APXS}"
-		--disable-strict
-		--disable-doxygen-dot
-		--disable-doxygen-doc
-		--disable-doxygen-html
-		--disable-doxygen-pdf
-		--disable-valgrind-test
-		ac_cv_path_UNSHARE=no
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	apache-module_src_install
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 7c5aee31dd08..a3e6bffbdc25 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xrectsel/Manifest b/x11-apps/xrectsel/Manifest
index 98e05b3fbcb7..b6291b270673 100644
--- a/x11-apps/xrectsel/Manifest
+++ b/x11-apps/xrectsel/Manifest
@@ -1,3 +1,3 @@
 DIST xrectsel-0.3.2.tar.gz 14834 BLAKE2B 6ad050e69ad4280ec0b50b5f28961e7203fa750a49329f7df178cb758719d707d7fb61151b55cc7bbc27b05f770989417e5c3838de7cdd34c752a9e518553e1e SHA512 56e87002dba1858c900ceba4d6cf1613fa92a5a8f59fb5c4852e65835bde9478bf92c160ca398cd19e99543ed0ab94ad4ac8ba2d60a7dbaf95bc2826f8953fcc
-EBUILD xrectsel-0.3.2.ebuild 479 BLAKE2B cac2a43f1b45872d57563a3a01e6d0b75623976ea38f8ddd7383103ee86949ff02e5746a6a2c0e23816cfbb7a7b3dbec1227a1b0d0e7cc3ff66c84a92ccfeb6e SHA512 92ecdc3ab3abccb20ba460c5dda6c811b598484556108480d34fe73f571d4a2644940cf3bd88468bc90032d55347eb9b59ef09fa207a4ef43bd5e2a060d3370f
+EBUILD xrectsel-0.3.2-r1.ebuild 464 BLAKE2B 9ca70111883ffa01841aa29a7510e4f331416d0b1ab4b13236e457034b4f844a6d408b8d3aeebaf4f698fe9a6671b9d3cc59e16adfcc7b7f65a02bd341c30583 SHA512 d40ed8b67d83f548dc295087819a96f12f031789972dd0cd279adfd0467ab7ef61a0fed598f055c681a7e6203521699be8df4f218d7f3e22699b5f261317f5e2
 MISC metadata.xml 320 BLAKE2B fe717b303807e4efaa71ed47380fac34b2479596111d1d75aaa9e5de27eb24c257529afd345a5d13e1b4169afe87b37e7a1e9104e3ce30af5ccbce2084a0d5ff SHA512 0fa4d71564ea805f300a8b43935d4e9f08193d8df6622c4798a0ccc1ec05aa07fad636655a795e2d41e8ad01805097a99b69aa3efd636831ca1d65b5e394f207
diff --git a/x11-apps/xrectsel/xrectsel-0.3.2.ebuild b/x11-apps/xrectsel/xrectsel-0.3.2-r1.ebuild
index 9286f5208a28..b3663c2afc7d 100644
--- a/x11-apps/xrectsel/xrectsel-0.3.2.ebuild
+++ b/x11-apps/xrectsel/xrectsel-0.3.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,12 +12,11 @@ SRC_URI="https://github.com/lolilolicon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 512eec053b2b..4af28c23ba7d 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 89ba5b23a883..0e06843da6b9 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,6 +1,6 @@
 AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0
 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 3489 BLAKE2B dcae41cba89bee79302cf74f03d3b97fd4f495882c5b5653e42007871f173909bed260dcb527f126f8fe83a7e1d1d9613c6014b8804535dc76ccbc2a2e2f1fc0 SHA512 69ddf5b59bb1722605383b30b2d45242439c55b11ca4f5fec08d5baca5b6bb05b280fbfd2dbac321ba030d56286f4dcd7cd5506d0e17bd6f4ec89cc70a6b6824
+EBUILD kitty-0.25.2.ebuild 3564 BLAKE2B a1399f7f37f98dff758acdb95099abea500b529dff0be0b7a2d37f40b1f3373c4a5b4527a846b89cd194cf01eb52122e3487446066bdcae317f1ae399cfea167 SHA512 b37438a48ae27c198a9e7be0f8d8b3f3735b77329939630122601013d57fea8e9e4d7d821601ca3444bb15526c2afdc7ae0b3aace48a1305d78df7a0a0b4e909
+EBUILD kitty-9999.ebuild 3534 BLAKE2B ab8d87cc0831f3099955d353f8f89974523e5fff0ed3b7aa8f9c4c375f64769696a33f4f3c232d53e4d2cd38f48e4b6f5a9a3594918eca170c6b49fec58ece49 SHA512 b9f4807ae45fb4e43a95434fec45cfb5a6598007c0ec5404fd58fd513e29a313e5ee60c918065ab19dff42d6d46240c11ce9bd3ddd78c237510dfa508f748dcc
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.25.2.ebuild b/x11-terms/kitty/kitty-0.25.2.ebuild
index b8455230a169..2c71e5584d72 100644
--- a/x11-terms/kitty/kitty-0.25.2.ebuild
+++ b/x11-terms/kitty/kitty-0.25.2.ebuild
@@ -72,6 +72,7 @@ src_prepare() {
 	default
 
 	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
 		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
 		-i setup.py || die
 
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index b915b34e33d7..92a0509aac27 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
 	default
 
 	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
 		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
 		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
 		-i setup.py || die
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 36850e14fed6..83b9d9f18d3c 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 39dc7d66c406..67b22edd558f 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-xkb-plugin-0.8.2.tar.bz2 868539 BLAKE2B 20a7a27903be434490b3328f04d57a4ceb505dc1b63e4c98d584c72e6ad0dbc742251c0d9f43ba1da869caa2924627b6cfddd969874a3f5fae8fbf90ef577da6 SHA512 3078c11e1c10195480251c455995e4342c27b06949fc754396824f03bed885f32078f4c1436d86782de031cf4f4f806b530ca53116d4bedb54dda19b68ec7062
+DIST xfce4-xkb-plugin-0.8.3.tar.bz2 864177 BLAKE2B 4c4c5ab781265e50ddb14210566f608e2798f881d4b06e7e8f121c466ea0eebb694cf394b0bec747b7a5f1f99962ee1d014f29f077ef877e8063c23934eff1b4 SHA512 02ae82a1e01b7cc54154545c6ff42a450a81ba44697620ebb716a663300ea08fbf6ccafc5fd4d710791f142e1c249f17b613d90ffd99025ad97dfa0230ee55b2
 EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1068 BLAKE2B 95d10631992cf8d76916361951007278460f4d7e41efcd785a08f000227826970f123b25575b8d5243a7af47bdf1200392bab90c5559fab06acd373f2eebc69d SHA512 991ff7adfb8937b723015f8e1338c6d69982f3da8e7c42349f84be6240f0a5345284100f8fe2c3936fcba9f4bdb147f002be436465de2576aab7835410aa1d4b
+EBUILD xfce4-xkb-plugin-0.8.3.ebuild 1149 BLAKE2B c49c2ab144c0f878f469a8777c633ce8f045b82a9ffd7823c79e8b18856d346cb61177e9b9744ce5f85ab36c24109d55301e4812b7dcf386fd6d3a7557b1a54b SHA512 c218d6ceafb44364e7959f757c911bb91a3b539cc9f459e9e3d83dadd29b4f138af2bed3849b39eec6b891abd692cba13bc552ad42f8d1c152c33f23da067f34
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
new file mode 100644
index 000000000000..cf690e000d06
--- /dev/null
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libnotify"
+
+DEPEND="
+	gnome-base/librsvg
+	x11-libs/gtk+:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.3
+	xfce-base/garcon:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.12.1:=
+	libnotify? ( x11-libs/libnotify )
+"
+RDEPEND="
+	${DEPEND}
+	x11-apps/setxkbmap
+	>=xfce-base/xfce4-settings-4.11
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable libnotify)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}