gentoo auto-resync : 02:06:2023 - 15:29:04

author: V3n3RiX <venerix@koprulu.sector> 2023-06-02 15:29:04 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-06-02 15:29:04 +0100
commit: 27c1d146e5ee9e472a31a7958ad4dc70a5451ea7 (patch)
tree: fe573cd3516126d757c143a469871b88e5851548
parent: bc3875d3a71ac3fdb07c0fcf863843b4fdfcf0c0 (diff)
161 files changed, 2110 insertions, 642 deletions
diff --git a/Manifest b/Manifest
index a7020ef96b18..0106f9e4d012 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29452 BLAKE2B 9d962629175ea53f236332f8b4b60eb53cf10d78ee1fd5abe5de4fba96af676739b532fddf803189950f656b619c77b8f83ba47a8aac16590af5f3e74ac08b7b SHA512 af4ef594c52f741e687d2dbe48bfae6754cff6def75f8e655787be8564470dda277990005171f066bb1ee8dcceb128a6e78454efefc5341faa6ebcbac5742e87
-TIMESTAMP 2023-06-02T07:39:44Z
+MANIFEST Manifest.files.gz 29467 BLAKE2B b665d4ab235a8e763e867f619790a2717b168768f44917fab04d9ac643b25b6e95e7c5932cc985ca8ce0c0cde8a4c8345f7f87c10ec453f113bbeccbff3b2150 SHA512 aaf7a360868a079ab5f720774a3a1d463e358ed4b0d75d9da1c127a001e6ff6fa62774828cac6436e402623407570a89bcc9bb9d34cbaf99e1d340320fdd9717
+TIMESTAMP 2023-06-02T13:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR5nMBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR58SNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDyDA//Q7RqKhEadnYYzfgTRu7b18+tHRH+ypHglEFElA6NFiJ28ajJcugWyDNX
-tAxHZwbp5VujSl8VJMD6xVxGbCoACOVvuwJVEr9mF6byUhB3Trf1hmvjMrOqZS35
-60uGSwYTpCIl74gD6JJU9ElgMjmtqQvUfHSXzFRir2o8v+1za0eeTbxeRcZcrrmu
-f5OqMyYEVb7TslRPRQYb/A3Dc9hveXi5+eu3s5zRo/Itt4U4RCa+IMIfMoExU8Cl
-CXvkpKYI2Ujqp/l20QLQAEVZ5igG+uBvVFl4HBtXMFHXCmjdiNxCNXY/bHsYoyc/
-DuwEzgnmN1Q0iZGPRcVppQeeNmWmK3ou/c1Ett+HU3e/bnEGU7h7rWNnGCLgpDOE
-yJe+mgvfbFyKsuik5COjK8HEmL3hupiIHAq3K4C5kNY+VSUQ+32WCmtvsUFT5igr
-LAFzJe6ZGNfWJqxCMy9bbLiGzQMnMCaOyi0XQlavFCMq217seUcOboFoKaChlt0s
-lcR1pq3/z/zFichh5EI4puox20ocXmGvN5MzkCqYNJrkr7L5VBSXQid2lCXxV2Rw
-ufTPZ0NvwDNY21mgZuY3V/xk6V5Np/NEJU8tgh3J1a4Vyij/cNjwnxXlJo3omXbQ
-xhOJX1WKuPRWTngucu5MKho5D58Gs47eLHgRF5AGSmd9eNifNs4=
-=4jhv
+klDJhQ/8CUNIaILTCSltnbIPZMUVRa9tAxXe4hvQd9cd1NMP7WJ+oO+wZJ7bk4f7
+uFP3ArvThROZQoa0ZJNGJvbnXyOVZpfqwcxgAQiY0JtmuRDZA5BTW/7g+BvdHbMH
+jwbGjUIj3SfRa6vt+VT81tS9yrGK6BSOcvH1hXjA4XLbr7y03ZwdAK8QIq44+PzB
+0lS/KRCcSBqNMh+0YjVc7P7FnBueoi+8lt+5TF54BGaK/7/ROrFGYzbHpzjjlS6C
+ms/vNuGhIe/zJOMmT5QSSpjTbnBNtrQrfm1rwsz1apZ+Uz8cp/3hJHc/JMGH5DZh
+t4HzXVqggpQed2yx7Uewm7j7yc+Z/6GK75izsURXyta4MeGSyfKAGQQQFwN7FKEG
+qFGTtLUV3tgDmj2nQ1NJVGPhWQkA98+txNBWKfX0PclNXbFgE1FngPkM0yCkGHiY
+Qmh0jBCaQOyOgDquflmQo5r9Fas6pXWcyoBQyBNtEEHvCAsjW5RRMhH+W2QQ/TS9
+ij8r7srbxfd0oS6ttdlTxQ7p4cifrgriFKN8LxE2CEdZMBrmgfUU/yIDPwxZmFF8
+0TptNGDXw5Y6QHhKbq8Q9PFE4+3EqCF+XngQnjQNyP93jKGpPoANoOgIVNC4NtNY
+dUFNQ8Yvm+ZAzYJ6sJCbLew9f4CYcpqE71fpkRbwXn8GlKKxXqs=
+=9WCF
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 623bac8a91bf..73c61729e2c3 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 39eef405726f..0ae367044d67 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6d3c227799eb..1a04d581400a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.27.137.gh.tar.gz 2423020 BLAKE2B 9cdc1cab324eaa2b2bc17418180bf8be
 DIST aws-cli-1.27.142.gh.tar.gz 2426758 BLAKE2B 587791e0102d51b9681718a71c1225c673f1545f98d2cbd679d266c559ae4252e92ec2c41a640584b5ce1e4aced885489723edb90e0700846e3fd74968be42bd SHA512 cb2ba71dc955ddd5a738f6e703a16216effdbd1232fa4e14c5974bf59c6f871ba80a4a61614dccb0fc110c689ce24f466c4142967be83f48c5de41699450d092
 DIST aws-cli-1.27.143.gh.tar.gz 2428987 BLAKE2B 3cc1d312e2a5cb4187234615d42f69c1296ad810a317adb2ebce05514168aee5b58b9ff0240e84bd31d4000d6f6cc76d476bee739ea6d394a833ee25ec422dce SHA512 f82634435ac67ba1cd2b43913d86c66ebe0dd06d40a708ae63a2bfc150a9733f1c80ff82362b48834ede5bba317c970d88d5e70d133860bb0ef022fd00ac07a1
 DIST aws-cli-1.27.144.gh.tar.gz 2429624 BLAKE2B 63b447244a5e1d110d30d69d02c6f895fcd667870c25e7f85abb0f51c47fe7547494010930bd0167861c187a0cfef3d298e55e83d1aaa77614687ee90b69da35 SHA512 979a38e3b089258d6828d55294ac5ba664df8b1a62180a3ecbdd98e0554676952e785c6ee917ff31eed32ec36cde0e08cf8cf98489eaff6b2242d6923493d2a3
+DIST aws-cli-1.27.145.gh.tar.gz 2429805 BLAKE2B ea5b6c44dc96cca32037a68de01c613c6452cb654b135688ebfc926716f9eaeba2a6fdbd708859d0f9a5fa64b2d110d65196d85aec56188861714ace0b3bb43f SHA512 e019c06de19fcde6a4a191291076fb109c5bbb80eddf74aaa38c64242e0700dea030927e9bc5d95183eff728737084a03af732ba6f6a8ab9f9e6f21f9f33fd73
 EBUILD awscli-1.27.133.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.137.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.142.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.143.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.144.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.145.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.145.ebuild b/app-admin/awscli/awscli-1.27.145.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.145.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# 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-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 3f6ec85cb03c..16595e5bb19c 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -2,6 +2,8 @@ AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
 DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b SHA512 434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a
+DIST sysklogd-2.5.0.tar.gz 459695 BLAKE2B ab8185e114f7da2c35b6ba3e3b42e13f3697155b43ccfa923229d95150e3734f74db6f732bcbc999068d8a2f8124a404ee893d2e6ce4c154f89301b3b523df39 SHA512 4599f153b046317977de990455b1eea195967da81f68451f1bda4fadba6fe685d7fe533aba3b39f4daa456d6c4931743162a021067e0a16f072a7c77908286f9
 EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39
-EBUILD sysklogd-9999.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6
+EBUILD sysklogd-2.5.0.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
+EBUILD sysklogd-9999.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/sysklogd-2.5.0.ebuild b/app-admin/sysklogd/sysklogd-2.5.0.ebuild
new file mode 100644
index 000000000000..24bef0bd0a53
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.5.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
+else
+	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="logger logrotate"
+# Needs network access
+RESTRICT="test"
+
+DEPEND="
+	logger? ( sys-apps/util-linux[-logger(+)] )
+"
+RDEPEND="
+	${DEPEND}
+	logrotate? ( app-admin/logrotate )
+"
+
+DOCS=( ChangeLog.md README.md )
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	append-lfs-flags
+	tc-export CC
+
+	local myeconfargs=(
+		--disable-static
+		--runstatedir="${EPREFIX}"/run
+		--with-systemd=$(systemd_get_systemunitdir)
+		$(use_with logger)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
+		elog "Starting with version 2.1 sysklogd no longer provides klogd."
+		elog "syslogd now also logs kernel messages."
+	fi
+}
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index b823887c4367..24bef0bd0a53 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,10 +23,7 @@ IUSE="logger logrotate"
 RESTRICT="test"
 
 DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
+	logger? ( sys-apps/util-linux[-logger(+)] )
 "
 RDEPEND="
 	${DEPEND}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 6ad86c9b3cc4..297a9e48336d 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 1730eba3d2d5..c20797b7d25b 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,5 +1,9 @@
 DIST rarlinux-x32-621.tar.gz 627883 BLAKE2B 07957401eea5efad7295a4da31f56bdb5ea64935b193f594f8cd5755aca9b4ffded9a2df834216c604a65b1fb7c0ab99c59591afb7f54dc65c6d74ff0b37cc0a SHA512 3e83806ccc40edfdc0740ca416cac2480e475fad72be4e245d500272f817c35f4c1ed05f7a40918f463b182d52454a3c02bf469298d56b973977fbda2d261b60
+DIST rarlinux-x32-622.tar.gz 627428 BLAKE2B eeb78f7dac2777347d54d203645ca9861c89d4e9bf47e1afc369eadde789d837b9537bc602cf6bb9262b188f70ecbe236463f15e12ef986d5b542d6ccb1a3294 SHA512 0d0f2e374185afc6541aa54f059d4d21a4bc6eaddc8ca42fa054866db1ddfbf7022ecaf35dc3677198ad57e4d84f17e3dd02f501b6bc48ea0eb54ce9d5168c05
 DIST rarlinux-x64-621.tar.gz 614402 BLAKE2B 8ab72e52aee82942a5917f6742fdb135e6be9187609e3a857103b8758385f85cde1e95bc2c13e87e20d6b39b1e5bb77da7f917b2ff8a01e6baece9b462dd9135 SHA512 3f990213b2366e1c829ec24f9cdb957a29de45f2d12b9a35de54709443f977aab495d5bfd13ab2b46d77b83283635c827b614a7c33585925ca4fd4d9405e1c90
+DIST rarlinux-x64-622.tar.gz 614091 BLAKE2B d158052f80dc300f7a5c189d14bf8fa484a857e459c7c117fe9da4e7fc86f5a41b9176742038f11b8564ea78b1cf137eb12dfddb0df1c44bd08c0d4cf8de3296 SHA512 a38a930c6861aca0f1c7ce28f4174f464b537f4bacaca52b065c5cf31d3c331421c481d522785471874e000df441d8ea810d36f7ecc8be9dc849c73683af47d9
 DIST winrar-x64-621.exe 3585248 BLAKE2B b65643c87d422db0094ac54f855c34345f4d07780e5b91a0ee203e87ffd3e10091ef2338a269a3f01c40cc4324b4b3f2254614e42535681d896b627db918b8e8 SHA512 42f4bcbff08f08dd45097b9ac07444bb3e157d6e9055c307de3f1cf86b62900e9cdf5931cee305e0bb0991a6f5ef060196cc42a29b8fc7d233032036a42b1494
+DIST winrar-x64-622.exe 3594776 BLAKE2B f3c9e90e9a84951cb57522436e153b1d0c8c4f4e13a66126937ad68a5d773ee55b394c020f7fddfbebee8cc1b24721566e2a1cc5fcf0724108dbe5a5446d0a84 SHA512 f73a6b37f96db444c8099c8f41c444bc216ce57c26b1401d3be44531ed28aa2e59802b71c6191992602ef21fe7a6e20414af87d6d3ba0071acc89b9167a1718f
 EBUILD rar-6.21.ebuild 2289 BLAKE2B 2a4ed068245b6907f8d2023318942ea1e0890cb1fb266d8fee61ebac35a436af747a428a26307b5d0135099a0ea5601a96f9531da63244b9e88a4d99923fb2dd SHA512 22661c82c6df0cdff56dcb3186b946a7b9f738bd6e6056363ff6da8ed4f151b7a54ad6d0991b80b2ccad06c2fd664fd538bf440b39151a1cd9fd0501917aaa4f
+EBUILD rar-6.22.ebuild 2291 BLAKE2B 6894ac9518b0fd85197a2bab67a054b3a839216ab37d6b6bcbae43f3d7258378b16c00d33b9d6dc607df9a098a140c344c1ca0ea68265a82fe5927140bff46a8 SHA512 2062f218641661d914cd796fa53226e589c1f8e5bee1c139bea71f65b0d1984680f71202a021a61caaa4c03e6ff4f5bc1657e683d12d41b9190e20c8819d44a4
 MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
diff --git a/app-arch/rar/rar-6.22.ebuild b/app-arch/rar/rar-6.22.ebuild
new file mode 100644
index 000000000000..cb2c7ce9afaa
--- /dev/null
+++ b/app-arch/rar/rar-6.22.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/./}"
+URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
+URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
+URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe"
+
+inherit unpacker
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://www.rarlab.com/"
+SRC_URI="
+	all-sfx? (
+		${URI_AMD64}
+		${URI_X86}
+		${URI_WIN64}
+	)
+	amd64? ( ${URI_AMD64} )
+	x86? ( ${URI_X86} )
+"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD BSD-2 RAR"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all-sfx"
+RESTRICT="bindist mirror"
+
+RDEPEND="sys-libs/glibc"
+BDEPEND="all-sfx? ( app-arch/unrar )"
+
+DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
+
+QA_PREBUILT="
+	opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/unrar
+	opt/rar/rar
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+"
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	if use all-sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack_rar ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar
+
+	insinto /opt/rar
+	doins rarfiles.lst
+
+	if use all-sfx; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
+	else
+		doins default.sfx
+	fi
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	docinto html
+	dodoc order.htm
+
+	einstalldocs
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 641e0145b641..c9e138f2b91e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index cfb9c686fa0b..d398d61f2d01 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -9,5 +9,5 @@ AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668c
 DIST open-vm-tools-12.1.0-20219665.tar.gz 4355225 BLAKE2B 4405e3f23963b8d86c079d7dfd0cabecd18199ee88599775d5bb1bdbe1f5fe870983b299978a8ba22e749462dc984c0e8e985629dc3e56cd008cb3ad8836af85 SHA512 00cd71a5fc25d854d0043b2ddfb7f759e3b3138acb9f33f7452641d7520e46bfa39ff784bde6c711de6e8aec24309720532100d7a8588fb1bebaa378b9566a2a
 DIST open-vm-tools-12.2.0-21223074.tar.gz 4365836 BLAKE2B ecac1ada523b9ba6e6f9e880f700a9c35200e9093c81f3367ce3b196365166f682f7d8ba290f624417b83c3573894020fe6b4cbd82a117412ebe80df283f32db SHA512 d663d8ea455264cad7d3eaac16c5d08672e8e10f7a9171be40fff69e208ae697bc0e8af498c978d8de470ed273351b42c54994b2c552fdc05b828c80f4826b84
 EBUILD open-vm-tools-12.1.0-r1.ebuild 3127 BLAKE2B 7a1bec881aa17d5711c342857fe607797b5fd4d4563432c65e2953108e5d0475d5aa39c2ce223ed35b539e987c61ce63e0bb4386d0277bfcb0b9acc37975d8bb SHA512 8e6bd7f3cf44254b71427eced0773b1a57cf0ec05e3c225957139c9198843b0ca3b354ffa21edc978a96d9c30dfe9611b0d6171b1ba46b0646f6ea2e9dff1d25
-EBUILD open-vm-tools-12.2.0.ebuild 3128 BLAKE2B 811ba896dcdea4425bd8c7b14417e5f2f4f8f330ce937c8932db4929373a23d82c83a4ee5c3307d6e59cdd0cc695c25e458c3216a541fb8c67d5a6c998cf60c5 SHA512 c85686138b0d5cd661536a40686897289d42d0381ac695c5de9c4c45ea89fd277ac5a56c0b7fb74ec7cbeb418b4b108325f37ecbdb013da22fe025232b9fabbf
+EBUILD open-vm-tools-12.2.0.ebuild 3127 BLAKE2B f911bf2d836d15be9a4f1d4ade854fc882134a7a8eb1f796ffe03b92aaaf52d44d32ff3ab8dbb19fcfb1387ebf13e5c7f95a654c06f269205fb0939e4f9fa5a0 SHA512 8df2bc76f05011b17d2fa2d1ba044c767c491468524e5aaa774229706eb75e2debe107b9a443639f2d401fa7cdf27f2140aadbb5be25205eff73f1310f54009f
 MISC metadata.xml 1155 BLAKE2B be59d8dad6f92410c7244a90ccd9db69ca50bed5eac69728b5920b57d2dfa30f37740077f1a6c367094da0ad757da9cfec8ae958a56e76107e132cfd4cbce0d5 SHA512 6fba5194196c4abcbd954fe69b8f97205a0f1d7da3bb4a2220a625cdf918cc48c92a10c61f0cad6736bd153a3e9b7c95672279b5eec05745299fded939f542cc
diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild
index 5979ede069e8..38806cfd25f7 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth"
 REQUIRED_USE="
 	multimon? ( X )
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ddcd0b181c30..b126665e0f76 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 2f0e51cb5d55..dad222a87df3 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,6 @@
 AUX implementations.txt 891 BLAKE2B 396b51d8b10cb61d90ae9a3721641d883d0c52d61c35f8118263862325a8b65badf6f0673d14f84647ea5cdc6214ac49ccc5921e5d2aa3debbd45419de54fbe8 SHA512 83e789c8abf708c7041afdd13bd94cf4a2c9179cb73617a77bd4ba085421c61c5c105eebc7af6f60792629e69e42be9fe4237bee83de957f84d616ae9c31b5c4
 DIST gpyutils-0.10.gh.tar.gz 24963 BLAKE2B ef6bd54195e1bfbb0734ef8aedbd13dd27b52d2f62d95b741459ecf4f5e93b80085a4cebfbe184fb8ac7e7cf97f4fbb422c5b5e36d0bb9dbc27896a4ad72d86e SHA512 baf6d44db447774ffc976698874f87dbc858ef146aa46ccb0a7e15a1f3d4d1263f75b2f46f319e45fa5994620c71e37ccc42b42b5f05dbde8f3cbacfbd45cbee
+DIST gpyutils-0.11.gh.tar.gz 25460 BLAKE2B 7ade315fbc7101663b0585e9b36a559c52c57c39f1a70043a2b196d627028c463b238a841cdacccad452ce09598799d692f066f4e1c6e59f96ae42407cfdb968 SHA512 27c6d30fe00846fbf5094575e2dd64528fb970cc4031b1c1fa805c865adb0f39ebdf517c168ed8da8c645a5bfc79fd5df01a77ce8eacaf96064c730d1799638f
 EBUILD gpyutils-0.10.ebuild 665 BLAKE2B 6c4b8846c249ac9eaf5428e4b5ce8c870614ecbb9d449022611cace4463626312572f426a3c285cda6fbdd2efe1677feca7ba801645029c69045a10320df3598 SHA512 79ade953f6bb20be5c3c1cb03eea0ed80fd2f2909993da02180c2a2762f9bae5949f094dec0ab6393cd6c8b54c43266afffd5357b39a34a3e219bf78dc6a5c9c
+EBUILD gpyutils-0.11.ebuild 667 BLAKE2B 1e8c82c7f2acbc91172c9e6d992c10919784d63e0cda381ef0b8a07088f0c0c48f500e89b5a5f32a2c207814a6902bd01ef0a83bca140ba31290d9d399e19f92 SHA512 2ea01842546dfa46941afddd68c048996fabbec19a38f5cb824035ba83c3f4c3d7da1b901cbc7c3ddea23bdfe33fe5e5595946eb1ce20db90589d83a3700f23d
 MISC metadata.xml 601 BLAKE2B 3a90fccb93c2acd9e02c847f5a9170c6a7b976561d02e76ec0f58906b4b514b352bd621fe5a64ae6c8653253417a90fcce5b10e13bda2218b9b7bc29a86b9b8d SHA512 ce7bded5842dfd2dec8f0db875d8b302726f42deec340efaacdf4c6f99cde9daf18365f3edb9367b6a77f7690442b14a0b925bb2265c58f833a0937d6325dcfa
diff --git a/app-portage/gpyutils/gpyutils-0.11.ebuild b/app-portage/gpyutils/gpyutils-0.11.ebuild
new file mode 100644
index 000000000000..2fdd373e1707
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="
+	https://github.com/projg2/gpyutils/
+	https://pypi.org/project/gpyutils/
+"
+SRC_URI="
+	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index f60a8af76071..6dd0916945ca 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/edencommon/Manifest b/dev-cpp/edencommon/Manifest
index 6a46c0f18601..0fbe52816d70 100644
--- a/dev-cpp/edencommon/Manifest
+++ b/dev-cpp/edencommon/Manifest
@@ -2,8 +2,10 @@ DIST edencommon-2022.08.29.00.gh.tar.gz 143430 BLAKE2B a66bae35413097140b24c9313
 DIST edencommon-2023.02.06.00.gh.tar.gz 144809 BLAKE2B bfde04282eff3ad745ed02708ba550e81c3d7916c634f01bc3fa9f2232953b4ccc8f319378636add4122cdf4c944212d7ecb649072c82f44dd8751640bc8f260 SHA512 c5763aa6a035febc6ce2a8b32c7ffb576b0a73448cf44e4a3788d87c45507a429065a02c37bce2165b2b51b3139cef51dc5ecd6cce203093f9043387b8912b15
 DIST edencommon-2023.04.10.00.gh.tar.gz 146594 BLAKE2B 8712de4a79d1f0d2fc2f9fb88c6ea262e5b9c849c96848a3ff0906085e0088a3d68efe12b7e4d7085c05f6909f06da5f3b40c54af522da21bd19a0b795aef06f SHA512 2f1c32b1940834f0b6e5cd104832f0a373cb417fd3e64e9e744c95b24361a3df5e540bf14a74be15a95b4c241cfec92c6185bc0bf11e1de927f729a3a9458ee8
 DIST edencommon-2023.05.01.00.gh.tar.gz 146608 BLAKE2B e6669f43baa4c52909e7e831636ee52e4aa438dbcca7f040220eb69eb7e832c8cb190be52c5ba7dbe3d6e3cf2ae35d02a0c52904096cbff41b96eef888f5f632 SHA512 39ec2234bd43dbfd666b8e066891f14b10ac50076ac97351a082d07a979c1bfbeb0036aaa30862dd055fa8cdf4c4b1b3b5a5416c3aec91796cc2be7a8986997e
+DIST edencommon-2023.05.22.00.gh.tar.gz 146695 BLAKE2B 23003c0d9d5364d840ec8e286ec2512a28740df70480593086b2c969f4f785b3ff9000e074729fdaa561f3bd917ee204bd2719878996d606567f38fb50884149 SHA512 20b645250c41f1db95ae9950577f020a0c1240178411e3fcf7eb1219dd2bf0e3d7ceb0e98a17df7ba82259a52856d8001baea7ff8b1c178e22e7efb48b41587a
 EBUILD edencommon-2022.08.29.00.ebuild 869 BLAKE2B 55f75751770a07d0201ff07640ebda0fd724541acdd174976577e16dabf95582f346491fa713ac7d2af12d465884ef69dd3e44799b6f772847dbf8942def247a SHA512 775e7af49b381efb4062c02cc407b6dbbbada6ba5428e7cf96f6264a2240876fef841099320d5335c445ac0e3cd3f06056c23e1ca94f2c066efea5cb8a7cc472
 EBUILD edencommon-2023.02.06.00.ebuild 874 BLAKE2B fe1e890a1b6054061f7c7d2df9cd64099fb131a2ebedc38eb1f4df1e50973db017dcc2669878a035aa4ed7d9d1f748b95882f62c86a75221c1b12129316b8ebe SHA512 44a5aaed2da61e3134088a44983fc93c8665f2a9bc2f519cc98720f2275f6bf564d6e2e8eadc4797963ffeead6d1a7ba900067f26721c8eec816f04f90d7fbeb
 EBUILD edencommon-2023.04.10.00.ebuild 875 BLAKE2B 9923ebe3369d37693f295570084ea079de3116099b9ed507ccda4279da5e64fcecaddaa2b3e5d710eb9d066e62a96e3308f2da3dfaaa42f7b1f0e9df73cc0d93 SHA512 e9e9cb9c0ec650a3599ade17a854faf679f67c2277beaafacd1f38f9db97bc032bb74b502acf87b32e2c81fb13f60a79036e28682d976250c9c309eb136cacbd
 EBUILD edencommon-2023.05.01.00.ebuild 875 BLAKE2B 9923ebe3369d37693f295570084ea079de3116099b9ed507ccda4279da5e64fcecaddaa2b3e5d710eb9d066e62a96e3308f2da3dfaaa42f7b1f0e9df73cc0d93 SHA512 e9e9cb9c0ec650a3599ade17a854faf679f67c2277beaafacd1f38f9db97bc032bb74b502acf87b32e2c81fb13f60a79036e28682d976250c9c309eb136cacbd
+EBUILD edencommon-2023.05.22.00.ebuild 875 BLAKE2B 9923ebe3369d37693f295570084ea079de3116099b9ed507ccda4279da5e64fcecaddaa2b3e5d710eb9d066e62a96e3308f2da3dfaaa42f7b1f0e9df73cc0d93 SHA512 e9e9cb9c0ec650a3599ade17a854faf679f67c2277beaafacd1f38f9db97bc032bb74b502acf87b32e2c81fb13f60a79036e28682d976250c9c309eb136cacbd
 MISC metadata.xml 336 BLAKE2B d87d655ad085e53410760329202ce130e41d98fd35ca8c9e38c07665177a21d187c94a4570d3c18a409eeb89f00017edd50cd127adbbd35f99a0da1fd342f048 SHA512 894ed9ebd715743d2ce4591456a5776e1e215cf8845ffa0e16e6b6a25b316213b5547b0e3717050dc83518c9c2e100348c0804f25e599cb785415b8411def8ac
diff --git a/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild b/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild
new file mode 100644
index 000000000000..411e811b2905
--- /dev/null
+++ b/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+inherit cmake
+
+DESCRIPTION="Shared library for Watchman and Eden projects"
+HOMEPAGE="https://github.com/facebookexperimental/edencommon"
+SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind"
+
+RDEPEND="
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-cpp/folly:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index cb0ecc648541..1c107606c082 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,10 +1,13 @@
 AUX folly-2022.07.04.00-musl-fix.patch 1150 BLAKE2B 6774badf3856fa94ae69dc4ca3fb3aca628dcf3b96fd7d141967815a9a07c07349f852a35275baba7b91d60e0c61dc3e1639cab4727666fa128d0334f36815a2 SHA512 15029e25b4da1f9cfe227978a54f63c198361df665b4657ef6a80ffdd3911c80be8e6c3799c8c16ff0fcca050932155628651a6e5ed566a41174dced9e51dc58
+AUX folly-2023.05.22.00-musl-fix.patch 895 BLAKE2B 72f3dde91fa7eabdc08c3375e660f31beb833835decc129570667984d973d8a71db37cdef3aaca28375a64e6afbd04df0849fc47798d7982556a84a028e034f4 SHA512 afdaa0edd233f21693b947d30d549ed13a8871bf49e05be97d8d86015452d85769c2e46929f5cce14c3cff8eb7000431638ee0c8fc3f97b0765a4b3aea3b20b9
 DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790
 DIST folly-v2023.02.06.00.tar.gz 3790845 BLAKE2B b1c0eed7a2dccba3ccb5e25aa24cc0a6d628fbc3134bf0ed82a1e0e614825a3ae620d79a54e2bea398274afcb662bdfca48d7193f69db35f624ed6a2fa9bae99 SHA512 b9cd8132a702e88e4c9fefcce190d9fd403253c9b71dc22316f237922d99f9cd980ab81d50ddb48ae0e614a493b3d61865b03eee46d59805f83fce528f831646
 DIST folly-v2023.04.10.00.tar.gz 3816300 BLAKE2B fe262148583321ee55da9305a9e060e48915598c08edbd0edb884529d0a9547783f2e1a45b0f39e461ea6b92e9c0b74fc7b071ec1ed044b810ac2065c93a5f10 SHA512 4f154127f24e2e57873ed8e135989c214ae3bbaf0302594b3e67de89e04bf4905f45471a488220ecade56b9ae2b928a779b66f7632210a02b1087a4c05141d5a
 DIST folly-v2023.05.01.00.tar.gz 3821115 BLAKE2B 6b2e14dd7b88daa5f81294143f0ad62dc119d7f20f4e4a48859213997cf67df9840a46b7933cd806af166394de1981b0a9f2d9f194e2cb54c73eed8e60c3ed04 SHA512 92bea2e7449a85936a93aef8a216e83f402be41bbd9ab4e90759600bb40e7903e4c8e490cadcf40f098c7a69e187db4d1062645fba8ef15764ba753276ada535
+DIST folly-v2023.05.22.00.tar.gz 3834791 BLAKE2B e981f844b12620b274a78fa6640d1510525c1b4cc3bb35594bd5c5daf238eb19291a1ddf19f29e26269effbe79c22ccc9c002f5f547e06566aa804f0d92a0a9c SHA512 4af93f23a6835efaca317dc7a15abe13619d498efbaa5b349a30682be35c129bd87ab9723c5186e63e3d3b646a80816b994f5237108f8d489a50a028bb16c9da
 EBUILD folly-2022.08.29.00.ebuild 2474 BLAKE2B ba8b143ee679b37e2facd8ac30f6eee6ca8fd2606c5731757f2a2b5d6f6a9ce655d97f97317c907c5452e0e6494e81ee1dee376d97c708cc950b9e1e6090853d SHA512 81b7baddf458a0d394e158671f71f613fc7b760aea065b5ce7ab26856bdae9303462ac770b6dd067bf49f63fc776fdae4a66c9437cd9de009a2e716969e044f1
 EBUILD folly-2023.02.06.00.ebuild 2690 BLAKE2B 589a40f4a2fe368b18be4ea70797cf6eea3b6727b4efad54d355db9d67502cd939198d11f13d5c513c4e228d9ea3b39bd5671cd823af1dd5a0c2827c791eb4f2 SHA512 efa4c04142de56766c4e6beb227b00839e1f6bc3e8df6b4f27ff487521f0676e7164775f7a6e77c93a6ed14fe23009abcd525557e2a4bb29fa135373a2ab2fa3
 EBUILD folly-2023.04.10.00.ebuild 2822 BLAKE2B fa3df4771db2609c819bc25f63999bd46162b65887aacb713ec4d009ba8b93c332fa1c5d0138e57d8a7bbee302c383fa2f0f32784a59afabdfc0660d7a2328ea SHA512 d82f58b20eecc0420fba647575d2822f0e13ec5b33cf8a72db5a459ad8e7131f4255136229331c21338015109eb99000d4711b6fc145b6309d16db719167ca65
 EBUILD folly-2023.05.01.00.ebuild 2822 BLAKE2B fa3df4771db2609c819bc25f63999bd46162b65887aacb713ec4d009ba8b93c332fa1c5d0138e57d8a7bbee302c383fa2f0f32784a59afabdfc0660d7a2328ea SHA512 d82f58b20eecc0420fba647575d2822f0e13ec5b33cf8a72db5a459ad8e7131f4255136229331c21338015109eb99000d4711b6fc145b6309d16db719167ca65
+EBUILD folly-2023.05.22.00.ebuild 2159 BLAKE2B 3d0e07df3f6bd8f6ed0fdfe9c4eb03eed6fa13081491b5e01427d356ca3e9d84a6a764272185820da275f9386d254ee44b60bdb00c1ffcc83c3f8ee339b5f19c SHA512 9ef6005423f1c9d2e847e479c487518aa16be92c64009af52648d2a657620744eb79a1024f42a0699a8e7b190fa7ca077b0a86bd3f0f866edd99bd28a5f63bbd
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch b/dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch
new file mode 100644
index 000000000000..6f92db0a785a
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch
@@ -0,0 +1,26 @@
+# Elf.cpp expects __ELF_NATIVE_CLASS to be defined at least for platforms
+# besides FreeBSD-based ones, and so it defines FOLLY_ELF_NATIVE_CLASS with it.
+# Without __ELF_NATIVE_CLASS (and apparently musl does not define it),
+# FOLLY_ELF_NATIVE_CLASS is also not defined so what was supposed to be
+# expanded to ELFCLASS32 or ELFCLASS64 ends up being
+# ELFCLASSFOLLY_ELF_NATIVE_CLASS.
+#
+# Please refer: https://github.com/facebook/folly/issues/1478
+#
+# Closes: https://bugs.gentoo.org/835744
+--- a/folly/experimental/symbolizer/Elf.cpp
++++ b/folly/experimental/symbolizer/Elf.cpp
+@@ -39,12 +39,10 @@
+
+ #if defined(__ELF_NATIVE_CLASS)
+ #define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS
+-#elif defined(__FreeBSD__)
+-#if defined(__LP64__)
++#elif defined(__LP64__)
+ #define FOLLY_ELF_NATIVE_CLASS 64
+ #else
+ #define FOLLY_ELF_NATIVE_CLASS 32
+-#endif
+ #endif // __ELF_NATIVE_CLASS
+
+ namespace folly {
diff --git a/dev-cpp/folly/folly-2023.05.22.00.ebuild b/dev-cpp/folly/folly-2023.05.22.00.ebuild
new file mode 100644
index 000000000000..08296dbb6784
--- /dev/null
+++ b/dev-cpp/folly/folly-2023.05.22.00.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-libs/boost:=[context]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	>=sys-libs/liburing-2.3:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
+# libiberty is linked statically
+DEPEND="
+	${RDEPEND}
+	sys-libs/binutils-libs
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2023.05.22.00-musl-fix.patch
+)
+
+src_unpack() {
+	# Workaround for bug #889420
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	default
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+
+		# https://github.com/gentoo/gentoo/pull/29393
+		-DCMAKE_LIBRARY_ARCHITECTURE=$(usex amd64 x86_64 ${ARCH})
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest
+		# Long-standing known test failure
+		# TODO: report upstream
+		# - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout
+		# Timeouts are fragile
+		# - concurrent_hash_map_test.*
+		# TODO: All SIGSEGV, report upstream!
+		# - ssl_errors_test.SSLErrorsTest.TestMessage
+		# Network...?
+		-E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout|concurrent_hash_map_test.*|ssl_errors_test.SSLErrorsTest.TestMessage)"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 406f1df0853b..e92c359f1f54 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 899820460040..340a5bc4fedd 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,7 +1,12 @@
 AUX tomcat-native-2.0.3-slibtool.patch 1085 BLAKE2B a23d3756071916a550c8418ab1ded93077106313b399545c7e8c5c91201c4d61b5a8c4ae550f197b50186012d64c0be1057cb9099e762f72c3f1dea32f047734 SHA512 c0bb7146e41f4c2785d6675bd46c5c7ba9279119ea8d81db0271c9874d4da9c4d60d8df219adfe02d59d19f5be1be4e659ee3bf50475052a60d43c3d029487dd
 DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
+DIST tomcat-native-1.2.37-src.tar.gz 438373 BLAKE2B 89ec571fea09b5ee0cf5f5ffec8f5547b08da301e713361687d7aad96f70b3b789a5f26061e2277b90b845f9df1c7c140fdee4c83f1ba05d168bcabf2cf1f549 SHA512 e845239f1b6a1dab22885d39f4fd131e464c38b0d52faca0d960f99fe3e8b7d732c0112f25e5eb81ff8dc71a5e3c6799bfdf867e617d8f934068ed107036fd0b
 DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
 DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222
+DIST tomcat-native-2.0.4-src.tar.gz 318845 BLAKE2B 44cd99ff52d5b402c2d8caa6819e2e420c84399f7f3cc0be38cd2a40985ddaaf89093005454527976ad2cf083c90d39c9c4d600671a8e5c7c07d0834b23d93e0 SHA512 276133e44ae9f9d3e853b66120937865c675eed6dd6b5b7d8a94ef741f037c0b3d99a6c065a1303c0ca42b65c109aef35b6bd370a2af0b7b2752eadf85b1d880
+DIST tomcat-native-2.0.4-src.tar.gz.asc 873 BLAKE2B 509c63dce69c767d3dd694d7994c8b2cbb4f84d40095ff89373a165d592449fc028402b17bf0e25c9ffe40d5ca8383cda50703054fcdfb2fd4cb36bdcecdff0c SHA512 80768307fd1d46ca822151977b3d9fecdb3121929e97338a78c39bc439f914694dedbfff087cd512f986532567734f04422b4764ea215ad5dbb0319380fa05d2
 EBUILD tomcat-native-1.2.36.ebuild 1193 BLAKE2B 4dc4ce63f539bb24d6750adfc1fe24b2f3f64470c5b0d16eb2faf69bd9a9d17692b86d23dc643004b4d7a6dacaf22405fe9f10e9a2e46a107875bbfbc53bff17 SHA512 77aaec34bcd9172b57289f8b0a02e82bf29ed385e21be352b959162241944593a15efa103c4a7704019e71be2fd9c24d3e95ec78198d489705de78046d0ddc4d
+EBUILD tomcat-native-1.2.37.ebuild 1194 BLAKE2B 85ceafd1111a3cba29edf38c638ec33d68d64a69da15c06ba8c0c060b2353c1cae1b4d60aacc6cd19af34f557dc66d98f90c157e4c31ca4602aea0b7fd27f27c SHA512 c532e8cce0fd7b628a6602d01af7123d2c9dc87357ceb418dd54ad7546924d409f7b83e2351a8ad1d0eb1b4d9d9221ef5d0e69d3f857fd361aa4439252c6eb3f
 EBUILD tomcat-native-2.0.3-r1.ebuild 2169 BLAKE2B ef455d4fe17957c4e52c38fa3946483e299b80b49106a586f0b43c96be9b57b886049eb2d42c41b7a77b85c04ad88ce8f36f6af8ce5b309b90041f3830d3638e SHA512 0bd0176625f1c10b9b7ee67add2a35a5f1df7195590c8b3d6c6c22afc5d298d069459cca951e2e3108735f370cc2de218b9db9a1d4be332dbebe4b4fd6963d88
+EBUILD tomcat-native-2.0.4.ebuild 2169 BLAKE2B ef455d4fe17957c4e52c38fa3946483e299b80b49106a586f0b43c96be9b57b886049eb2d42c41b7a77b85c04ad88ce8f36f6af8ce5b309b90041f3830d3638e SHA512 0bd0176625f1c10b9b7ee67add2a35a5f1df7195590c8b3d6c6c22afc5d298d069459cca951e2e3108735f370cc2de218b9db9a1d4be332dbebe4b4fd6963d88
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild
new file mode 100644
index 000000000000..5098a6d937b5
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/native-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild
new file mode 100644
index 000000000000..e5d555c68e08
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit autotools java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/native-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
+	verify-sig? (
+		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
+	)"
+S=${WORKDIR}/${P}-src/native
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="2"
+IUSE="static-libs"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/openssl:0/3
+	>=virtual/jre-1.8:*
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
+
+PATCHES=(
+	"${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914
+)
+
+DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
+		../build.xml \
+		| sed "s:\${version}:${PV}:" \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+	default
+
+	# Needed for the slibtool patch
+	sed -i 's/configure.in/configure.ac/' configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	default
+}
+
+src_test() {
+	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso .libs/*.so*
+	dodoc -r ../docs
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index da22d72e22ca..fbcd01bc3ac2 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index d2faf3adae40..c907b584a36d 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -7,6 +7,7 @@ DIST ansible-compat-4.0.4.tar.gz 65116 BLAKE2B 3f96e052cb9ba0352884fe1cfeacf9a1e
 DIST ansible-compat-4.0.5.tar.gz 65711 BLAKE2B f40e87012dba936ba8b6f204559484ff089034123da4c355f997d7cec857efc64adcd0a4ec9abe021a428f61c692b13a3e3146f78a1896689c61764286e03719 SHA512 c08bbbcbef7e49001009cbd691dc226626f1392dfc5a5be89166da0be91c8d5794a2e6a158b11787320a1dcbe24c85eedee28596b0fc27d0a3c2a499286f5efc
 DIST ansible-compat-4.1.0.tar.gz 66781 BLAKE2B ce0da545e4a81798ee9376129b9f9e8c0cfd7ca641086ae55516406b73f89472a1fc44384e3728207be76cb2b8d1b724c55ff5dcf72e88a0f971ccd59aea8a8d SHA512 15b40622a00bb3b4ac3c8ed5ef05e0a65b867fbe9579352fbcbff8113d46e8da5fb5c36e0092387da4509b33244c8d27c0c08de76ff8dd78fd19e465824078c5
 DIST ansible-compat-4.1.1.tar.gz 66834 BLAKE2B 9558bd83e4662ffb9a9f45b2e5b24e36d4d1066b8fb082513ce92057a2c106b255d107a1d51a75bad3fb87e750d195e74be2918cefb599195b120ad6cd4a5ec4 SHA512 c97599b218eb32ef0c9761202cf2b616586876466626c7d249be71e4d519b417f5e85342e0cf682e2e6bc1f7b8af73863eb0afad5dfaecfce744eeed830f6956
+DIST ansible-compat-4.1.2.tar.gz 66934 BLAKE2B 08d17ce6f83b2ac2fc08fab1b3ef54742e75eb0236792fdcf2791a521bc154184d92f6d1f25b241ac6c524352f9cd39be8d3c74d414625a315a468aeb8ce09a8 SHA512 ef6ad4daf7c565de5b1ef1a5ad204e2b8c938f81ef0a736a1af660836ee557d5c88fc06eced2a8a9fb0c6ac5b48cda243052d5ae0b0f634653c9d41211739e64
 EBUILD ansible-compat-3.0.1.ebuild 1527 BLAKE2B 96e2661ff15393733d6b14ec2c3a3e80a1088c6091c4c18ae890e63209c89da545c9dd6ce43a758d7657172bc99ed337b7cd9854932b1ed5f90c5b1a846e0f01 SHA512 e00b04aae139353bac04b38ca8af9831aa20cba91ca222b7f729079f620f1dcbab67d67b7a55c183ba0908ad9bf2d502cfbe2d934db4ac2075d480c6b37d770e
 EBUILD ansible-compat-3.0.2.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.0.0.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
@@ -16,4 +17,5 @@ EBUILD ansible-compat-4.0.4.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5
 EBUILD ansible-compat-4.0.5.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.1.0.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.1.1.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
+EBUILD ansible-compat-4.1.2.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-4.1.2.ebuild b/dev-python/ansible-compat/ansible-compat-4.1.2.ebuild
new file mode 100644
index 000000000000..bbea175e5664
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-4.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.12[${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.4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${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_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 631d1a0be1e4..4dfc97d512a6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.26.137.gh.tar.gz 650777 BLAKE2B e4a7d02ccefbda53b33558dc107457eaa1d
 DIST boto3-1.26.142.gh.tar.gz 655602 BLAKE2B e9d5671308e71bb43a97953407f4aba5b78594ed39b26c3c992af9db8864e3c363ab874a66b5b015083c4a18fe7415bb1761137367783a70ff22564ada8a8842 SHA512 c2eabdb47898aa26fc8ba8a8ebfa43a86153188af1f1600bfa741bd3af1ce68a8692e461aecb5a29df94885e1c977b06c3cd009f1cec52a2e7a9dc853a2c3942
 DIST boto3-1.26.143.gh.tar.gz 656551 BLAKE2B 67ed6469df9ac6f8911d0d59d1f256db424e1302315163fac71b1da94be4b9bd25dfb99c97009523cba56af48eaf32276fba3088b703daf38a40724d8e715183 SHA512 ea982542cf7138368a9223049418859a176065b03ee3919895245c35667773206ce7587b101f7af72d30893c38d05afec28ca72a7d0968bcc209d24c118709d2
 DIST boto3-1.26.144.gh.tar.gz 657264 BLAKE2B 47d9d5fe5d1b134ae2ca0992b8bb2771f85b0bbbafe595ceeaa68d7d7805596e1a7abc9617a02b70da2119cf2d5091d0981ad049b1d38fc8bcbd2be8bff8ef78 SHA512 2622ec60e3b682c09c82905ff52a3b8bc91b6f69085b18b842482597d7defc6f6740dc0969ca1bd69f2e585e35558e33e69fd63401ba0063b414d90c5434688b
+DIST boto3-1.26.145.gh.tar.gz 657839 BLAKE2B 32ff5e931bded9ebc887a4ac04f0d6077684205ce0707ac3af3f116024e58c102a35b6520e464d3778f9f49d54bd371c1a9ae5d5311f974a5f28d2e986f12abe SHA512 5eccfc1edb28889b2d7eb3fbd888cb36075307474ccde24e867a65bea4e67f04c47f1367a5f99bd79a61a0179e983f7a02b99adb1a9d1e5b422a3323bd991440
 EBUILD boto3-1.26.133.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.137.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.142.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.143.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.144.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.145.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.145.ebuild b/dev-python/boto3/boto3-1.26.145.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.145.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..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_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 1f2a4e2bdcb9..af9c1f1f0807 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.29.137.gh.tar.gz 11508178 BLAKE2B 2f74fd2f3923672a4fcd501f1c5ba4
 DIST botocore-1.29.142.gh.tar.gz 11528069 BLAKE2B 860a5ab68d26424702006b221e62e29cfe21ba93593be61e4ef7e89ab50c6afb4b305f2ef3b2d80fd428cf7791933e43b20e1d4934d330653290a7b2aa16f6c4 SHA512 f408175054095bdd3094dd789de333e4e669cee72fdbc5b03551fc006cbcda5cf69eaa6daa2eb3bf09b30524f50d4b7b334d7b18051e55eca12caa16529b41bf
 DIST botocore-1.29.143.gh.tar.gz 11539133 BLAKE2B f1845154fe406cbc06fdbaa1bf8f48a98b40f267a59b86b9574955da9ad9d01c8eb573327ff1f1e68c06682ab2068328dc3bf8cf3cfe0df277a13afe51c70a50 SHA512 647301c2570f214493a934e0deb516a3b08b1bca34b71dff1a068c67427eaaeb371894f651cfb7152e23a31f91a63af3f25f47c198b5c6b65113eb648ee0b3d6
 DIST botocore-1.29.144.gh.tar.gz 11545575 BLAKE2B cda5a1c91b44218d43a4f06f6f68ae44cad4d1ba0ff4b88a168642bf7f8be7f2a627acba2375c9d8dbc1b5648d71dba4e37a2da5dd9ce8845dd0ee716504ecbf SHA512 ddd3e8dbe334d663012e92c2839f91387751aa7a69b3bdf1331ae25f145700c26e1c62e4b3a8bb913afb38f11d02b5c0da34fdd5d45a97898bcd0b468163a4be
+DIST botocore-1.29.145.gh.tar.gz 11552372 BLAKE2B 1535d0535719d0d2efae25fb9f2220a7381c6a6a5ee31e6ebd45c14b80c122c703bf9395f5a215a6fa671dd983b58ab4a9e5c6ce2a5bc429d5944df2319ce9a8 SHA512 d6d4a57cb552d496b81ae24fdc5d777d25c5d75781cad89814f86618e591717feae62b43342b82aa9550e0e42b7b50dd52b6ec82a06794f5f46f0751aaabc31b
 EBUILD botocore-1.29.133.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.29.137.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.142.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.143.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.144.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.145.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.145.ebuild b/dev-python/botocore/botocore-1.29.145.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.145.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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_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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 587be0bbcb1c..2032bba016ef 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,5 +1,7 @@
 DIST cattrs-22.2.0.gh.tar.gz 117001 BLAKE2B 34601cf48c582da2d9aa8d741a08919b5f06043bc6ba6b072d8b0934e90e781349b1325ced478ca0b42b50db1f7fe2a6d3cd16ac29609efd72c9aa894debfe9e SHA512 d198864402f56d4e9403c61ee3d9d109c5eac3350908afa1e244dbe31e4bc986271fcb4c72bde9cdaa9ee865c6a8b81de68ec0d51490ed658b410714e1fc550c
 DIST cattrs-23.1.1.gh.tar.gz 602294 BLAKE2B c0be7dc8979919c4d29f9bd51203d219b9d65bbaa271a38f4d1d6c705121a5c9747c3b8a29431de8ea6769baeae67323b8bd6f133f9fd6c80aa1f3bbf969b4d2 SHA512 8a048ce214ed1aa4b138164e3cd7e39fec84ee3d46f167dda402e3de0041fb0548b2e75051c63694a5baf59c78705823247e4204408f5d0b410a9aabdc68c7e3
+DIST cattrs-23.1.2.gh.tar.gz 602336 BLAKE2B f39ff3c1525ea14789edd137d82343a9447de0a41f65a71ee85754a15f8fdc929137125043b23c6cd088c8b2d2e9da18577c3b6dbbb6e9a33bdf6789f117bc46 SHA512 d05c8a5d4c5dc0b69ccdf33164d44c35a37a871199a35d1c2c25f9fbd8ee53d48da8e9d9bec49cde2baf901b524d5e8ff1ade175928908ea81f94e8398224488
 EBUILD cattrs-22.2.0.ebuild 1265 BLAKE2B 611c0e7707d709e4b7f68e5c5d13c225efb555e69013879ff2414c0a74ac78c76678fd3e8ebf32c980a220eefeb38dddc715a2135d32c2413ba3c32827238a79 SHA512 804d75159dfce03ab9484a8bcf44c7cc1cacce112d0c697f0513c6af4d278f74da209a8fc6ab853d425dc18f07b41bc26ff01d08ccb6d75c55067197ece86b65
 EBUILD cattrs-23.1.1.ebuild 1272 BLAKE2B 3d866fd0ef5bc3f2e1ef2a399a794354be9aa3d0c055c7355cca4f00098ce87bf8dd969f6bed436ec61c6c58206163ccf32af4c6fe05e8997147fe202ae3d457 SHA512 bd327c2521f6770d79d975dab8da6a1973474215a1325b5cb440c5d2ee0e2d9f059cb9289532cd9911f7b5b3115fa6ac3d748a7fe1d2e8b6159fd6690408462e
+EBUILD cattrs-23.1.2.ebuild 1463 BLAKE2B 86cea7ac63e47afc9864cca02801bcb5ebd5467d9ead421d3ac3a6b7dafa1d45f18ff91e7ee9f612db7b4c28df3c3f32b0af0aea5a3ed67a6065beb9dc3af47a SHA512 ec4683189b50d35ac986d3115227757294275868690f869a5e60e114f072e35045588efd0d5bec8852d13d2d59519f42c91dc8a0ce98a42a3101337d41daf5b2
 MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-23.1.2.ebuild b/dev-python/cattrs/cattrs-23.1.2.ebuild
new file mode 100644
index 000000000000..cf1b943f4846
--- /dev/null
+++ b/dev-python/cattrs/cattrs-23.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/
+"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+BDEPEND="
+	test? (
+		>=dev-python/cbor2-5.4.6[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.54.5[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.18[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/orjson-3.5.2[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.2.0[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.11.4[${PYTHON_USEDEP}]
+		>=dev-python/ujson-5.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--benchmark.*::' \
+		-e '/addopts/d' \
+		-i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p xdist -n "$(makeopts_jobs)" tests
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index e1b63ade5359..beabedfe1aee 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,9 @@
 DIST cfn-lint-0.75.1.gh.tar.gz 3487870 BLAKE2B 26aaf3b24023260d7a7d8f2b89fc9135e0c34786540c21d1c1763decad42167f1a29b01859bfcb17fe5ac1fbbb08aebf04191c6d1b21b335c92e2424c986cada SHA512 d4dfa9331c77f7c323b217203c470e15b4a62a86b42497934a4f9609d54a499211058cba4c561034f6c3dd6ba52ade30084e9a9d25da135289f783ed972a14ae
 DIST cfn-lint-0.77.4.tar.gz 3510766 BLAKE2B af5f8a842863504217b90cea80861a889eae2d1bbe1d7c8c9b429acaee00d291ddbe71e868577acc689a1ff04aaf9c5b2f690a839235cf57202b6226bc7f1abc SHA512 96fe05b91d93b2581f546973bf0a812184429cfefb26c69e8e14fe6ac6402219ab518777a3f54fb30092c30189486aacd0841d1db31a191697ad1c333662bb98
 DIST cfn-lint-0.77.5.tar.gz 3513226 BLAKE2B edff62682027d87fc4f0934aba83ca1cbd83773fbf85246eecfe1d1908b8ba0f6df413b2dbc8976770f7eefaec78bde1cd7017ed36ffac849687436364a42f2d SHA512 e80231e8539735d0a114c6de81f9c52714a1886dbeb070b78bba3c9dd2798399bbb6eb41b3917b5c826b4d3d571f2d9996a5eeaebd7a48a9b774135fb0966372
+DIST cfn-lint-0.77.6.tar.gz 3554363 BLAKE2B abd496cdb72e1032c92a6489da12a4ffb4f83bba994067f9e2d333e55a13ea22d07db880dd3acca208f9b8328c17fe98540cec2847dac32ad87b2662aa0047e4 SHA512 b36c781dbd3294d6f2cfe43f617832170e47c9c9502845a551e6a9263e28dc6de99c77abd998699a2fcb6f08535daff615b17072c3ad1fe9c10853890a71989f
 EBUILD cfn-lint-0.75.1.ebuild 1594 BLAKE2B 537ab8571cbc50fdde95e0901af7a627c3eb92a125f8c33dcefe96ee30b8a95e548fee0a33431d7034c44521bf5581a964770a36df863dab1ed047107cc2665f SHA512 3a7053518919d0c806d80ed768eeb869ab00a88b891a1783e10b425550a481d978c516021f9f37c7e30ae5b055eb9683d7a05cf3edd17ccea2fd1813b0405c66
 EBUILD cfn-lint-0.77.4.ebuild 2011 BLAKE2B 9380625c02bbfa616e3d71e5b7688325852b6976863ee5d666b770e999c7faa3cf9c613ec366f800ca09db208c590986d942d506b27539539910885df506e8e0 SHA512 8985e25ab09102e75e67aa318db1b8652f048fdc3432370a6ca0308422c61a3afa3044e4098ae40be10c22f260e7d4bf81372a41192ba0cbae7576a8f67bdbf6
 EBUILD cfn-lint-0.77.5.ebuild 2013 BLAKE2B f530e08427d10e913795201f7c5ec4747a1077ec38e4243163ef8c6d25b8d9336aa87c732844dd687140a7a0dbe558e8b3825c72faf8563458c7518eb61178b9 SHA512 e0b0145a72fc6cfcbb14d55d95b55ec7e58e95b43c6a9762d3901a0352c4d0f490b8f13400fbbdcf0c92f4b1f5d281b5960215bb45908ae956b3e0d3d74a7c92
+EBUILD cfn-lint-0.77.6.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.6.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.6.ebuild
new file mode 100644
index 000000000000..6f296e7c5910
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.77.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index bd81de40c266..22f929ab904e 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,10 @@ DIST google-auth-2.17.3.tar.gz 222865 BLAKE2B 32b7a483cf458415157057fc92631ca4b8
 DIST google-auth-2.18.0.tar.gz 224653 BLAKE2B 56de5ac899bd6f143e1e1481d787627821c4f82cd4cd94597c6dce9753a7ea9605b9647464eb42f37571e2f6cded9cea5c966416bdd6c96b6413e1ef3e2b2efe SHA512 2443c7948cb71803197dba2d57ff92f4c17981fa47ac383e9636d2ed239a7d71f43a4d8f61c7c90c651b8d13a0cfc5633a815d72bd731e92d83f3bbaa1b95118
 DIST google-auth-2.18.1.tar.gz 224714 BLAKE2B 2fa63ed18d4dfa4940c93e5f3fb099a6892a16148e5161c3e52980cdee80b7b153a60c005bd3d1d856476f85678b88315d3f4b639f693d292abbf8133dee9397 SHA512 34e53a1c0cf42ab600281d815f259bb252987f163925e357dc2e636c945fd4b74c1f4168bf7d90a6e352fe1d7343767b68bf94fdbb1bc90a92c7067b0e2f2f8f
 DIST google-auth-2.19.0.tar.gz 230075 BLAKE2B aa79292c866ff006c240ad3dc0d157b9c8d66c3ee722b328860911bea509f73d4cea5f4fc4597c95f5b6f5f6cc9f793db9d85c6bc8772bc7157e6e2ad566c56e SHA512 3eceb1c0f0797c9ee3eb3e60f56495b81234640bc9da95d43b1a2c817cedbf0588434b8a5de7837433788a5aed42a378582fec2568182f2554bc24ca54c7ab26
+DIST google-auth-2.19.1.tar.gz 230290 BLAKE2B c7f76e1bd936d4d76c81e19fbf6bb50dfe700666d8eb234f762253547fd670d1d26a97a7fe4457bdb719712d32e28e3c8f9adc82c475ee6830f5fd2af994bb3a SHA512 8a8106abb1a0966254caa2e568fe9a9c887601b19e5309f4d43e1b07f3e3280ad358cf8999e34719d6f23473b263d128a2d0321f0ff184c4e188b0b5cf88a6ee
 EBUILD google-auth-2.17.3-r1.ebuild 1502 BLAKE2B 2584d825075581b0185e33536a49f232989211770e62ba26bd89c7cb8be4f7df68dfde860418c8ab4b8e0b93972d9e1015bebe0eb44a30ea532464f53c55c0f9 SHA512 63c7d81173b43acd8543c6dd14bb6ee55ff3b583ee42f7389a0557f053fe519bd6e065e2ac9923b54d05d15c7a56114461d1d35b8b0c81c417ba77f47875c82e
 EBUILD google-auth-2.18.0.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
 EBUILD google-auth-2.18.1.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
 EBUILD google-auth-2.19.0.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
+EBUILD google-auth-2.19.1.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.19.1.ebuild b/dev-python/google-auth/google-auth-2.19.1.ebuild
new file mode 100644
index 000000000000..c7a6aff8ed05
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.19.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index a2c8a0ca685d..9cfbbc03bace 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.collections-4.1.0.tar.gz 17806 BLAKE2B 7558a50407db2113718701c52196f2ae2e0400a1f91104edb280e73ed5f8d74f9976c4309649684022ff83e8d5f55ceb0a9dbd44ca97e08fd508eb516e8ad4af SHA512 15ec220503304cedaa2c03a94cea79b172500685cc640902f774d178994cca1acda9cdc2a9b8f0ffec54cc98b0b75d2cd70512a12a453ea15ae19af4c691a3f8
+DIST jaraco.collections-4.2.0.tar.gz 17623 BLAKE2B 8e96751618156eb9c45d4f0d8ee79f7ef5de8ef8332d3d0d8ecc27567057ca2d6702bcea0c3e8f8191bf8e5ddb4e37bba1facfe23365991a7390ff6c36939689 SHA512 4b26923b4c014399da45d8248219065dd56489ff434acac901cc04ccd32fe15ac6c97afa3aa88939d4d887a341c64dd65797d514ba287550a1f1e99183e0f71c
 EBUILD jaraco-collections-4.1.0.ebuild 692 BLAKE2B 5b1c7adbfae4f3bbf7fdd18fd91ebd862d763ca3ce40250fab4a61582c07050520871ac01676e3d3f323a759ea9abc7a0b60582995a18c5249aa56bca61a8b14 SHA512 1d43b94b1199a2c12590b3ae5a9b73c0d4a416aadb51092bef6f8d9ae08dee847dce8be8637eee871865df8cb49009c6437244e3406207b149c9d027d8d6822b
+EBUILD jaraco-collections-4.2.0.ebuild 698 BLAKE2B eadf7fbd3d509287928ea0b54467dc090d16f325a3ff6404c3d726d45b8236e009c7b3c7419e6e5916bf97b4cf178e33d58686bd7cbaafd23ff45c20ceda7109 SHA512 86b07fee6a49f7a1904c6eec7189b9da6f70bf97e1273e71d2493b0168229a933f126cbac03d0eb1971d83f82e14e916e6366e11ddf076a753569eb3d764adbd
 MISC metadata.xml 578 BLAKE2B c6ad7ecaee92099645bcbd75ed9eff9da2a83268e8a7f828b2dbaf5414228f26b40f09fa37fd156d128742b111cfcacb3e177970b217d4de890ca7262275b26f SHA512 b2602fb629500021bd8fad159ddfcdc76a11f15fe2a51d0d25d5d687ae09170f6cc8438c252e8cb2792ca43bec7be65e249a799582f17c882639e30a9222a0ec
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.2.0.ebuild
new file mode 100644
index 000000000000..69c1d0e05956
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-4.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.collections/
+	https://pypi.org/project/jaraco.collections/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index fb804aa4f938..4c65a15184e5 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -1,4 +1,5 @@
 DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
+DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST associative-cache-1.0.1.crate 14048 BLAKE2B 77f36f2d23b6d07e556f20e743c9a0e47c0b54899397c64dd6d4fc9b4c31469481d4a99ceb28b250924e0aa5f52de9fb65ce93ed96f23191f2984c32156bace0 SHA512 2ad673ab907c71cbd45abf3cf59630fd56aeb95888c94932b9fe5d83d71d0c14f908915670cbc0566b691035f82ac2069ed17589edbc97db1e4388225ac2a040
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
@@ -8,6 +9,7 @@ DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.24.crate 191330 BLAKE2B 492a5f1a458db9d6eaf244ac6ee750fee5b4e2586b7c675f87f2515143080774f13f9c163bcfc84b08ec70b90c7fab2ffa438f9b2b8b4ec1e691fbf9a104ad50 SHA512 1a9121870aa4d76448a1b118a2e135a145a55c7784c4f5a4f25732f8597b8655f32cbce174bdd65c2dc7b17dcc3a608454d0e3dc29b86338e42a839f8be1e4fd
+DIST chrono-0.4.26.crate 191501 BLAKE2B eae49ee247607995c28463b8c3e2119497141e69d19a756c408f2b72d94bea39397ea2d0d3cd2ccbf1348ef973dd8bae6d29a0d0590e8dd34633f365a9170adb SHA512 2b66faf4d8374cfb0485710ceb2c9c1ce63aa6f9670e405a0810af4aca01c57d8dcd198a1f4cad498d5efd89e00003ba1b4f0bab599422af4f9bd6fb74494c47
 DIST compact_str-0.7.0.crate 57618 BLAKE2B 5137f045b86cada339463fa9d1c6d68203e3eea49e2d856f80354b2391aff57b1035009b661217b0aa1fb07598089a7ba46e8f79ffdf1b2278edd81b4714aa1f SHA512 69177d624f8b7c5af4edecef7163006d29a1ac949b84c0af4b9234018e5750dbbe39178d18fce203e3721ffa097bae9bcb2504cbafa4e47357f7b837a07ed0e7
 DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a
 DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31
@@ -21,17 +23,21 @@ DIST libm-0.1.4.crate 110593 BLAKE2B 5018f4efbc8fd45ff88a28e92c273bb3b48724009e1
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
+DIST once_cell-1.17.2.crate 33335 BLAKE2B 8f1bf825fd618fa1070c3497264085bd354c9b470aab08663179cf2eacd1778b6dde0c54247aa5c8091be97c40d3da20e56dd92981318a0c0ce85d41c3a740d0 SHA512 8a00338f5aabe766fe5cd741cafd8c2ff544d60d081e5706b0965db6c86e00cc7b5fa0f73d8aa54cd1f4506a0858de589ceb4bd32afa7046dd3a1fbcf52b69d7
 DIST orjson-3.8.10.tar.gz 836541 BLAKE2B 90c7e1a298ffd4af93f26312f501c558a642116c482ee21e9304aa363d1ea95aa817021dc7e5d150c94b5fa8b174c489546e364dba434add77eccfaebe969572 SHA512 68828e9b4dc2c8e2c8675ece61e366e38f027a7eb3058d0ed1f3a65916964ae67bbb11fcea3414c330841b79208fe52b2c18263493f09092c50d73ac0b549720
 DIST orjson-3.8.11.tar.gz 659654 BLAKE2B 3e55bdc18447cf181e580797c96c132070a35790acc25a9d46228e072d3f259622c45bf0310f3d69692520d009dbd7f27a0a40dc53e933ce49eceb591f148b7e SHA512 a6e898ab83abe45f1f285343985c7e638579cfefd5c453ac184a54d02b44f1ea7ab13ca5a3a20ac149e3b93da6a194e963dd816006c49c21abcf8aad9cfb13cf
 DIST orjson-3.8.12.tar.gz 669172 BLAKE2B 7b3b57a5a81c9d77f39f07d5c3349aff65f0628b7bf0ad8aeba74c9b0c18d3a173aed4539db81f4d00c666eca933bc0bad511ecf6e82c9001f520c076653f4d3 SHA512 c2a6a106721e5c84d52ccc255b60fb3da67d442604c5dd5e2dea63a6d52eece87fd3d1d81a2691c1f93b4c21a0f608a8c1ea6b19d8ba4995584a562780ff39e9
 DIST orjson-3.8.13.tar.gz 4213635 BLAKE2B 3bc934f7a851e6d1f7e888fc8d095c40478f372a4737972c58a95c0c50874a9bd0ad8d379782cad2f460deb9af8606aac23743123c7acad00d6f8e1e111aa9cb SHA512 9b458f4a9aadd5985ffc7f2cbfc07485a89c101b5053987995d47e4f574131dcaff8fafa6c132764067bbf33800a2a5fe5040f9884e52c28ca6c87cd9c26ddb8
 DIST orjson-3.8.14.tar.gz 4214204 BLAKE2B 49e21d252dfd3dda861f419ab673eaebf4f727ddeb362be735de429a51b16cdf24dd8f161898cf3a912d7f2cf6af1d3a0f236833cc036cbdd61d30b41612c57e SHA512 6c737396f0b59c6c519fa38c401edad01e132c3031b346b1982a97a965a5f5a64fe28eaee51fc797d04998ac4016383bd79067d670ad3ed022cd2ab03bfb6b05
 DIST orjson-3.8.9.tar.gz 657071 BLAKE2B 7486ecedd2c80e9fd7a7de907f18b3ebea2f7aa992d81f3ac21caa0e515167ad94c516081a0e2a0059dc9ac734f3d98b0da2381db10574f6e35475e9ef824be1 SHA512 a1409de1b099011ac8566110c08502708b42339ab7ff3b1e6600840aa32d655ddf4960128e50fe174278ded119e3996f662fe2faa3d3284ca42c56f2f8bb5d7d
+DIST orjson-3.9.0.tar.gz 4197133 BLAKE2B 3ff0b8c862d79b2dd83e95920a0a2f676e43849b8e51b649bb5d7c8e9c4cc99d025af97c4f6b4b2c148c456c46f7cf99fdc7913962e9dbaa8d8cf1251818d82b SHA512 4731a57472cbcbde92d041ba53c1800b13ce4698e05777962c1701478df2b3a4fedccb76f1301c0ca978676b32039591cfbefc4ca4b532408df98642c36835b8
 DIST packed_simd_2-0.3.8.crate 97388 BLAKE2B 89d2a1401efef8e0a665d883b41a587601cd4704a6acf80c542f3e6e274a6fa9c975a03799857c409c8764bf6698784cf85f1fb73b4fab2c4f98b368326760c4 SHA512 de1ff7cc43f6d0f6e2a94073ab80bd178864d375d334c4d8aaf30f8ae3320b6aa470f14b25babc264d9032af0c4fa7663e442321fc91acbd7adc7550b5177984
 DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1
 DIST pyo3-build-config-0.18.3.crate 29137 BLAKE2B 5fa645b64f50a078f38cc10a27ed52bd7e7aadd8a069c05ec2963f0b7c869b94d29eddda97cc31d200cf749ab8e2cd9cd1ea00e75620287e9187745ae0e100a5 SHA512 7ccad5f245e84895e147389f05270f32d12f81aba46bcd0dc184b8d62af2ea579efc50383502efda40601c981c4dbcf911aa7d8192364caa2e177ad939062cdb
+DIST pyo3-build-config-0.19.0.crate 29172 BLAKE2B 20904ad814ed9a22b801eb7b06851292d50f5716116a5b4a670e8c499878bf6d193525a4579b044ed413823c17ecd1ad0178baae1cab1fe3f431cc9a0f442576 SHA512 3105ce54bff87bef803f30b79d3ab2dbe440d68418f8cdc875f18ceb2bb0d06ed0923cf02af5f8293ca901f40b96c1b99a12a8a8e74813dcf70534d3aec2bfb7
 DIST pyo3-ffi-0.18.2.crate 62903 BLAKE2B 31e52b73705c1e5f44e419f314b1674a722a604fb52be5d5e5ff2ae9881ec9f204c1f51760570ed4c210ea530bd9295a27beaf9b5631ef02370d42d3e4c0be18 SHA512 495dcf45154ce89b8cd3a3fe193938e199465cf510df1713f7ad82e0a138ac2f8f1b73ec80f8af72f79a4ed26a9f4e4e93d52357ad4f41a213ec0c7b602734b9
 DIST pyo3-ffi-0.18.3.crate 64474 BLAKE2B 32bedfb4c7d88e539e958af0dd48af311934a817282a01f860af7cd824fa1e3825c505463b78cda57541bea8ccbbedacdc0f67bef686e6775fab3787c26c6d2c SHA512 55240c7824ad1e5c69e05a31ec03e2064290c89c4c98f06c3ebc38c311a10b1690571c977a103790ddcc9623ac42fbf525fb028e910baedb9acafe39fd6e4a82
+DIST pyo3-ffi-0.19.0.crate 64481 BLAKE2B 1cad9db14e9c14e2aa24eab25439f9d8f7503b5f4c3e8bc9a58370e3d63261898ea678f75d276f9d2eedd5fa90a106f30e7362262619a81bead93bf45673e144 SHA512 9e01b15153c44f13c77c28719d3ab36bb859c4a15dc936af4af3e99f44946b4b4752faf3d2320391735b205ca6c055a43e7f5ac98ce53d281fdf536ce67dfbbe
 DIST rustversion-1.0.12.crate 17278 BLAKE2B ceefd32afcabec344a1bb87d818fa22b84c986367ebe58bfa54389080194141489e1c87397a34eab4d60d660c9e0d75eca3958225640d4e6a061c96d27778c6c SHA512 eb55f3c0324359e897ad07a5182426d68a067ea41461b62a44f98c2864d5a5d0f47733f88d977a6f537e39a801beaa3b5a6041230828c3213085b562edab133d
 DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
 DIST serde-1.0.159.crate 77014 BLAKE2B a377be7b7a0624ca9449d962693100d4ee892a252b4fe1326dee2057a214029ecacde05aedb7f0adcebc9815e6b4ea7ec2096ef4db4c55526defdef88a20cc25 SHA512 4e5373b940b5328fabca35759e8a02816c89692b83996c6224be39365b6409688ef2db0eef24219381003133a31da93a41b500a76aeb1b84c05df9a91ff4844d
@@ -52,4 +58,5 @@ EBUILD orjson-3.8.12.ebuild 1472 BLAKE2B 7e47abc015826477b1f6a362d2775ed9194c299
 EBUILD orjson-3.8.13.ebuild 1473 BLAKE2B 98b5b2b9717b1f97c341d015be9c6915c5463b92ecc48c70dfbd4207d1ceb17a0d852b0cdc35f81f57c4a48ae9f8eea0e6f1f79d7e3274a3704b68f50820f833 SHA512 9223e98343ac20511a9e879ade0422e6a0d5cc10e7ae9e7243f7fffe86f1f1d9a59b771dbce980b3aee4dfe4f563beb292ca33064e2b421167c09a588023961c
 EBUILD orjson-3.8.14.ebuild 1473 BLAKE2B 98b5b2b9717b1f97c341d015be9c6915c5463b92ecc48c70dfbd4207d1ceb17a0d852b0cdc35f81f57c4a48ae9f8eea0e6f1f79d7e3274a3704b68f50820f833 SHA512 9223e98343ac20511a9e879ade0422e6a0d5cc10e7ae9e7243f7fffe86f1f1d9a59b771dbce980b3aee4dfe4f563beb292ca33064e2b421167c09a588023961c
 EBUILD orjson-3.8.9.ebuild 1456 BLAKE2B 1edf21faff1a0756dd0aea48e7de4446e5b7f4ec5329229d8804f77dcb666facbd8fbc019067ecca3660fdc4a2347a414fa7943e47ced8441f564d640fd926dd SHA512 3f79c2878f717c41e284f45cb1ea84df6814e0065d9d30334008e166d411585629fa51b7649c82a43e89cf38f1569d59f3890261fd975a94e8d1755dea6e47d1
+EBUILD orjson-3.9.0.ebuild 1475 BLAKE2B fbdf6cf201fd0a82df64e2501b06717ea0b2e10ba81c7c2f5f2fdd3e5bb3a193e7f1430efb351759519f35bb98d7d5da2c06a9a4d86d9f13655f58946fc58d20 SHA512 1806741ff2c5ae4df9cdc27158a7e4acd6e8f1768a5d963dc9390e9681ae1da8c32afb48f92c75dc5630493600411a43490bc97f4d2e31b7422103f5127bb782
 MISC metadata.xml 360 BLAKE2B b19f85a4e5055dc309e35bf1706b10ebcc1961c96884bec0c9efd7ee7bf58adf53c0f61d8c1d1094c38f0e0bf78fa00c5be1e7ee58c85939ac1c6fff40fcbd07 SHA512 e168db6bda3fbb7f801aeb7a91733fad54441e21913a16447e7b8fc694fdeb0fe3216c15de2864efbf92f2ca8e1a0743eb3d62e8c250648e91be68a465c21ae0
diff --git a/dev-python/orjson/orjson-3.9.0.ebuild b/dev-python/orjson/orjson-3.9.0.ebuild
new file mode 100644
index 000000000000..b3c4b5401080
--- /dev/null
+++ b/dev-python/orjson/orjson-3.9.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.1
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..11} )
+
+CRATES="
+	ahash-0.8.3
+	android-tzdata-0.1.1
+	arrayvec-0.7.2
+	associative-cache-1.0.1
+	autocfg-1.1.0
+	beef-0.5.2
+	bytecount-0.6.3
+	castaway-0.2.2
+	cc-1.0.79
+	cfg-if-1.0.0
+	chrono-0.4.26
+	compact_str-0.7.0
+	encoding_rs-0.8.32
+	itoa-1.0.6
+	itoap-1.0.1
+	libc-0.2.144
+	libm-0.1.4
+	num-traits-0.2.15
+	once_cell-1.17.2
+	packed_simd_2-0.3.8
+	pyo3-build-config-0.19.0
+	pyo3-ffi-0.19.0
+	rustversion-1.0.12
+	ryu-1.0.13
+	serde-1.0.163
+	serde_json-1.0.96
+	simdutf8-0.1.4
+	smallvec-1.10.0
+	static_assertions-1.1.0
+	target-lexicon-0.12.7
+	version_check-0.9.4
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+HOMEPAGE="
+	https://github.com/ijl/orjson/
+	https://pypi.org/project/orjson/
+"
+SRC_URI+="
+	$(cargo_crate_uris)
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/pendulum[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+QA_FLAGS_IGNORED=".*"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 7019fbc8bb90..ea5eb2dcd8b0 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,3 +1,5 @@
 DIST pygraphviz-1.10.zip 120582 BLAKE2B 965b84ec6951c364084ddde4f0594ad7c14eb7e884062ad4f24042b6298b9caf10b3aa33eecfe8154c87c4bfd8d3651acc586129b019aef8b809130d69c03f82 SHA512 571c35f7a8013d5f128fcfbbd68372c8660560847afa0648737eae6d305a9283b69dce23a1b1aeb808bd4eac9c9cefa72b1d358fbc47b724a0b70997ea3f6d84
+DIST pygraphviz-1.11.zip 120803 BLAKE2B 004312750bcb9fab5c39af2c1de6c452489d9a2deea8211e6bb7cd722e9043070644b61c78047b01d649d41194441d82ffe2dde9fb17b6d9233bd0acee539c7e SHA512 3914d29fb214e1f7d59c7849e1e63e783902acd262912eccffbf6a67f8cbf6f540b9f2e84c9e7b4f0d90fae27f451a701a3b75a4dcb15b8a81bed463b34e2ef2
 EBUILD pygraphviz-1.10.ebuild 1087 BLAKE2B 5a8a04c3b9f7095c5e805985a462af69bc08ec8776138badbbefce7370110919684465c07f717580daac8eb03da545aab1ff45135ade5e00c5975e334b28ae67 SHA512 1b814d0dfeb5b43f25e9c927e6c5b975004cdedab69d67516e493a3e9e1728c3cbbdaa3eb50343903dd365be3b715ca76272ab63c034e1f6c43d3c52f466c9d9
+EBUILD pygraphviz-1.11.ebuild 1091 BLAKE2B 1a1458948b9fcfde1747941c32c524b4d28bafd5197bc7011d5d94e135acf25da245db6a574e28bf5ce00c7b173f68bc258c17a6a023449dc995b882d28add33 SHA512 425fc62e39d9a336f6a906cedfeb98061449e5635fd2b5f3c087c71faaee3c3a60d55e90caa1207a6d977c8c9362f8a0d9a171209cb6ec14d612cc11addec50a
 MISC metadata.xml 682 BLAKE2B 50dc3c55cac525fce3a396c94bdb48eb6e2c0b43636ae53c8ddbce2c9d3f82d8a080d881d4e6ac61ee71f88779c560d38fba3e10424fcd30af0dc80f979df081 SHA512 87e124765948529b7444fb1ad1ae655e18478ca46631a11a6613b289e2ac39600cdc00cc7af82b40694fb1e90c0ccad98be2fb457c5d7f74d5b087a6b3319aff
diff --git a/dev-python/pygraphviz/pygraphviz-1.11.ebuild b/dev-python/pygraphviz/pygraphviz-1.11.ebuild
new file mode 100644
index 000000000000..0d46c2c812aa
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="
+	https://pygraphviz.github.io/
+	https://github.com/pygraphviz/pygraphviz/
+	https://pypi.org/project/pygraphviz/
+"
+SRC_URI="$(pypi_sdist_url "${PN}" "${PV}" .zip)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+DEPEND="
+	media-gfx/graphviz
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-arch/unzip
+	dev-lang/swig:0
+	test? (
+		dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	swig -python pygraphviz/graphviz.i || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/install || die
+	epytest
+}
+
+python_install_all() {
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index 9e2fe6c20df4..38a7836ee1f4 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST pyproject-metadata-0.7.1.gh.tar.gz 14138 BLAKE2B 901e0b0b07d035ee220cfdba840a2b05ec1b1dfa3184ab614621c462b049bdbe484aa2d9abc42a54964c163d360028a00ff1db2c502504d11fb6d2837bd60552 SHA512 a4cb97b6646b765016f047f8d3da388ab758dbf8acf5a8ee6ccb017c764a90c069e04effbef21f878be7f4b01a5090f24252372300ce7e3a0410a6eea5d98b66
-EBUILD pyproject-metadata-0.7.1.ebuild 783 BLAKE2B 0fc9b03370d40733445b2dea06941a16d2c5845bd5b237d37507751138fef04a66bed25ed5dbb34eef0d7da2ff34f83ca4c8e5fee61008cda897405bd3e54c93 SHA512 204952d11d6c669af5bd5c5043af4f7b4095f9295f73169e33155f6ed1bf4092fdb033b16fb42cdb1fb1540e279f57556443942aa497b17f739d2cea770c3854
+EBUILD pyproject-metadata-0.7.1.ebuild 789 BLAKE2B 30ff9e38fac4bf4c5ba8933a7e33ad2116bdfb08f5b86c508f474f5ec31b2799429bd7ff0f393e8c71ba2814f4b2a34d73b221bc4451820194b11908b97e42ad SHA512 7dc260f8fbff44959b090a4abec991b822d9eddca90c4e4bb0f41c3ec4bbc562f290de77e470775051b86a1e3b06595d8447a290dd69570f81566b5da9dfb1e8
 MISC metadata.xml 371 BLAKE2B 9495774fe62ac433fa655bb324c38b18242dfda38e0e331739b6c35b9a64563aa03b95395930ff8c2d20ff16aaaa1513673c27db973e88293fd6c8e09d2ef0e4 SHA512 5c8dec2e04b6f2e7ca0bead64c4987d3226e985085262870c9502b26f76270ffec818cc76271ccfca8c719e991884bc40e5da18d092cad801dffc8ccc5207b59
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
index 07ad74509713..c9ddd8298a00 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 53584662d7d6..9de8f077c17b 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,7 +1,9 @@
 DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825
 DIST typing_extensions-4.6.0.gh.tar.gz 70037 BLAKE2B e5a287e839dc932b3f5777a8c575e725d414cbd5ff1444a9f67c8898866eb3863b0de4f107c5ffe73756d37e47b7a1dae4d69fead42fb887126479891bff5b17 SHA512 d78188c52ea6bf77852c5ac3e4601f9fca6fe3247974269ced8dc53e9b8c971446ff5501558200000757336a84d73db1e6e9fe89afd7cc26e025a97426475bb4
 DIST typing_extensions-4.6.1.gh.tar.gz 71263 BLAKE2B 4c4b91fd92620f9cbefd807103d035ebad46f3c384fc4a5b7f6fc9f0209ad267e2b752992628fa537f6ef2191e598223794ddd915d4a3ea89fd6a67dead346ea SHA512 c75553e7e5ade1f9e60a5432c76207452ede2c39533e9cd696e10ff36068e14bf0fe809a31a4a5d0a228228300e30d221af698c093c35dcc67338615ac77aaf7
+DIST typing_extensions-4.6.3.gh.tar.gz 75114 BLAKE2B 2c6761d26de5ce4a09c2957e93225798d282dcbc5689921f72acd2ccc338e458e21b2b73884af4a329c65f1a7eed7898e13e87fdab7fce757b4927adcdb09770 SHA512 4c8dd4e1494ed504466f3188146059203f9ce37b8f2d9f70929c1bffa7e58bee87c3ef01162cedb55ba3fd048cec0da96cc4141b25ba76dc32c7d493a69efeab
 EBUILD typing-extensions-4.5.0.ebuild 784 BLAKE2B a906e4aa49fc7d7c84ab4a6809b17c3220d60df3a53cf5b3697bb45603a5a15155f570ec5475bf57e434fe0f9254930e880d24831f8bf9c0c165c7002e93537d SHA512 f03ecb0eda6314ea7b2f0bbeaed414d0b35d2bf407ca0dcceaf97095737cbda33fce46bfe843e294f65c887128366161947bd7414c97e52b3f0906fe64b440a4
 EBUILD typing-extensions-4.6.0.ebuild 793 BLAKE2B 4eb73e341ef0fd77ddaa55ed2e5d9db04a5073b48af9c3f902289d07fc4e5fe0b0cd832f2c27c4b734116a83be1df302f23dc58210b719c79d0191ddca2631cc SHA512 1f829bb0588406f0868ab3a81c9464a0551334061a2f0ec149b93844634714a99dcba305744fbd39e02e5bd6b4d2ffd665e8fc4904e54bdf8c8ef3babb1c7e51
 EBUILD typing-extensions-4.6.1.ebuild 793 BLAKE2B 4eb73e341ef0fd77ddaa55ed2e5d9db04a5073b48af9c3f902289d07fc4e5fe0b0cd832f2c27c4b734116a83be1df302f23dc58210b719c79d0191ddca2631cc SHA512 1f829bb0588406f0868ab3a81c9464a0551334061a2f0ec149b93844634714a99dcba305744fbd39e02e5bd6b4d2ffd665e8fc4904e54bdf8c8ef3babb1c7e51
+EBUILD typing-extensions-4.6.3.ebuild 793 BLAKE2B 4eb73e341ef0fd77ddaa55ed2e5d9db04a5073b48af9c3f902289d07fc4e5fe0b0cd832f2c27c4b734116a83be1df302f23dc58210b719c79d0191ddca2631cc SHA512 1f829bb0588406f0868ab3a81c9464a0551334061a2f0ec149b93844634714a99dcba305744fbd39e02e5bd6b4d2ffd665e8fc4904e54bdf8c8ef3babb1c7e51
 MISC metadata.xml 409 BLAKE2B f2defedc04bc50fcdccb536be53f5148d2630bc235437d9c2ab32d579585e27c108f87d22cc9b458151e742d2f6c0788ae993fcbefe247295f2a572d8648ffaa SHA512 be8e74d9c73f2e4dfce9728cb06c3bc56ae35120e3388fc232da3f4cff17367775401805f63fecb74397ecc7ae8340d68dfa271cd06ed2fb03def8d155262d02
diff --git a/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild b/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild
new file mode 100644
index 000000000000..df5b00b2ff74
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
+HOMEPAGE="
+	https://pypi.org/project/typing-extensions/
+	https://github.com/python/typing_extensions/
+"
+SRC_URI="
+	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd src || die
+	eunittest
+}
diff --git a/dev-python/ypy-websocket/Manifest b/dev-python/ypy-websocket/Manifest
index 4c1e561ee0a6..3bf72600da73 100644
--- a/dev-python/ypy-websocket/Manifest
+++ b/dev-python/ypy-websocket/Manifest
@@ -1,5 +1,7 @@
+DIST ypy-websocket-0.10.0.gh.tar.gz 14621 BLAKE2B c027ebd10a2a6ac7098d662435eb26b5c3a466d83c22a9db62a795be72df86ce34f0d233f05fb6179f07cf479222db1266c9a5070130da23f87f7adbbb9b471c SHA512 8267a3598c4c0e7b180f1718e9f84e05734f2e75acc971a531bf91cf9eaef4f0f5a4404ba0444aa7664c639ce877fb7409e0a65716dca046fe9423cc8f079b99
 DIST ypy-websocket-0.8.4.gh.tar.gz 13416 BLAKE2B 9dd988d6eceb624bae2385180c408971a776f06324407506886c2ef5b8e713277a4c4fb0a2d328a20695d4db8808997c125bfb48faa60c93fe38bb1a1e899766 SHA512 20794b182bbf3958df9f3097ab8c4657acef1ca294c751e0524bc5a36cd7b7a6a2766ae9295cd5f9fc31070813d5b56e0e1e25e22931f63171f88b4757bb1584
 DIST ypy-websocket-0.9.0.gh.tar.gz 13677 BLAKE2B 663cf37af7ddddc1bf208da05bc92fc36d866b1a1f86eb2ae1d8362b023db95b68085b5d9eb35b5f34e106f41a819249db6a3d5d102f1c6a5bf04828d2a9cfc7 SHA512 5a193285fafc206de116e087ba10f37ee6e7238968d9c3e88537e054fd8c2238f9bf55c2b2dcb5871b8af9b080caba912a3526e124c33ea3156f19621312cdb4
+EBUILD ypy-websocket-0.10.0.ebuild 1011 BLAKE2B 856a170b7bc45672d22c2d2952d9202b9516771dc84f3ee4ede04bbca3a001ef4827d3218a2125965a58921e63b01890bb8c80a0058540c440f30fc0e42b6cde SHA512 ec5dd431f1ab7318f288aefcf210b221f1d3b331f5314f244de991d7b0de83f90c6097677c4ec0a538b882ec4a03cd31c5919aab1244f575458eb079bf13ad64
 EBUILD ypy-websocket-0.8.4.ebuild 879 BLAKE2B fe80cd47734c258da8d959c48ec9bba22f9ce10e2c091c181247b8e4e3664499cce764acbd0b61c149923a6f090bb542ce08662c8433aca7875f2927948eb6c2 SHA512 bfe1656fe6aec60315f1d3037252efbb69b7016ef1a99e48eab316325a1bba26b7a6edf469637af4831689094b1acfd87c8e5260c758fba5247339996f53957d
 EBUILD ypy-websocket-0.9.0.ebuild 1104 BLAKE2B 4d3d27bd15946c0aedd0b32a7023977fb308f615446906745e72cbea1f75e84a5d7f6f31a4058f029f2b3e901e066ff1318212ab39d6a8f04281255a5b2aedb0 SHA512 32f38d19e9f1088f4008ea4efc997bfd5af3b4639ac2ffb0fd129010af1555086512f7f411784d6174ec3f361c41e3d30793dd04c7192f173ffd0123a238456b
 MISC metadata.xml 414 BLAKE2B a58b2ac27d2f9e1a1d06c8fd9dcb6f9d1654fd2665d6d676a734ba228b71f6da488b835b7cb5739a6acad7102a669356e8f872bc96ce40b6ab0104699f8a7379 SHA512 533c2d5a8363cc5575d8ee08a3642f8b6fd11311fdef7d6902cc5e19fb33512ca2d9a6ecde76e909a6192a48449d612bb2b6db7b96ad1d99a89d67b06b749d76
diff --git a/dev-python/ypy-websocket/ypy-websocket-0.10.0.ebuild b/dev-python/ypy-websocket/ypy-websocket-0.10.0.ebuild
new file mode 100644
index 000000000000..075327cc99bf
--- /dev/null
+++ b/dev-python/ypy-websocket/ypy-websocket-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to y-crdt "
+HOMEPAGE="
+	https://pypi.org/project/ypy-websocket/
+	https://github.com/y-crdt/ypy-websocket/
+"
+SRC_URI="
+	https://github.com/y-crdt/ypy-websocket/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.6.2[${PYTHON_USEDEP}]
+	<dev-python/aiosqlite-1[${PYTHON_USEDEP}]
+	>=dev-python/aiosqlite-0.18.0[${PYTHON_USEDEP}]
+	<dev-python/y-py-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/y-py-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Requires internet and nodejs
+	tests/test_ypy_yjs.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2704eb676416..a156e33e27c1 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 52681a8ba253..0fdbe5477bc0 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -2,5 +2,5 @@ AUX slim-4.1.0-temple.patch 1651 BLAKE2B b979b550ad138ddac448f974b3a96ca5c7b32f1
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 DIST slim-5.1.0.gem 100352 BLAKE2B 19d0bea76a932d18a39fab30d0b1f2cd4f8f2eba108d79d2992112b568461cbc854a99d70b6ea97622e1928db7f33434221a054d77c5d3fa989da639fae176e5 SHA512 2cc39659a5c36cf37e3eea240f5326552fac0be8a42ff6bfe62837467bb77f8841b34d838d5a6945ff7195eb1e59842c64e04944d6882d132819f1ffbf609f50
 EBUILD slim-4.1.0-r4.ebuild 2132 BLAKE2B f3cf006a609dec8388a77b578f6c5af6e7ae268eb374f51cc9aeb288040dddfa1ad634782655e74718d3f79d2dd60663ca2938f4fba80f3798d48d848afbf1fc SHA512 5753cb009fe5461f5750742e01a8f340aa9ba64a027d6979d3aebe68f0feda595bebf7aa7ad93bf47fe10082d5f17e113b125f43ed90cf9d6b308efb738fbc50
-EBUILD slim-5.1.0-r1.ebuild 2237 BLAKE2B ab9ba32bc001af959c12675f29c2a943a2eb751d49e94349ab68688f35dcd5bc9eaffdb20d164387d2fedb14365dfd2a987e22085d72a75d119f254e106851a5 SHA512 ab40d98fec84795acd97e86e15bf59c942cb7d83ef642b6ac92b95fb49df7f1afebdaf9e040b4eb246fe87d3205c8dfe924d6413f9cf24a1799eebe013089e17
+EBUILD slim-5.1.0-r1.ebuild 2236 BLAKE2B 7507a967daeb1f4eb8c0d7beb8ded4d51d57c81b902dd98b45e4fb79dda227f6edf00874fb17023189b374f4747acccc964bb8d6cf4bf284a535255e4e0c9e03 SHA512 c7f67bc8b78a1749dacd0e039f1ab0016e7b834ddc6bddbde2a539ebad7643dc33d09016945cef51430bb8ec45796154cd657bc178562080003bd69292cf7bdf
 MISC metadata.xml 328 BLAKE2B 278b8ae81f02f38eb7a70fe1f6649cfcaa5a256ecdeaafdd1231b18050fb9b1a7e36d332ba6165867565ecc7d19ea425966d35a739950c170f151ad927ab57ed SHA512 21ea066ca55a1422879792472cc5b07a87332e5eb204b1311a5a63cbe9f33296a9ef48cba2491a50064baa3760a18285cec51882c3ca885a7cce2453a4e2234a
diff --git a/dev-ruby/slim/slim-5.1.0-r1.ebuild b/dev-ruby/slim/slim-5.1.0-r1.ebuild
index dcf46c00bc2d..73885b17435e 100644
--- a/dev-ruby/slim/slim-5.1.0-r1.ebuild
+++ b/dev-ruby/slim/slim-5.1.0-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://slim-template.github.io/"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="doc"
 
 ruby_add_rdepend "
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index edfb7d5a8d4e..7f9b7ee4de4e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 2dfc68a258d2..2fa43c590c22 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -302,6 +302,7 @@ DIST watchman-2022.08.29.00.tar.gz 3787691 BLAKE2B faf3f6afe351f7596256424c9e4f0
 DIST watchman-2023.02.06.00.tar.gz 3811103 BLAKE2B 9a7ef8b809855bd08bf7a75441a6399ed4fd852e40f749391d4f1377ad095e7f2d58800e9c44f058723751fa51fdd8ff88122276d1af6d3128344cd48457eba7 SHA512 4d7b4835130bf343f596730f0ec4fef30a9c0a521c9c35c06a80f652c26486dfbc8fef405fd0cc2586965b20c75c260383971da19d148173801d39c51a6d42ee
 DIST watchman-2023.04.10.00.tar.gz 3962793 BLAKE2B b4a26e38d07376ebea81cf7b0a1694a775cc71c0142157dce804173d153599e017dad516b31368bb034142bd13b4b53a5074613468870cd9e970e8644b312b9b SHA512 6d078cf7681bd07327b03dd159d5dd66ff84007cb149329642ec3ed6d8a785307f28668a0568095162b9ff654cd04104103d10b1e2d1db9cae14667d32d450b4
 DIST watchman-2023.05.01.00.tar.gz 3963267 BLAKE2B 00e9a9dd8426e112715997aa1e51700a1797d1e7d935d2b3f1e019d65a38d97cd61dda755e03703ea7060dab5c793408401e6cc04a1d0d513686ac387235524d SHA512 f36a625bbcfd0ecb2813bb33c04fb3314a6f3303cf84d3cef479d7b843862cb231a7b2f56ce13457bbf408df033a2d71fa8545b839225d8fbc292ea270f574e2
+DIST watchman-2023.05.22.00.tar.gz 3963980 BLAKE2B 08b6cb1e6d47fc7e29a119184b2fb9284802dcd56133bcecdc225a31acb207b82dfa86f12370eb5d804ce51a6ebbbc873a5ce9096bee4ea4a3386315ee97235a SHA512 3ac9ac5c864667e217b32b078ba44be097e5ab0ba63bc88a23b9c1b9bb8637d2ccd08f1a314ee974ebdcde04f6ab1ac847657c9386e36a30ab99af9694be36cc
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
@@ -344,4 +345,5 @@ EBUILD watchman-2022.08.29.00.ebuild 4863 BLAKE2B 78cda686e03e3bf5b9cb8544ab56a6
 EBUILD watchman-2023.02.06.00.ebuild 6661 BLAKE2B 95d095741ff4e8282ef17a00c9d3a940d1775ad3f61bcc9fe45f95655c430c51cbc109dac2dc6f20d80227b4a6c4181841ab862ba41d83958ec6a04893d55b58 SHA512 4d8e52367dd96c7f1547c7331e3d5db3d87ddc41ffe7b5eb46ced2e95134d5f55a94954882f93721087bba75050a745681ec7acd0ecad1b4f87e5bd06f8199f6
 EBUILD watchman-2023.04.10.00.ebuild 6848 BLAKE2B ea9e26a3922acd37d681eb2731daf410256ef0067ffeb9ee604738c81ba1c33a3f75d19af54578731ffaf2f5c4ad66c3bc853e123a2a056311f6826d437f0e15 SHA512 d86ab353cc92ea6f7a4a3d7e2159004603efb2833d33b7d9059ce4477c02cca3c6a89c738beb9104cae89154f9842155da5344878e97e0c84bd732641279283d
 EBUILD watchman-2023.05.01.00.ebuild 6848 BLAKE2B ea9e26a3922acd37d681eb2731daf410256ef0067ffeb9ee604738c81ba1c33a3f75d19af54578731ffaf2f5c4ad66c3bc853e123a2a056311f6826d437f0e15 SHA512 d86ab353cc92ea6f7a4a3d7e2159004603efb2833d33b7d9059ce4477c02cca3c6a89c738beb9104cae89154f9842155da5344878e97e0c84bd732641279283d
-MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
+EBUILD watchman-2023.05.22.00.ebuild 6848 BLAKE2B ea9e26a3922acd37d681eb2731daf410256ef0067ffeb9ee604738c81ba1c33a3f75d19af54578731ffaf2f5c4ad66c3bc853e123a2a056311f6826d437f0e15 SHA512 d86ab353cc92ea6f7a4a3d7e2159004603efb2833d33b7d9059ce4477c02cca3c6a89c738beb9104cae89154f9842155da5344878e97e0c84bd732641279283d
+MISC metadata.xml 429 BLAKE2B e69d0fb854d42a000fdc5609c7c6a12b8928eef97630b9043813a44da1bb24639648cf8a412ae7a2d0c0b7e058e2a2df65d33ee7f5198c1aea3253106d43cc75 SHA512 bf683e13fc81e5bfea3dcd80edf4a10fdae95807074035e0f8a63be4d7137488a92396b7bdcdbff5a539922f6d3fd57b67c5e5720a27b3d471d29c96b3b061ff
diff --git a/dev-util/watchman/metadata.xml b/dev-util/watchman/metadata.xml
index 1eeed218300c..a0585f54c69d 100644
--- a/dev-util/watchman/metadata.xml
+++ b/dev-util/watchman/metadata.xml
@@ -5,14 +5,6 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>adrian@planetcoding.net</email>
-		<name>Adrian Moennich</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">facebook/watchman</remote-id>
 	</upstream>
diff --git a/dev-util/watchman/watchman-2023.05.22.00.ebuild b/dev-util/watchman/watchman-2023.05.22.00.ebuild
new file mode 100644
index 000000000000..93d22b62da3a
--- /dev/null
+++ b/dev-util/watchman/watchman-2023.05.22.00.ebuild
@@ -0,0 +1,326 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+# TODO: Split into different variables then combine for each component?
+# Not all is in rust/ dir.
+# Rust components:
+# - thirdparty/deelevate_binding/Cargo.toml
+# - rust/watchman_client/Cargo.toml
+# - rust/serde_bser/Cargo.toml
+# - cli/Cargo.toml
+CRATES="
+ahash-0.8.3
+aho-corasick-0.7.20
+android_system_properties-0.1.5
+ansi_term-0.12.1
+anyhow-1.0.70
+atty-0.2.14
+autocfg-1.1.0
+base64-0.10.1
+bitflags-1.3.2
+bumpalo-3.12.0
+byteorder-1.4.3
+bytes-1.4.0
+cc-1.0.79
+cfg-if-1.0.0
+chrono-0.4.24
+clap-2.34.0
+codespan-reporting-0.11.1
+core-foundation-sys-0.8.4
+crossbeam-0.8.2
+crossbeam-channel-0.5.8
+crossbeam-deque-0.8.3
+crossbeam-epoch-0.9.14
+crossbeam-queue-0.3.8
+crossbeam-utils-0.8.15
+cxx-1.0.94
+cxxbridge-flags-1.0.94
+cxxbridge-macro-1.0.94
+cxx-build-1.0.94
+deelevate-0.1.1
+dirs-4.0.0
+dirs-sys-0.3.7
+duct-0.13.6
+either-1.8.1
+embed-resource-1.8.0
+filedescriptor-0.7.3
+fnv-1.0.7
+futures-0.1.31
+futures-0.3.28
+futures-channel-0.3.28
+futures-core-0.3.28
+futures-executor-0.3.28
+futures-io-0.3.28
+futures-macro-0.3.28
+futures-sink-0.3.28
+futures-task-0.3.28
+futures-util-0.3.28
+getrandom-0.1.16
+getrandom-0.2.9
+heck-0.3.3
+hermit-abi-0.1.19
+hermit-abi-0.2.6
+iana-time-zone-0.1.56
+iana-time-zone-haiku-0.1.1
+itoa-1.0.6
+js-sys-0.3.61
+jwalk-0.6.2
+lazy_static-1.4.0
+libc-0.2.141
+link-cplusplus-1.0.8
+lock_api-0.4.9
+log-0.4.17
+maplit-1.0.2
+maybe-uninit-2.0.0
+memchr-2.5.0
+memmem-0.1.1
+memoffset-0.6.5
+memoffset-0.8.0
+mio-0.8.6
+nix-0.25.1
+nom-5.1.2
+ntapi-0.4.0
+num-0.2.1
+num-bigint-0.2.6
+num-complex-0.2.4
+num_cpus-1.15.0
+num-derive-0.2.5
+num-integer-0.1.45
+num-iter-0.1.43
+num-rational-0.2.4
+num-traits-0.2.15
+once_cell-1.17.1
+ordered-float-1.1.1
+os_pipe-1.1.3
+parking_lot-0.12.1
+parking_lot_core-0.9.7
+pathsearch-0.2.0
+phf-0.11.1
+phf_codegen-0.11.1
+phf_generator-0.11.1
+phf_shared-0.11.1
+pin-project-lite-0.2.9
+pin-utils-0.1.0
+ppv-lite86-0.2.17
+proc-macro2-0.4.30
+proc-macro2-1.0.56
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-0.6.13
+quote-1.0.26
+rand-0.7.3
+rand-0.8.5
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_core-0.6.4
+rand_hc-0.2.0
+rayon-1.7.0
+rayon-core-1.11.0
+redox_syscall-0.2.16
+redox_users-0.4.3
+regex-1.7.3
+regex-syntax-0.6.29
+rustc_version-0.4.0
+ryu-1.0.13
+scopeguard-1.1.0
+scratch-1.0.5
+semver-0.9.0
+semver-1.0.17
+semver-parser-0.7.0
+serde-1.0.160
+serde_bytes-0.11.9
+serde_derive-1.0.160
+serde_json-1.0.96
+shared_child-1.0.0
+shared_library-0.1.9
+signal-hook-0.1.17
+signal-hook-registry-1.4.1
+siphasher-0.3.10
+slab-0.4.8
+smallvec-0.6.14
+smallvec-1.10.0
+socket2-0.4.9
+strsim-0.8.0
+structopt-0.3.26
+structopt-derive-0.4.18
+syn-0.15.44
+syn-1.0.109
+syn-2.0.15
+sysinfo-0.26.9
+tabular-0.2.0
+termcolor-1.2.0
+terminfo-0.7.5
+termios-0.3.3
+termwiz-0.8.0
+textwrap-0.11.0
+thiserror-1.0.40
+thiserror-impl-1.0.40
+time-0.1.45
+tokio-1.27.0
+tokio-macros-2.0.0
+tokio-util-0.6.10
+toml-0.5.11
+tracing-0.1.37
+tracing-core-0.1.30
+unicode-ident-1.0.8
+unicode-segmentation-1.10.1
+unicode-width-0.1.10
+unicode-xid-0.1.0
+utf8parse-0.1.1
+vec_map-0.8.2
+vergen-3.2.0
+version_check-0.9.4
+vswhom-0.1.0
+vswhom-sys-0.1.2
+vtparse-0.2.2
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.11.0+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.84
+wasm-bindgen-backend-0.2.84
+wasm-bindgen-macro-0.2.84
+wasm-bindgen-macro-support-0.2.84
+wasm-bindgen-shared-0.2.84
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-0.48.0
+windows_aarch64_gnullvm-0.42.2
+windows_aarch64_gnullvm-0.48.0
+windows_aarch64_msvc-0.42.2
+windows_aarch64_msvc-0.48.0
+windows_i686_gnu-0.42.2
+windows_i686_gnu-0.48.0
+windows_i686_msvc-0.42.2
+windows_i686_msvc-0.48.0
+windows-sys-0.45.0
+windows-targets-0.42.2
+windows-targets-0.48.0
+windows_x86_64_gnu-0.42.2
+windows_x86_64_gnu-0.48.0
+windows_x86_64_gnullvm-0.42.2
+windows_x86_64_gnullvm-0.48.0
+windows_x86_64_msvc-0.42.2
+windows_x86_64_msvc-0.48.0
+winreg-0.10.1
+xi-unicode-0.2.1
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cargo cmake distutils-r1 tmpfiles
+
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/"
+SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
+RDEPEND="
+	dev-libs/libevent:=
+	dev-libs/libpcre2
+	~dev-cpp/edencommon-${PV}:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/glog:=
+	>=dev-libs/libfmt-8.1.1-r1:=
+	dev-libs/openssl:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	python? ( ${PYTHON_DEPS} )"
+# TODO: Make gtest test-only (needs a fair bit of patching)
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2023.01.16.00-python-working-dir.patch
+	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
+	"${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch
+)
+
+# Rust utility
+QA_FLAGS_IGNORED="usr/bin/watchmanctl"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
+	export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
+	export RUST_CARGO_HOME="${ECARGO_HOME}"
+	export CARGO_HOME="${ECARGO_HOME}"
+	# Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
+	# so no need to force -j1 via cargo jobs
+
+	local mycmakeargs=(
+		# Rust wrangling
+		-DUSE_CARGO_VENDOR=ON
+		-DGENERATE_CARGO_VENDOR_CONFIG=OFF
+		-DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
+
+		# General bits
+		-DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
+		-DWATCHMAN_VERSION_OVERRIDE=${PV}
+
+		# Fails to build against fbthrift for now in libatomic troubles
+		-DENABLE_EDEN_SUPPORT=OFF
+
+		# We handle this ourselves
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_test
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process watchman.conf
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index b01d8d1d7cbb..220dde105b28 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 81fbc13fb5ae..d69903abab0a 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -2,5 +2,5 @@ AUX gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch 2620 BLAKE2B adb
 DIST gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2 149883 BLAKE2B 9097ea9489ea220297082e487bd846dfe0b7d2188fc878bb4927e92ddc8aabe21ee2b4acfad91b95694713b90c3c99c82eae2f184bd985228cbe2f7f5c61aaf7 SHA512 220a2c4337f47d196d81cb21df80e1d5cd34778f3f14cf33f51baeb6156309244977acb9d5981e588ed68060b7c47c2d567f6ba5f835c2af4a537bd70a87daa2
 DIST gnome-shell-extension-desktop-icons-ng-47.0.3.tar.bz2 151631 BLAKE2B 652e41eff5f8ada6bd2f6ebf49fd4db08bcab6d48af0e42e789a52050049708596fd534b9a32906cab2e4a8ccd283cc88ea318b4f7f58b1ef5bfd638399d92cf SHA512 0d48e442efc9ea2c461ec846a38c06ea906f6c3c710c221af693a9819efecc8859c86116f13172caba0083f4fcb9015c2957587e3a2a6f531d1e8f414c5dcb47
 EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild 1037 BLAKE2B 64a39a8ce0e7c4db0d029b22338c7a75357223906a286cb12c0c39867fd9d89e786b81b58e03c94fa05e5cf038188b0bf0f3523b4a94368c098515d2fda2720e SHA512 822cdc94032b875214ad17bea45979eba1aa9ec6c83ca3055ec8ae44d099110ec0fbe6394e42035000c019e41f5092cc05706748f076afcbf187766a4b817d28
-EBUILD gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild 992 BLAKE2B 618c284be474adf123040062d5104b6369189bb1ca75ef4e3f6b488ace07761059cb77105c1b691cb9c3a0a255bb817f29b3c6bb10751adb3fff0db430408c4c SHA512 4a3680f057ae837b25e9839d6ce3c99006a09bf408a67259a5d56871fa347eb45d57df013def45318ab2954d4241a654d6ddd52da2fab5ac4eb5ceb287acd76b
+EBUILD gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild 992 BLAKE2B 7cb36c330afbce1d94f74f005d361808f778b651374bf89880a70ae7dfa986ab04294e7ea52bc65a948bf973d54bdb0a3a14df41971d009085c67b6f8689e7a9 SHA512 5ca38796406b9bb75d92198fdbbdbba585b4f38593e7a577648c997a5421d2b9f5cf6c95e724bf74c4f124d2dcb1d582ea4e57990f1d6d9263e6e641a1c6640b
 MISC metadata.xml 333 BLAKE2B 3bc225ba5cd8ccbe497b7f1494e7ee2ebb8d43a59756dfbc5a6152a1fdb0027f02e1057f6b1bfa6fe8d97b4a2583611b45e0d27bfb37a1a5563246d411eb057d SHA512 f835b8b301a79f5bc650c75cfc0c52eb0ddba2266c04c559f2651fa429d1747af98ea0b8e7775ff3df6d5d8b7ee545f22a89d092138fc91e19fcd0d5e325f315
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild
index 092c49db2cec..ee03943b8777 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils meson
 
 MY_PN="desktop-icons-ng"
 MY_P="${MY_PN}-${PV}"
-COMMIT="9c2f2bc688e9c95335c64f1b3a6ad0cc2051d7b4"
+COMMIT="0769c60a86651c8f08c7549a87a4dcbcbde86794"
 
 DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
 HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 243d41238e8b..57b70454e123 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 9bdbf0dd4513..e8653ad2f36e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -24,7 +24,7 @@ DIST ffmpeg-5.1.3.tar.xz.asc 520 BLAKE2B 09d7ff694a2fc61a00443b90f905bb771c3fb72
 DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d SHA512 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980
 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
 EBUILD ffmpeg-4.2.8.ebuild 17865 BLAKE2B c4f22c413e13b0227b47d6e9fa8629326b0a7f6e74a3cf6acf4c3ff0b1ad163f33a7b1aa6dffe16c4e27e88c697d7bf986aa6edb7b84d3e9473b9190bf76e50a SHA512 34a7b84989e2e0da04239c610ddba60ff6c044e16dbc3fb2a9d48580ae9096ae47820f4c6a0448ec8f1c4a1dd47b49d85180fa979f83abb70036fd50ba3b8c00
-EBUILD ffmpeg-4.2.9.ebuild 17867 BLAKE2B 26bc7bff1be8752bffdf8aa48213c2da8df0cc5fd315681fcb290df3f3f9dbd163c15203a2e1ad04de2eda3a52ea788da905f7603a6cfc7b44ecfa360f2f62ab SHA512 4658c4b2a77a4cf79b953d2f4d83646f40032cf8c8d3f6bc8e1ae47b1b483a5139d2d9f8628a2db7e86fdf4043ec52b0d02b3c9c94e8cf267b7c1540660c033c
+EBUILD ffmpeg-4.2.9.ebuild 17866 BLAKE2B bc0c8752aa280df8c881f0ffa487cee8aeb8979fdca6a894142d4567013e4a9d718d0e28a99adc626dd2909448b828d035e24f87f5bd1b42bba863388355bc34 SHA512 3a644bb172c1d7991253e985326c0ceb41cac95c3b76381443da837153b07e6a580ab02b195e7ce0cbcda5a87d6f2d482acf25a755b4101eb740cc64c9078552
 EBUILD ffmpeg-4.4.3.ebuild 19574 BLAKE2B d634d4329c0b9889502ed7f2116ae430751d14cce647b2d5c7da169c26bace4cdfbf7f7bff19c66a947cbef294d81b5ae14ea52b478cbe8cdb5b4f9d1561e1fb SHA512 4d7a8f81b696b630694093a410467cf4457790d5129046549f48846992303a6acfdf271114cdb6389ba806e9a820d7f4d5f07aee6cc038f3e7a7636db35bc410
 EBUILD ffmpeg-4.4.4-r2.ebuild 19754 BLAKE2B 49bf01ba1dfc1135526df648f104961fc7873ee2a7f321e715fbc9c2393d9607c24ec4bc07ef3e733ed8284cf16a2ee9fdce339251b0f32f0c821a858cf6f439 SHA512 d25193f44e900d1c54a639aa9407aaf05d37c91af7e9f00e130cb5733f4f51be421d6a2e2a3b5f04ab752afc62a0971c394785ef4cddd1370b7cd5fdc2e485d2
 EBUILD ffmpeg-5.1.3.ebuild 19769 BLAKE2B 92d421eef7367d4f6bbda319bd16e3ed2e1c26a9d9e9276066c27c96c25dab5f2955a50f73746472a7067ec70db6dd4d9870cf3e1a6f68b344481f711259fa05 SHA512 87230373afc50f062a09be8964e78f2ee1f34414759d3bb94e0ff3cb8033c41dc40f990af5c754b226e8a70c0910b1c50dec5a9f320aa8b93eebfd7eb309b427
diff --git a/media-video/ffmpeg/ffmpeg-4.2.9.ebuild b/media-video/ffmpeg/ffmpeg-4.2.9.ebuild
index e159627ff30d..dc91f88b8fe2 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.9.ebuild
@@ -62,7 +62,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d90e00058779..49f078c12766 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 36493ee324d9..23ff3f9421bc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Jun 2023 07:39:39 +0000
+Fri, 02 Jun 2023 13:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d0363d8e39c7..af4a0adc6147 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-02T07:39:43Z
+TIMESTAMP 2023-06-02T13:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR5nL9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR58SNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD/AhAAkBbAOnI3uAjCd51quH8B/on2A+n7uCUNKV/1kQU9Hr/YCIpiy6LwAlKp
-NmixK/bHISrrm5+nZpTJHJqbpn3FyBFyzAC2tRI5MY56PwOCFqUzk0w0nM6yqUY4
-Auls4Cp8D+cP2elE+Em4PNR97ahT4GaE2TjGWZYuLTxZ3cTkQ922PpR4+3J2Kb6Z
-WORjOmzRFgWPMlTl4WwoDPhs6+fYPjD787VMckwjV6bJitTok4rnR6k6icjqLY//
-q0r7MH/+TZ/+6ckAzNa5NdJ1Snasx/MD+7UW+FTdEfrIt1J9bw4Hh810HhlIsjoz
-bZsp5hsfLzVsbVcYGJeX5ZIXe73ueUERLEb4xoWMfbh+bT6yk9iU2NYuR9QW88iC
-OfztGAuCMSI9+KkjBROrAaV60VbSuGvbAQmlt8EcwhJ0MM5N9+z3qMgbNYxQ0lVI
-kXPZD2ALxmOBPFNEVspRyVHOlOaQ+PdKYJ71JB0OwruZYgzb85vv4285OvIr1/XX
-BBXTnNkoKvxd3dDNDFSssmJ720zJUERgseERHTYXNH3KZ6xDT52Fr/zi97F6wO9d
-YL9G4EvrJRd9no1urmES35iKFtp0kpbZFHDum8jbDA//iQrANK1s8fQFmqMdD54j
-X0q8GXmXBJo6agb7M4tFI2RAhb3MFkszIOR8squs9iJKV9Lth84=
-=fDbY
+klB2UQ/+Nd64/1CXzs8H/sODGythIUJ54ZZy/29mXIF9/B1Nq+b6i84443flNgRb
+EfXLxRFYUBXxbEh5ZVrqb/mtMHrhrMWekiLEeTXhi9g4ztbD0VsTrUEuup/QcJbp
+Mpa55ICdbTzPWx/TmpVdfIw5184MEIsJ3lDF1DPBvIAw5jiGTeLgPbtS2/xImtSc
+JK84+5gd1N7FIuo6frQbSHl8hA5yE25hf3boomZj5v1Fm22zvASNqKSqx4+hb+hE
+9vdviSg/rjYFl30vcoqwY467cX1izIeBVFn8OcPPFUWc91ItetsJzB6/R2X6/6iO
+Ym6pkFzDqQ1GqRHLoOM0NXeeeKmh2eSeXKXE58c6ldWFreCFlKnfimBjPch0QmBb
+ja7EnaEaJsuKttRb8AQufyGUNaSFvq2YxoyC64QZDCo+iT5JeVv1zgMmj22Lts5E
+6RwjAUyYGV9VtxiecDGwmqqJgYyCa2ZbifS1mpAXA759JxBZN7kDFcpqpdhDav7H
+2jErb8U3OPGO9EtwC41Opyq7CoZBu7j63rE6NlUDxvPAEuUyUt1p4AN1ko2rl30m
+VZCBR57Yz7wMZxhKyOUri4GrR6LDiHWn+ZFg3TKqFfWiPanlH5PzJwaz7W+RqOFV
+XssikgT95d5M16b3EfYmx2lJRD0uaYOemzyWUKbalu+YuKbmf6E=
+=L4YX
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 586ae8faa13e..23ff3f9421bc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Jun 2023 07:39:40 +0000
+Fri, 02 Jun 2023 13:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f66ac56aadb6..60872cf7410b 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 92b65c889578..9eb0c63c106b 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.27.145 b/metadata/md5-cache/app-admin/awscli-1.27.145
new file mode 100644
index 000000000000..61de01dfe29a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.145
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.145[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+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_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.145[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.145.tar.gz -> aws-cli-1.27.145.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/sysklogd-2.5.0 b/metadata/md5-cache/app-admin/sysklogd-2.5.0
new file mode 100644
index 000000000000..03c00eddd204
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysklogd-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=logger? ( sys-apps/util-linux[-logger(+)] )
+DESCRIPTION=Standard log daemons
+EAPI=8
+HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
+INHERIT=flag-o-matic systemd toolchain-funcs
+IUSE=logger logrotate
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=logger? ( sys-apps/util-linux[-logger(+)] ) logrotate? ( app-admin/logrotate )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/troglobit/sysklogd/releases/download/v2.5.0/sysklogd-2.5.0.tar.gz
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=459e82ea4bd5cf50fd65dcbefbf5a04a
diff --git a/metadata/md5-cache/app-admin/sysklogd-9999 b/metadata/md5-cache/app-admin/sysklogd-9999
index 16cbbc0ca6f8..038e50a4713c 100644
--- a/metadata/md5-cache/app-admin/sysklogd-9999
+++ b/metadata/md5-cache/app-admin/sysklogd-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] )
+DEPEND=logger? ( sys-apps/util-linux[-logger(+)] )
 DESCRIPTION=Standard log daemons
 EAPI=8
 HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic systemd toolchain-funcs autotools git-r3
 IUSE=logger logrotate
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] ) logrotate? ( app-admin/logrotate )
+RDEPEND=logger? ( sys-apps/util-linux[-logger(+)] ) logrotate? ( app-admin/logrotate )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e2fa4945c49a18672592f66259051e81
+_md5_=459e82ea4bd5cf50fd65dcbefbf5a04a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index e4307640a61b..fcc589edf5bb 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/rar-6.22 b/metadata/md5-cache/app-arch/rar-6.22
new file mode 100644
index 000000000000..c905015342b0
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-6.22
@@ -0,0 +1,15 @@
+BDEPEND=all-sfx? ( app-arch/unrar )
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=8
+HOMEPAGE=https://www.rarlab.com/
+INHERIT=unpacker
+IUSE=all-sfx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=BSD BSD-2 RAR
+RDEPEND=sys-libs/glibc
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=all-sfx? ( https://www.rarlab.com/rar/rarlinux-x64-622.tar.gz https://www.rarlab.com/rar/rarlinux-x32-622.tar.gz https://www.rarlab.com/rar/winrar-x64-622.exe ) amd64? ( https://www.rarlab.com/rar/rarlinux-x64-622.tar.gz ) x86? ( https://www.rarlab.com/rar/rarlinux-x32-622.tar.gz )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=b8d70ac47990527da75f16e7fc38d2e5
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index d327a7f555f3..c0c3475b3257 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/open-vm-tools-12.2.0 b/metadata/md5-cache/app-emulation/open-vm-tools-12.2.0
index 81d22e3c7706..a3861e54069c 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-12.2.0
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-12.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/vmware/open-vm-tools
 INHERIT=autotools linux-info pam systemd udev
 IUSE=X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec:= ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-12.2.0/open-vm-tools-12.2.0-21223074.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=973d0083c861ff9b3d682dd8e73a3776
+_md5_=b52a14a68d91c41e93edd74b6595995d
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 3730fcd95e2c..4c8b0effcdee 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.11 b/metadata/md5-cache/app-portage/gpyutils-0.11
new file mode 100644
index 000000000000..11f2b82cdbda
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gpyutils-0.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=8
+HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/gpyutils/archive/v0.11.tar.gz -> gpyutils-0.11.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d4c8710b8f6e8a0008ae1b3371407a00
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e37f4bb60282..e5109020a156 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/edencommon-2023.05.22.00 b/metadata/md5-cache/dev-cpp/edencommon-2023.05.22.00
new file mode 100644
index 000000000000..84424c3c2841
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/edencommon-2023.05.22.00
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-cpp/folly:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-cpp/gtest
+DESCRIPTION=Shared library for Watchman and Eden projects
+EAPI=8
+HOMEPAGE=https://github.com/facebookexperimental/edencommon
+INHERIT=cmake
+IUSE=llvm-libunwind
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-cpp/folly:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= )
+SLOT=0/2023.05.22.00
+SRC_URI=https://github.com/facebookexperimental/edencommon/archive/refs/tags/v2023.05.22.00.tar.gz -> edencommon-2023.05.22.00.gh.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1b309e37af19e9f6c09e91748bef4382
diff --git a/metadata/md5-cache/dev-cpp/folly-2023.05.22.00 b/metadata/md5-cache/dev-cpp/folly-2023.05.22.00
new file mode 100644
index 000000000000..ac61ad312b50
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/folly-2023.05.22.00
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2 app-arch/lz4:= app-arch/snappy:= app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-libs/boost:=[context] dev-libs/double-conversion:= dev-libs/libaio dev-libs/libevent:= dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= >=sys-libs/liburing-2.3:= sys-libs/zlib llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/binutils-libs test? ( dev-cpp/gtest )
+DESCRIPTION=An open-source C++ library developed and used at Facebook
+EAPI=8
+HOMEPAGE=https://github.com/facebook/folly
+INHERIT=cmake toolchain-funcs
+IUSE=llvm-libunwind test
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/bzip2 app-arch/lz4:= app-arch/snappy:= app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-libs/boost:=[context] dev-libs/double-conversion:= dev-libs/libaio dev-libs/libevent:= dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= >=sys-libs/liburing-2.3:= sys-libs/zlib llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= )
+RESTRICT=!test? ( test )
+SLOT=0/2023.05.22.00
+SRC_URI=https://github.com/facebook/folly/releases/download/v2023.05.22.00/folly-v2023.05.22.00.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fac46cbec31c2a84c1340d9490ab6564
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index dfacc65dd9a6..b339b1c6f232 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/tomcat-native-1.2.37 b/metadata/md5-cache/dev-java/tomcat-native-1.2.37
new file mode 100644
index 000000000000..aee7af72f50a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.37
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Allows Tomcat to use certain native resources for better performance
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/native-doc/
+INHERIT=java-pkg-2 java-ant-2
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-src.tar.gz
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6fb4c15076e407b89af90cd2588b7e25
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.4 b/metadata/md5-cache/dev-java/tomcat-native-2.0.4
new file mode 100644
index 000000000000..62cbd3b4fa2a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.4
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Allows Tomcat to use certain native resources for better performance
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/native-doc/
+INHERIT=autotools java-pkg-2 java-pkg-simple verify-sig
+IUSE=static-libs doc source test verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz.asc )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=a1c9a6ba8179f9c6668bafe36b75ab9d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0c7c870c600a..e973c06e814b 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/ansible-compat-4.1.2 b/metadata/md5-cache/dev-python/ansible-compat-4.1.2
new file mode 100644
index 000000000000..0e2eeb7ccdf4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansible-compat-4.1.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-7.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-admin/ansible-core-2.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+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 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=app-admin/ansible-core-2.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-compat/ansible-compat-4.1.2.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f5570c71ac172acca82049837a1a9e7e
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.145 b/metadata/md5-cache/dev-python/boto3-1.26.145
new file mode 100644
index 000000000000..5fc490100d42
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.145
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.145[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[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=test 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.29.145[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.145.tar.gz -> boto3-1.26.145.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=19c6bcfc191ce918489bff494ff185c2
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.145 b/metadata/md5-cache/dev-python/botocore-1.29.145
new file mode 100644
index 000000000000..e509875987d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.145
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[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=test 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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.145.tar.gz -> botocore-1.29.145.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0a0fb1a94ac28cee470da7b1644eba68
diff --git a/metadata/md5-cache/dev-python/cattrs-23.1.2 b/metadata/md5-cache/dev-python/cattrs-23.1.2
new file mode 100644
index 000000000000..7f2ce3058f7a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cattrs-23.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/cbor2-5.4.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-6.54.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/immutables-0.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/orjson-3.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymongo-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ujson-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-20.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/exceptiongroup[python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.1.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Composable complex class support for attrs and dataclasses
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cattrs/ https://github.com/python-attrs/cattrs/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-20.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/exceptiongroup[python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.1.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-attrs/cattrs/archive/v23.1.2.tar.gz -> cattrs-23.1.2.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c897f8a0c952c9e478b2f8fc33ee40e9
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.6 b/metadata/md5-cache/dev-python/cfn-lint-0.77.6
new file mode 100644
index 000000000000..2e13d8c2369d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.77.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.6.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=210ba815496a2deaa792bb4ff6d921bc
diff --git a/metadata/md5-cache/dev-python/google-auth-2.19.1 b/metadata/md5-cache/dev-python/google-auth-2.19.1
new file mode 100644
index 000000000000..f584a934af0c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.19.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/grpcio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyu2f[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-2.19.1.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=566e8a27cd5ca41435cdb49e57c04064
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-4.2.0 b/metadata/md5-cache/dev-python/jaraco-collections-4.2.0
new file mode 100644
index 000000000000..b159f904b5e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-collections-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Models and classes to supplement the stdlib collections module
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.collections/ https://pypi.org/project/jaraco.collections/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jaraco.collections/jaraco.collections-4.2.0.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=43bc7542d8b516db698550e0e13ed9e0
diff --git a/metadata/md5-cache/dev-python/orjson-3.9.0 b/metadata/md5-cache/dev-python/orjson-3.9.0
new file mode 100644
index 000000000000..45831fe6e007
--- /dev/null
+++ b/metadata/md5-cache/dev-python/orjson-3.9.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/arrow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pendulum[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/maturin-0.14.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+DESCRIPTION=Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy
+EAPI=8
+HOMEPAGE=https://github.com/ijl/orjson/ https://pypi.org/project/orjson/
+INHERIT=cargo distutils-r1 pypi
+IUSE=test debug python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64
+LICENSE=|| ( Apache-2.0 MIT ) Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/orjson/orjson-3.9.0.tar.gz https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/associative-cache/1.0.1/download -> associative-cache-1.0.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/beef/0.5.2/download -> beef-0.5.2.crate https://crates.io/api/v1/crates/bytecount/0.6.3/download -> bytecount-0.6.3.crate https://crates.io/api/v1/crates/castaway/0.2.2/download -> castaway-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.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/chrono/0.4.26/download -> chrono-0.4.26.crate https://crates.io/api/v1/crates/compact_str/0.7.0/download -> compact_str-0.7.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/itoa/1.0.6/download -> itoa-1.0.6.crate https://crates.io/api/v1/crates/itoap/1.0.1/download -> itoap-1.0.1.crate https://crates.io/api/v1/crates/libc/0.2.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/libm/0.1.4/download -> libm-0.1.4.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.17.2/download -> once_cell-1.17.2.crate https://crates.io/api/v1/crates/packed_simd_2/0.3.8/download -> packed_simd_2-0.3.8.crate https://crates.io/api/v1/crates/pyo3-build-config/0.19.0/download -> pyo3-build-config-0.19.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.19.0/download -> pyo3-ffi-0.19.0.crate https://crates.io/api/v1/crates/rustversion/1.0.12/download -> rustversion-1.0.12.crate https://crates.io/api/v1/crates/ryu/1.0.13/download -> ryu-1.0.13.crate https://crates.io/api/v1/crates/serde/1.0.163/download -> serde-1.0.163.crate https://crates.io/api/v1/crates/serde_json/1.0.96/download -> serde_json-1.0.96.crate https://crates.io/api/v1/crates/simdutf8/0.1.4/download -> simdutf8-0.1.4.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/target-lexicon/0.12.7/download -> target-lexicon-0.12.7.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate
+_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4ac0a7d4f9bf054ee18a744329b63b20
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.11 b/metadata/md5-cache/dev-python/pygraphviz-1.11
new file mode 100644
index 000000000000..7a4d90e4b4d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.11
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip dev-lang/swig:0 test? ( dev-python/doctest-ignore-unicode[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( media-gfx/graphviz >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-gfx/graphviz python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
+EAPI=8
+HOMEPAGE=https://pygraphviz.github.io/ https://github.com/pygraphviz/pygraphviz/ https://pypi.org/project/pygraphviz/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=media-gfx/graphviz python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-1.11.zip
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=527032934454d7b746f6ac8dc7d024e0
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1 b/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1
index 770aebb0b302..f854f1f2bca4 100644
--- a/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1
+++ b/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/FFY00/python-pyproject-metadata/ https://pypi.org/project/pyproject-metadata/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FFY00/python-pyproject-metadata/archive/0.7.1.tar.gz -> pyproject-metadata-0.7.1.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e4604fb96b0ed35dcf39bea16ffbba26
+_md5_=246fd2df59f85558503f27511d89191c
diff --git a/metadata/md5-cache/dev-python/typing-extensions-4.6.3 b/metadata/md5-cache/dev-python/typing-extensions-4.6.3
new file mode 100644
index 000000000000..6d1d0bfbda7e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typing-extensions-4.6.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backported and Experimental Type Hints for Python 3.7+
+EAPI=8
+HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing_extensions/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=PSF-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python/typing_extensions/archive/4.6.3.tar.gz -> typing_extensions-4.6.3.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=81d93db134c5b2805e5fa75221f90bd4
diff --git a/metadata/md5-cache/dev-python/ypy-websocket-0.10.0 b/metadata/md5-cache/dev-python/ypy-websocket-0.10.0
new file mode 100644
index 000000000000..d9072703c6fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ypy-websocket-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uvicorn[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiosqlite-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosqlite-0.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings to y-crdt
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ypy-websocket/ https://github.com/y-crdt/ypy-websocket/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-python/anyio-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiosqlite-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosqlite-0.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/y-crdt/ypy-websocket/archive/v0.10.0.tar.gz -> ypy-websocket-0.10.0.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b57041592a8cceafdb536e6349ec4f9e
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index abcec317cad1..2bb80a2712b0 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/slim-5.1.0-r1 b/metadata/md5-cache/dev-ruby/slim-5.1.0-r1
index 815c498e8a8f..bce1fcc60115 100644
--- a/metadata/md5-cache/dev-ruby/slim-5.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/slim-5.1.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://slim-template.github.io/
 INHERIT=ruby-fakegem
 IUSE=doc test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( !dev-ruby/slim:5[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby30(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( !dev-ruby/slim:5[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby31(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( !dev-ruby/slim:5[ruby_targets_ruby32(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby32(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-5.1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8c205dd1de2f248f4ac58ac42550e8b3
+_md5_=f84bba61b0c245d4999e1f5bc9e84cb8
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3bedb1b6c9e9..47ee7fcac9fe 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/watchman-2023.05.22.00 b/metadata/md5-cache/dev-util/watchman-2023.05.22.00
new file mode 100644
index 000000000000..1dc53a7fb071
--- /dev/null
+++ b/metadata/md5-cache/dev-util/watchman-2023.05.22.00
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/libevent:= dev-libs/libpcre2 ~dev-cpp/edencommon-2023.05.22.00:= ~dev-cpp/folly-2023.05.22.00:= dev-cpp/glog:= >=dev-libs/libfmt-8.1.1-r1:= dev-libs/openssl:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) >=virtual/rust-1.53 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-libs/libevent:= dev-libs/libpcre2 ~dev-cpp/edencommon-2023.05.22.00:= ~dev-cpp/folly-2023.05.22.00:= dev-cpp/glog:= >=dev-libs/libfmt-8.1.1-r1:= dev-libs/openssl:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) dev-cpp/gtest
+DESCRIPTION=A file watching service
+EAPI=8
+HOMEPAGE=https://facebook.github.io/watchman/
+INHERIT=cargo cmake distutils-r1 tmpfiles
+IUSE=llvm-libunwind python test debug python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libevent:= dev-libs/libpcre2 ~dev-cpp/edencommon-2023.05.22.00:= ~dev-cpp/folly-2023.05.22.00:= dev-cpp/glog:= >=dev-libs/libfmt-8.1.1-r1:= dev-libs/openssl:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) virtual/tmpfiles
+REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) || ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facebook/watchman/archive/refs/tags/v2023.05.22.00.tar.gz -> watchman-2023.05.22.00.tar.gz https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.70/download -> anyhow-1.0.70.crate 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/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.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/chrono/0.4.24/download -> chrono-0.4.24.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/crossbeam/0.8.2/download -> crossbeam-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.14/download -> crossbeam-epoch-0.9.14.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.8/download -> crossbeam-queue-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.15/download -> crossbeam-utils-0.8.15.crate https://crates.io/api/v1/crates/cxx/1.0.94/download -> cxx-1.0.94.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.94/download -> cxxbridge-flags-1.0.94.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.94/download -> cxxbridge-macro-1.0.94.crate https://crates.io/api/v1/crates/cxx-build/1.0.94/download -> cxx-build-1.0.94.crate https://crates.io/api/v1/crates/deelevate/0.1.1/download -> deelevate-0.1.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/duct/0.13.6/download -> duct-0.13.6.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/embed-resource/1.8.0/download -> embed-resource-1.8.0.crate https://crates.io/api/v1/crates/filedescriptor/0.7.3/download -> filedescriptor-0.7.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/futures/0.1.31/download -> futures-0.1.31.crate https://crates.io/api/v1/crates/futures/0.3.28/download -> futures-0.3.28.crate https://crates.io/api/v1/crates/futures-channel/0.3.28/download -> futures-channel-0.3.28.crate https://crates.io/api/v1/crates/futures-core/0.3.28/download -> futures-core-0.3.28.crate https://crates.io/api/v1/crates/futures-executor/0.3.28/download -> futures-executor-0.3.28.crate https://crates.io/api/v1/crates/futures-io/0.3.28/download -> futures-io-0.3.28.crate https://crates.io/api/v1/crates/futures-macro/0.3.28/download -> futures-macro-0.3.28.crate https://crates.io/api/v1/crates/futures-sink/0.3.28/download -> futures-sink-0.3.28.crate https://crates.io/api/v1/crates/futures-task/0.3.28/download -> futures-task-0.3.28.crate https://crates.io/api/v1/crates/futures-util/0.3.28/download -> futures-util-0.3.28.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.9/download -> getrandom-0.2.9.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.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/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.56/download -> iana-time-zone-0.1.56.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/itoa/1.0.6/download -> itoa-1.0.6.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/jwalk/0.6.2/download -> jwalk-0.6.2.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.141/download -> libc-0.2.141.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmem/0.1.1/download -> memmem-0.1.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/mio/0.8.6/download -> mio-0.8.6.crate https://crates.io/api/v1/crates/nix/0.25.1/download -> nix-0.25.1.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/ntapi/0.4.0/download -> ntapi-0.4.0.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/num-derive/0.2.5/download -> num-derive-0.2.5.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/ordered-float/1.1.1/download -> ordered-float-1.1.1.crate https://crates.io/api/v1/crates/os_pipe/1.1.3/download -> os_pipe-1.1.3.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/pathsearch/0.2.0/download -> pathsearch-0.2.0.crate https://crates.io/api/v1/crates/phf/0.11.1/download -> phf-0.11.1.crate https://crates.io/api/v1/crates/phf_codegen/0.11.1/download -> phf_codegen-0.11.1.crate https://crates.io/api/v1/crates/phf_generator/0.11.1/download -> phf_generator-0.11.1.crate https://crates.io/api/v1/crates/phf_shared/0.11.1/download -> phf_shared-0.11.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.56/download -> proc-macro2-1.0.56.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rayon/1.7.0/download -> rayon-1.7.0.crate https://crates.io/api/v1/crates/rayon-core/1.11.0/download -> rayon-core-1.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.3/download -> regex-1.7.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/ryu/1.0.13/download -> ryu-1.0.13.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.5/download -> scratch-1.0.5.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/1.0.17/download -> semver-1.0.17.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.160/download -> serde-1.0.160.crate https://crates.io/api/v1/crates/serde_bytes/0.11.9/download -> serde_bytes-0.11.9.crate https://crates.io/api/v1/crates/serde_derive/1.0.160/download -> serde_derive-1.0.160.crate https://crates.io/api/v1/crates/serde_json/1.0.96/download -> serde_json-1.0.96.crate https://crates.io/api/v1/crates/shared_child/1.0.0/download -> shared_child-1.0.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.1/download -> signal-hook-registry-1.4.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.8/download -> slab-0.4.8.crate https://crates.io/api/v1/crates/smallvec/0.6.14/download -> smallvec-0.6.14.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/socket2/0.4.9/download -> socket2-0.4.9.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.26/download -> structopt-0.3.26.crate https://crates.io/api/v1/crates/structopt-derive/0.4.18/download -> structopt-derive-0.4.18.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.15/download -> syn-2.0.15.crate https://crates.io/api/v1/crates/sysinfo/0.26.9/download -> sysinfo-0.26.9.crate https://crates.io/api/v1/crates/tabular/0.2.0/download -> tabular-0.2.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminfo/0.7.5/download -> terminfo-0.7.5.crate https://crates.io/api/v1/crates/termios/0.3.3/download -> termios-0.3.3.crate https://crates.io/api/v1/crates/termwiz/0.8.0/download -> termwiz-0.8.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.40/download -> thiserror-1.0.40.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.40/download -> thiserror-impl-1.0.40.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/tokio/1.27.0/download -> tokio-1.27.0.crate https://crates.io/api/v1/crates/tokio-macros/2.0.0/download -> tokio-macros-2.0.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.10/download -> tokio-util-0.6.10.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.1/download -> unicode-segmentation-1.10.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/vergen/3.2.0/download -> vergen-3.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.2/download -> vswhom-sys-0.1.2.crate https://crates.io/api/v1/crates/vtparse/0.2.2/download -> vtparse-0.2.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.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://crates.io/api/v1/crates/windows/0.48.0/download -> windows-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows-targets/0.48.0/download -> windows-targets-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/xi-unicode/0.2.1/download -> xi-unicode-0.2.1.crate
+_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	57f007adcdf3953627f14277c7eae6e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0685791d568e97e7b0e5175584b12e2c
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 61f2deb2580f..c02214c90b32 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.3
index c1e39bdf5cab..4753f1cb4606 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.3
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/47.0.3/gnome-shell-extension-desktop-icons-ng-47.0.3.tar.bz2
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0a4f0bac1eb9008a17e956be436edf19
+_md5_=6a1e3ff4efa85f55d518d827d2259cd3
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 8805a2150bc4..e52faf523873 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.9 b/metadata/md5-cache/media-video/ffmpeg-4.2.9
index c1ed5f962846..9b7c3aa3be74 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.2.9
+++ b/metadata/md5-cache/media-video/ffmpeg-4.2.9
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg nvenc vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0 ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 REQUIRED_USE=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.9.tar.xz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-altivec.patch.gz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-gcc.patch.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7452892452f92be029faef2bac00f1a0
+_md5_=70a8c05f957036e4dc96a37a6b5c09f2
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 075691e0edd2..38b4c062c85a 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libupnp-1.14.17 b/metadata/md5-cache/net-libs/libupnp-1.14.17
index 9982da219d75..73f72da59a4d 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.14.17
+++ b/metadata/md5-cache/net-libs/libupnp-1.14.17
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://pupnp.sourceforge.net/
 INHERIT=autotools
 IUSE=blocking-tcp debug doc +reuseaddr samples +ssl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0/17
 SRC_URI=https://github.com/pupnp/pupnp/archive/release-1.14.17.tar.gz -> libupnp-1.14.17.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5e3b523e1bddb3de60bc818d23a602e8
+_md5_=bd11109db767eb14e15d47d2ce0c4657
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5a70580f6d9b..d13c05cdf1e4 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/ntp-4.2.8_p16 b/metadata/md5-cache/net-misc/ntp-4.2.8_p16
index d570fb288fa2..7210a4866aad 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p16
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p16
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/libevent-2.0.9:=[threads(+)?] readline? ( >=sys-libs/readline
 SLOT=0
 SRC_URI=https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p16.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bf5feb72644591c2b74f55f9a2487e9c
+_md5_=be674efa5f07a531d5460d413bd549c1
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 65385283e4ec..80073ace7673 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18678 b/metadata/md5-cache/sci-geosciences/josm-bin-18678
deleted file mode 100644
index 0c5b0961374b..000000000000
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18678
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Java-based editor for the OpenStreetMap project
-EAPI=8
-HOMEPAGE=https://josm.openstreetmap.de/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop java-utils-2 xdg
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 GPL-2+ GPL-3
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18678.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=711bc97740fd0c513d245237af5f660c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-5.6.2-r1 b/metadata/md5-cache/sci-geosciences/opencpn-5.6.2-r2
index e0fc21b2011c..9428a406fbe9 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-5.6.2-r1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-5.6.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext sys-apps/lsb-release >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3=[opengl,X]
+DEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3=[opengl?,X]
 DESCRIPTION=a free, open source software for marine navigation
 EAPI=8
 HOMEPAGE=https://opencpn.org/
@@ -9,8 +9,8 @@ INHERIT=wxwidgets xdg cmake
 IUSE=doc lzma opengl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3=[opengl,X]
+RDEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3=[opengl?,X]
 SLOT=0
 SRC_URI=https://github.com/OpenCPN/OpenCPN/archive/refs/tags/Release_5.6.2.tar.gz -> opencpn-5.6.2.tar.gz doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/opencpn/+files/opencpn-doc_4.8.2.0.orig.tar.xz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4269855d2eae680eb34bf6dd6d9a4848
+_md5_=f9cad507989ed0d2a0791e6bc853c026
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-5.8.2 b/metadata/md5-cache/sci-geosciences/opencpn-5.8.2-r1
index 90468815f060..8f8ea54563c0 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-5.8.2
+++ b/metadata/md5-cache/sci-geosciences/opencpn-5.8.2-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gettext sys-apps/lsb-release >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-cpp/gtest dev-libs/rapidjson sys-apps/lsb-release sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/jasper media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3=[opengl,X]
+DEPEND=app-arch/bzip2 dev-libs/tinyxml lzma? ( app-arch/xz-utils ) media-libs/freetype:2 media-libs/glew:0 media-libs/jasper media-libs/portaudio net-misc/curl opengl? ( virtual/opengl ) sys-libs/zlib x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3=[opengl?,X]
 DESCRIPTION=a free, open source software for marine navigation
 EAPI=8
 HOMEPAGE=https://opencpn.org/
@@ -9,8 +9,8 @@ INHERIT=wxwidgets xdg cmake
 IUSE=doc lzma opengl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/jasper media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3=[opengl,X]
+RDEPEND=app-arch/bzip2 dev-libs/tinyxml lzma? ( app-arch/xz-utils ) media-libs/freetype:2 media-libs/glew:0 media-libs/jasper media-libs/portaudio net-misc/curl opengl? ( virtual/opengl ) sys-libs/zlib x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3=[opengl?,X]
 SLOT=0
 SRC_URI=https://github.com/OpenCPN/OpenCPN/archive/refs/tags/Release_5.8.2.tar.gz -> opencpn-5.8.2.tar.gz doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/opencpn/+files/opencpn-doc_4.8.2.0.orig.tar.xz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc056be0e8b7119cbeb16dfc634c6e6a
+_md5_=ffe6f5d0b288ab8426035f90cdac949d
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 61d4f2211606..d41b9fe58e66 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2 b/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2
index efbbadc4e33b..e9d49d335042 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2
+++ b/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/coreutils-6.4 >=sys-apps/file-5.44-r3 )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/baselayout-2.9 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[bzip2(+),threads(+)] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.45.3.tar.bz2
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	eapi8-dosym	741bfa77afb2a9321261501aca58c208	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=682126398324638e107753c1b43a43fd
+_md5_=50869abfbc5c602bbd30811c998e9829
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.10.0.20221209 b/metadata/md5-cache/sys-apps/smc-sum-2.10.0.20221209
deleted file mode 100644
index 0b7581adb464..000000000000
--- a/metadata/md5-cache/sys-apps/smc-sum-2.10.0.20221209
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
-EAPI=8
-HOMEPAGE=https://www.supermicro.com
-INHERIT=linux-mod
-IUSE=module dist-kernel
-KEYWORDS=-* ~amd64
-LICENSE=supermicro
-RDEPEND=sys-libs/zlib sys-power/iasl module? ( !sys-apps/smc-sum-driver ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://www.supermicro.com/Bios/sw_download/527/sum_2.10.0_Linux_x86_64_20221209.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1030b136f24da9b1f89fab9bb37a130e
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.10.0.20221209-r1 b/metadata/md5-cache/sys-apps/smc-sum-2.10.0.20221209-r1
new file mode 100644
index 000000000000..a522f536ac6b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.10.0.20221209-r1
@@ -0,0 +1,17 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
+EAPI=8
+HOMEPAGE=https://www.supermicro.com
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=module dist-kernel modules-sign +strip
+KEYWORDS=-* ~amd64
+LICENSE=supermicro
+RDEPEND=sys-libs/zlib sys-power/iasl sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://www.supermicro.com/Bios/sw_download/527/sum_2.10.0_Linux_x86_64_20221209.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e7a61c3c01061566c7e15371ea3bd513
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 73fcc31321a8..fc9f9d8ad29a 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.20 b/metadata/md5-cache/sys-fs/lvm2-2.03.20
deleted file mode 100644
index e10321151ab9..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.20
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) static? ( lvm? ( dev-libs/libaio[static-libs] sys-apps/util-linux[static-libs] readline? ( sys-libs/readline[static-libs] ) ) selinux? ( sys-libs/libselinux[static-libs] ) )
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=8
-HOMEPAGE=https://sourceware.org/lvm2/
-INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-IUSE=lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles lvm2create-initrd? ( sys-apps/makedev ) thin? ( sys-block/thin-provisioning-tools ) )
-REQUIRED_USE=static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev ) thin? ( lvm )
-SLOT=0
-SRC_URI=https://sourceware.org/ftp/lvm2/LVM2.2.03.20.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b0f3bf3516586cf996da5e8077d2b7cb
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index ce0a05694a43..a4d9ba75431f 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.2 b/metadata/md5-cache/sys-power/acpi_call-1.2.2
deleted file mode 100644
index 5eaec05e1fed..000000000000
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=A linux kernel module that enables calls to ACPI
-EAPI=7
-HOMEPAGE=https://github.com/nix-community/acpi_call
-INHERIT=linux-info linux-mod
-IUSE=examples dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.2.tar.gz -> acpi_call-1.2.2.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a59142345a0c4170a6e5bf87144b38e0
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.2-r1 b/metadata/md5-cache/sys-power/acpi_call-1.2.2-r1
new file mode 100644
index 000000000000..ec6a84a475fa
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=A linux kernel module that enables calls to ACPI
+EAPI=8
+HOMEPAGE=https://github.com/nix-community/acpi_call
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=examples dist-kernel modules-sign +strip
+KEYWORDS=amd64
+LICENSE=GPL-3+
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.2.tar.gz -> acpi_call-1.2.2.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c351750242c4bff0cc4240e596ce49bc
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index dfe7d5aed21e..539ecc37c13e 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -1,14 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=virtual/linux-sources
 DESCRIPTION=A linux kernel module that enables calls to ACPI
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/nix-community/acpi_call
-INHERIT=git-r3 linux-info linux-mod
-IUSE=examples dist-kernel
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=git-r3 linux-mod-r1
+IUSE=examples dist-kernel modules-sign +strip
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=44f3263fe4c9b633d47006925fbb1dbf
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=709b472f9f2b16e6e0ee9793f3241d8f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d4c11b7c4ed6..08087c1fce30 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-02T07:39:43Z
+TIMESTAMP 2023-06-02T13:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR5nMBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR58SNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD/3g//WxV826gQrc/C5gv17tjuMAIalK9LBcfzVt9W/86gpjh5Z3ujPlVpMt75
-0Ea2Reljn7Fe8AHubKdKt2EJLBp7m0y8ZVspnTnw2f0LCoE2l0iyG8szdV3Nxmgl
-obp0zSTGqBUjatEAMEv6yokgrDIkdhgiLowshPGhbJFckY+E/44rBjJwlLe33JcB
-m3s/BKx571q7oHIfE59aJvHvJrof8jiadJHrA0HZp7S9h1GVuHvltAmLe+Bd3ftp
-/DpAmr3tdq/nZX+C5RmGI/ULXyUtYh4zXDXv56I3mEANB3gE1yCeKuenw8J/hygu
-rhTinvGO9ghwyqh011uce8Y+gGf9IVzMtDRptrBnvw5P9jKFFNjbTZiIbE9Sd+VB
-Zqz7Dhy45UHEIiENfeB4RKAyypLVesHyApFTnjB8zB1QmTU3OfR76FyH0o3bBaqm
-YPPAh7id+KW0rfmNqIaKjmFj7nODcnPTNvm84TkqcKGxS54z8TaToCaIO5jBorY9
-tN4lyvGoqipJLciXh+xvdjLpluOEPfhDyUVMeebUzfWNqDtNHxuTfpDk+RDB24QN
-QEjE/tyOZgt1u9CunR9Zv6KaOprm85Sqo4M/7Cs/VoiHuk+y38ElkmmRv8vyraF/
-VYSMknN6x6DHFxtmSYQaHZ0jGwWW0l33GsZaB17qMCzk1MpOiJg=
-=+eA1
+klAnoBAAojh6WhHceuxfvIwx+cR3lmd1HC5eCkN5CC+ChzfVj1E1p/L8ziwVsm9H
+Hg7g2nWuxF12KY9NpOJju6TUdMQa5NF+7dPPD57judppfaLnM1V8DB6OzYGHomN4
+GjXca2L95fWrRdWb0lyeWaXx/wA+bT9qQZm9f9a3GbCuY212iyDsOth6vq9drX3Y
+KcME5fNETFIHxQC6aGHUlOQUwJRJg6s+zB4sQ9zKBYnat2VXrTcDDz9/KNCaKQO8
+A1w+7+GW4oFcRfZM4gcNi7JOruZPRRafhjd7fUBQjBdUcfGMSh97GqzYn0s8aUj/
+SLMAnM79GHNHP/F/72JkuZQG/BCNuqg4vzAB0As0i+cejO5Na3FF1F+QYvcWv+PN
+DgAvhWaVQLTvjyNNgH72bubRRxy5QFUtfcflTNiYRBowDlf4cBTEfQZu0W14PEss
+/HaDg2hdq6fBOyCJ1B4I4ZEQIuit9or8UCPjBYh5wvhz4qQBQmRTXOoD1S/UqiHt
+3IwWB8N8fibiAjUxALu6yqEV7sW7D7h0GBsXypR+Nm8Gq6J2EvWcG3dc24HkJrRX
+iu9f8MsWXkk2niv7JL7mAvIrhZrEeV5hf4ERXEZaz4nFxA7S3lO+iLTg4wceyIz2
+4ny7gSmalLqQxrvvyq1vntVJyGIt/xAMn4dEypgErs3AbNLMeCM=
+=sEWZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 586ae8faa13e..23ff3f9421bc 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Jun 2023 07:39:40 +0000
+Fri, 02 Jun 2023 13:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d7bbc57d127f..8a59bde758f6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun  2 07:39:39 AM UTC 2023
+Fri Jun  2 01:39:44 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2141994a1bd1..4f776dd2ba8d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Jun 2023 07:45:01 +0000
+Fri, 02 Jun 2023 13:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8d06544d54dd..e8c20fa96055 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8c4214e226e909b4f237b55be0c7b935d60c3d78 1685689205 2023-06-02T07:00:05+00:00
+475747defe7ef5b2cb59f740f76821b13cad8016 1685712562 2023-06-02T13:29:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 529a2c04fe92..4e86b8cb88da 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1685691601 Fri 02 Jun 2023 07:40:01 AM UTC
+1685713201 Fri 02 Jun 2023 01:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 36493ee324d9..23ff3f9421bc 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Jun 2023 07:39:39 +0000
+Fri, 02 Jun 2023 13:39:44 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f5c8d26f36a6..55a044f94b51 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index bb6a5a69f2bd..e51c17a9379d 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -4,5 +4,5 @@ DIST libupnp-1.14.16.tar.gz 810632 BLAKE2B f9cebb6f0f5faea07e003f433100d4789e2f5
 DIST libupnp-1.14.17.tar.gz 810912 BLAKE2B 8bb38dbdff59cf4fd6c222cf1000ecc195f8d33601d8c06476b0a238d6969fe695bcb52f721e4d88a95fa63ef568881e1628935c3b5ba063b72a3b3ee27ded8b SHA512 d9af7231687bb694961822a9d3b1e9b04e52142f0245729902b240564579903858e01a5cfe53ff7a8fa77e44e36b840f0c355d2c79aaf0ced2498b4b1822ed6b
 EBUILD libupnp-1.14.15.ebuild 1107 BLAKE2B f95ac67d241bb4ffb929dd9cfaa68a0515b272344927dc0069932110ef7cf096002abb7188ec341967bb7778dbf6de09c20c617867ead99cba4aa7d8ac8565a1 SHA512 1655ddd2e8ea0cc62adf010d1780b7ff9ac014dd5a4e4d583da9342826619427d6675ec43fc040eae10e38ee91fac3a41c408750aecaedce9481f1457d1a3f49
 EBUILD libupnp-1.14.16.ebuild 1107 BLAKE2B 560b38bae30bd182af9864a2727e4e708b020858a4e8d8c6045578c817f85ac0c20ff4544d539f06936fcacbe1513d69f40995e840a024ca65ccb298327a767d SHA512 6ccbe4dbe66f65e8602f5d94e0abede1557e1b7b67499d94905d97331106dddd9176a46c345d1813d4e5d9cd14deb58e907617c0ec8762d5e14f28acafd7850c
-EBUILD libupnp-1.14.17.ebuild 1114 BLAKE2B 9099cc3e18e6316c99a0cdd7bc837492d7d52caec2f79152ee4bd06c9bb4542dd5f28e4cd0f2b4971c3082dd7d326bf2b6f03a4acace7e8fd27de9bea9d51a88 SHA512 db08b4748578e3725617461f0095968b11fcb561144469d21e8dc0a526e7067d0ffaef428cb7b266f657c95cd7137ab4dbea905467aa98d00967706d0f4a66c4
+EBUILD libupnp-1.14.17.ebuild 1108 BLAKE2B 70f3d88ee8fae7c6eaf2c750c0353c7bf0cb72553c6d69276d3b8dd457012b69d881bc9fe6d6d101a25b774c6b82792419f52fa583a550044ba81b2f4de03d9f SHA512 84790ea6896b5d8c9053d47257a026472196d10c185ff8a57f2c40d47e2d9621d8e047b63529b560f76e9826e55027f7070836902e1b4eb214f711f93cbcf6a0
 MISC metadata.xml 676 BLAKE2B a5aa120c6aef01b436d44e14c0d3d9014b4d3392c75322c5269bb56c6c143ad184d409def0adec6a02a4158b67c71e0cb009eb83d023a0346937337ce171dd6a SHA512 507660834175c3675b9ca6aeb4f5cdae1a017f54ba46e25d1a3235f05c897548b18ca294c328c167d35c8babb3aa71838880965bf34269559aac02a831addd17
diff --git a/net-libs/libupnp/libupnp-1.14.17.ebuild b/net-libs/libupnp/libupnp-1.14.17.ebuild
index f2542c3b3894..31a661025715 100644
--- a/net-libs/libupnp/libupnp-1.14.17.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.17.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9dc9a18a22a8..47e524d46faf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 3d331c8ada93..52856d7b7cdc 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -24,5 +24,5 @@ DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 DIST ntp-4.2.8p16.tar.gz 7084978 BLAKE2B a6cd6f56da7fda85be70f1293674fdab76140608407b5bda422049a49133694803cf3d38174a329d75f599fcce0ff899c00b47a18b22a1b801e495b476445a3e SHA512 0b4a3336def620d3ab2f06dacf8621e848167e35657c0a1206eca178a7541dd8730071bd7a0a8dea2c4682c4f38d31c3772d01093c26fd5a4395e37a86e770e2
 EBUILD ntp-4.2.8_p15-r6.ebuild 4629 BLAKE2B 1aa9260d9af3c3ebcd90dd6e2a31aa451d2da246169c18adee9b224aef366c0f9b8e545a6265aebc8f93632d19f2048f491bf40923a362815ed28d912d226070 SHA512 8885b65c869f6fbb325a07f2b4a2e752f3875042329c9e7420b8e24468873ebd58b66fe3c4f20079e4291154ef20bbe3df18e0f1c6ad43de7955c78de9b43be4
-EBUILD ntp-4.2.8_p16.ebuild 4477 BLAKE2B 4674e10bb8055f1c938b6a1a991e47cf189be5c657932468ee338bd8daec96e9f81a25ac7ebe7cdd045f3ea443456993889c72af440559fe4aa7a4ea90536a1e SHA512 5519dca30e5f6254822a94c1adb48290020ab529ef7657e2a72bb151fdce1efdb2164a800666ac4c66360106d6efd88a5e000b297047e516ba5d08a4654109a4
+EBUILD ntp-4.2.8_p16.ebuild 4480 BLAKE2B de18563fd5b9f63acdcf283166017a1574753efffaba90656205ca9733d18f463f54ba8ce53bfee070e0a01d6c60013fa3f01db95754df93cde347adcf175fd0 SHA512 5ba7954717093266aa5424b8cc907c0b01684d9a340894c88df519a01d2fcd89313553a0811fd64fdc48aa1385688898e7a08878421e2986002959589d1d2acc
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/ntp-4.2.8_p16.ebuild b/net-misc/ntp/ntp-4.2.8_p16.ebuild
index 89ee3f382279..8ab34a0081da 100644
--- a/net-misc/ntp/ntp-4.2.8_p16.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p16.ebuild
@@ -126,7 +126,7 @@ src_install() {
 		cd "${ED}" || die
 		rm usr/sbin/ntpd || die
 		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
+		rm usr/share/man/man1/ntpd.1 || die
 	else
 		newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
 		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4b04c014e2da..c4bf5731a8ec 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4d1a9d58ea70..8e69dc29c9fa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8282,7 +8282,6 @@ sys-fs/lessfs:memtrace - Enable leefs to create a report regarding the memory al
 sys-fs/loop-aes:extra-ciphers - Enable extra ciphers
 sys-fs/loop-aes:keyscrub - Protects the encryption key in memory but takes more cpu resources
 sys-fs/lvm2:lvm - Build all of LVM2 including daemons and tools like lvchange, not just the device-mapper library (for other packages to use). If your system uses LVM2 for managing disks and partitions, enable this flag.
-sys-fs/lvm2:lvm2create-initrd - Install lvm2create_initrd script and pull in sys-apps/makedev for the /sbin/MAKEDEV command
 sys-fs/lvm2:sanlock - Enable lvmlockd with support for sanlock
 sys-fs/lvm2:thin - Support for thin volumes
 sys-fs/mtpfs:mad - Enable handling of MP3's metadata
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index fde4dc34180a..e98dbfa1d1f6 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 2f864529c59d..ed46a4160931 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,5 @@
-DIST josm-snapshot-18678.jar 16376303 BLAKE2B 9db4a9bd90e0f2deac4474462091d91505874f936fde330c6a676d4beecf029966d692bc2dadc0f2d44bfcb53d8f40a075a95d0bb4b07f6ffffb160080d88ceb SHA512 af621dab4ad5495fe895639811e6c0e24e463b1c8fbcb70c5626ca68a0b9b1a9b16a34dd746335553dd84974197ba37ab3bb9c5eee19da2209f41da94a8cc28f
 DIST josm-snapshot-18700.jar 16421003 BLAKE2B 67310f9e1d2b64646f543573ee9aacac6f62ff40597e069e756d34bf4699755712bccf5dca8bd89c8185db5a470dd3d1c4242b02534e416fe04c62ca7f994de2 SHA512 7d6923bf3d5ba1f7331a3904d1b54920a301eacc53c720991132cecb00bfc2dca2e0fd9d58d90e88ff0e3f46207bed06b6ac002e13baa69e95cbc0c11b4e191e
 DIST josm-snapshot-18721.jar 16460468 BLAKE2B 6c5e86b31691a366211ea93e3094a8650ac6e2b42f4f72883ffc17819108cf717f1b29f2918788acfe07aae946f57b4b88be637069fc97b830af067de9a69de1 SHA512 53244e668d5269e8c20a0efadab9ab7ab665f40f1e02366e3491b3dac9ff1595a2a10ba34e063f56bef1c8e3c450abd237f6c02218484817960e8dfd7959db41
-EBUILD josm-bin-18678.ebuild 976 BLAKE2B aaf25951cb28d38145349c597d78289352b8f67583009721e4212953b6c230f40140542da3a5c6e426a1bbcb5a31d8f607af2a11b66cfcfb28af5cd5db71e7fc SHA512 4dde794985c520f37d8a0ad83de71cb2d0cc5385b156c4337fd52e2193c705788015aebc6028dd42b0504fdd0ac764a00c600b4c041003ad448adad4d462355a
 EBUILD josm-bin-18700.ebuild 976 BLAKE2B aaf25951cb28d38145349c597d78289352b8f67583009721e4212953b6c230f40140542da3a5c6e426a1bbcb5a31d8f607af2a11b66cfcfb28af5cd5db71e7fc SHA512 4dde794985c520f37d8a0ad83de71cb2d0cc5385b156c4337fd52e2193c705788015aebc6028dd42b0504fdd0ac764a00c600b4c041003ad448adad4d462355a
 EBUILD josm-bin-18721.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-18678.ebuild b/sci-geosciences/josm-bin/josm-bin-18678.ebuild
deleted file mode 100644
index 60cd9ef522d0..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-18678.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop java-utils-2 xdg
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage
-SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-
-	local icon_size
-	for icon_size in 16 32 48; do
-		newicon -s ${icon_size} -t hicolor \
-			images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
-		newicon -s ${icon_size} -t locolor \
-			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 988b8fc6ef25..1290212f22b5 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,6 +1,6 @@
 DIST opencpn-5.6.2.tar.gz 82919992 BLAKE2B a45e19d293d63262f2bb6bd0bd5d18723cadd0b93af8e64484b55d246cebbe623dccbb6a1d257eccd74fb9111953d9cdd4b44d6f3fb38c3a9f40fa253718f337 SHA512 6d90b21448b2d2a58685592e92647108978012cbaa25999d98855dca222e013784ca4e351eb08efd0a18980cccffb28b0d3c171ea9207e5fb37889e3a3b377e3
 DIST opencpn-5.8.2.tar.gz 87960698 BLAKE2B ecce27972a00af412283923a1720b9d74c80905101f383815e801691ab9dacb7c60328f6cd597811d4538bccf383e66465e08e2094420187272298151327b717 SHA512 c23bb322c2dcfb017347427cf6041d28fc0c1b8101f21d5cafc9b9306a4d265156ded90af09c385086e99a462a26787e7f4bb817ad19efa50624c952ba89c726
 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
-EBUILD opencpn-5.6.2-r1.ebuild 1278 BLAKE2B 8c94324fb628d56fbb0e54c9781510e2bb2ee0fab8565c8f2efe2d16b3430530076471d32d909ff48657e7ccc4244e10a0559ef56e81375c0fac89ea0d6e841c SHA512 02ffc6cf58074d7dbdfc24caf4499071ef079fa37eeb1d304be10d23f4e0809733015f76f269512a72df79095eab5005ab4b2802bdc1db6ae29050c2dda27483
-EBUILD opencpn-5.8.2.ebuild 1300 BLAKE2B 2d23de08971302b83921eb351c0ce5e679800509ad3499ef583c63c317807c3444b36909e737b375d3af70cdcf89f898f001a96a76c7ca3c83b3341285cf0c76 SHA512 783eac9d8904baf30d541306bc8c94c45d3470afa16305757b712675b682e46bd4a3783a5895dd2243a10e56c445be4907a00913b58f3616750e4b5dba0584f2
+EBUILD opencpn-5.6.2-r2.ebuild 1279 BLAKE2B 2cf87c8ad1088bb674d3a8d93e0d3d1ca60051b5f07dff25b2feaae1faa0cfe4c5a7223387b7377b4cb5078e3eda84c5be19677cf3ef295cebd4c5718730083e SHA512 ad7b97e7d54eca2b33990fa602ed75ed4cb45d3c3c89a58713c13b8f22d6fa1ed958af37eba6a591338ca6c4832e01c7949b587a87b8638652b3e8076f850d39
+EBUILD opencpn-5.8.2-r1.ebuild 1355 BLAKE2B cd6dac293edf3c4197351db8611b3d90e765ca630ab99273486770d6e5b6dcb8df3b7a081e3496b87a42755fb55b69ae6a3e11b29d695060c17cbbbb2c26827b SHA512 15e840c6f0b769328dbbbf4ec5bf36631bc43f2499e4f3d8873373cfd842eddb6c90ce6006ece57329c5ec5a977f73db4e678904bf7ac9adb82be2bd585d5498
 MISC metadata.xml 532 BLAKE2B f58755354fa6e133c3d948f9b57165ddc5dceed8548a599665f093500ea3451b83331324eda72bc3654b5ec49e2c0032421b4f6a20f270c2e7a14715fea5e0b0 SHA512 38390912b33d945d24fe81ab0bd23d09a1207e0eaaf68d4101748a41cd8237251e5451df277a98b65a16d6acfad8adb27c20b842e90decba25dbf98bfb580e72
diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r1.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
index 5fe2fd8b60ba..53ecdb5e91ac 100644
--- a/sci-geosciences/opencpn/opencpn-5.6.2-r1.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-libs/zlib
 	opengl? ( virtual/opengl )
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/sci-geosciences/opencpn/opencpn-5.8.2.ebuild b/sci-geosciences/opencpn/opencpn-5.8.2-r1.ebuild
index 0f5f7e400c1e..029224a474a9 100644
--- a/sci-geosciences/opencpn/opencpn-5.8.2.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.8.2-r1.ebuild
@@ -22,21 +22,24 @@ IUSE="doc lzma opengl"
 
 RDEPEND="
 	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )
 	dev-libs/tinyxml
+	lzma? ( app-arch/xz-utils )
 	media-libs/freetype:2
+	media-libs/glew:0
 	media-libs/jasper
 	media-libs/portaudio
 	net-misc/curl
-	sys-libs/zlib
 	opengl? ( virtual/opengl )
+	sys-libs/zlib
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/gettext
+	dev-cpp/gtest
+	dev-libs/rapidjson
 	sys-apps/lsb-release
+	sys-devel/gettext
 	"
 
 src_configure() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 652e2bf11d68..a84d54507a2e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c834273ecc35..a411cad00098 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,7 +7,7 @@ DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B d97698eb3341a8d04980e021e5be8650193b
 DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 268589c37a6bdc36377f3e407b16bebfb9876adc1d89ee7576f3ebbee42bc0799f5a225dfd53ffedeeded91ca4403383d4811b4f104448c1b2fc6c277ca94ef1 SHA512 abbd2446d0da0b5d298a235c2cc7d2d4e001e9f012b6e22149fed4514b52dc938b0377b2551f45e3505b9dddeedd7170951ff967310708ec3b93610b775a7c02
 DIST portage-3.0.48.tar.bz2 1150955 BLAKE2B ca61adcfa66c96f702f5f05436d100102adbd6b2d5028b100dc2793dba8e0f8d8a17520bc6a4165254e2bcebd1fb798d67f7e0e1f46abc776adc351a42ba93c9 SHA512 46dcfbb833838a16a6c8f8dc4062bd2b9a37d0f34e1f884a74abf74846e7236381c2dfa06cf36c50a978d930834784c3ecd44208ff64f4cc289b7df1522d7fae
 EBUILD portage-3.0.44-r1.ebuild 9185 BLAKE2B d1477b9433d5d369f10b4332293c0686be65cf0a3c343612749e437b8db10e9609167e430dd051fbb8fdbf0c74ca2e8b67fd84868d0e7aeebcd678aaf9c4e70d SHA512 58f4dd151193fd9fb626855a1e05804f4ffe8ddc88f3431db59dde337fb7e07fd319d4583f15108aaa853d1b8ae13d4586af5ab203c2703dc6ff15d5837a7086
-EBUILD portage-3.0.45.3-r2.ebuild 9030 BLAKE2B 8562562b64a6832f7592c215bc81f04930eed7a52839ab9b660984622b4340ca8b107ed2d4751fe0bb32134e379af8c9fb606fc26cfde3b689bd5573c9f2e324 SHA512 51671c98ab74c21213d010fc912f7b5cc41788bc339837774c0f63e1d937fdbb338f7020c6654b81c0af4609b4d3348e14c557b8449d197cb8e2b0ce6c9a74b1
+EBUILD portage-3.0.45.3-r2.ebuild 9029 BLAKE2B c2f3e0ec0b310c0bd23afc4bd2c7197b296d0e66414812e04bbacca08261aa82821b14528cd04f670f17090fb793b520c28fd46027d32665fd1d2d8a0c893503 SHA512 c8e998e5a0003a988de30052e68dbe9064eba135b47b4da142c2d870b54533327bad54fd497eff50a8198834fb31d80d3601892ad11ab14c2ccbe32ca05ebec1
 EBUILD portage-3.0.46.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
 EBUILD portage-3.0.47.ebuild 9200 BLAKE2B a3cd513f441aef9205bc0761ee782b82d6721181243d6bef4dab5bbafa47a54a4e470d8eb805a2c31f3ee40b0a8b426578a46cb7bf406bdeb1485b7d20a10f79 SHA512 6b2f57982d6bb6e6ccab936f9cf995817bb8ab93c67f81615ca74151bea13d832a29998ee70cff7a7ac3859c2c5648cfc75ed89af8f807665bc05bc09dd45407
diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
index 235d432c5566..91746a505377 100644
--- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 374c9813337b..331d4c4f58ab 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,5 +1,5 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b
 DIST sum_2.10.0_Linux_x86_64_20221209.tar.gz 20797081 BLAKE2B 2dde47521c0243a02098a4aafb4f8818227c01e73cba860b82ba5b989ee77a8fbc9a665f92222a55830b982b157782839e07e3d6f7c8dbb41b80034bf67428ae SHA512 5627fa6e473429e6fe3c93ef74f6938c9da3481b890435fb56359ea6d7f4b733e9aeae18c3c19895697db2318aa62806eae2bc40e57ca467365ffd9749d0cc75
-EBUILD smc-sum-2.10.0.20221209.ebuild 1441 BLAKE2B 23401c3204a18897f4b6fbee97bd4997f0c923ceae6af3d2e0b5eddff70d5224a2dc6f15877dbe79ae0dea91efdc05ff2c5f42a4e6668ca0df929606ecd2bcc3 SHA512 e919c77a866c21c2894eb850ede49174b88ca74a981900f78d450306e31392c38407e81cdbe7ecb498caf6a23cb58007dd01d574f747aefe1bb0ae4459799621
+EBUILD smc-sum-2.10.0.20221209-r1.ebuild 1406 BLAKE2B 8dcdb9d2de53dbdf98856ed0ac0b02b907071f14a6b98c5892b2d5a3e0cb37c638465b3c9119daa26f92d39ab9772dc4d4c8f9fba3a59ba74de019d67a5edeb1 SHA512 e424ea30ba5fa87cac242ad4af38202f50750dbfd4fc466ef35166d92cdcda1944c8595c6f6b5f2942c174d1af50a8f16640d568a1c841ace7d0b0da912cf4f8
 MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c
diff --git a/sys-apps/smc-sum/smc-sum-2.10.0.20221209.ebuild b/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild
index fa73a90522dd..232195afedd7 100644
--- a/sys-apps/smc-sum/smc-sum-2.10.0.20221209.ebuild
+++ b/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-mod
+inherit linux-mod-r1
 
 MY_DATE="$(ver_cut 4)"
 MY_PN="${PN/smc-/}"
@@ -23,7 +23,6 @@ IUSE="module"
 RDEPEND="
 	sys-libs/zlib
 	sys-power/iasl
-	module? ( !sys-apps/smc-sum-driver )
 "
 
 RESTRICT="bindist mirror"
@@ -39,9 +38,6 @@ DOCS=(
 
 PATCHES=( "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch" )
 
-BUILD_TARGETS="default"
-MODULE_NAMES="sum_bios(misc:${S}/driver/Source/Linux)"
-
 QA_PREBUILT="usr/bin/smc-sum"
 
 src_prepare() {
@@ -49,12 +45,16 @@ src_prepare() {
 
 	# Install new Makefile to respect users CFLAGS and LDFLAGS
 	cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
+
+	use module && linux-mod-r1_pkg_setup
 }
 
 src_compile() {
 	if use module; then
-		BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}/driver/Source/Linux"
-		linux-mod_src_compile
+		local modargs=( KDIR="${KV_OUT_DIR}" )
+		local modlist=( sum_bios="misc:driver/Source/Linux" )
+
+		linux-mod-r1_src_compile
 	else
 		:;
 	fi
@@ -64,5 +64,5 @@ src_install() {
 	newbin sum smc-sum
 	einstalldocs
 
-	use module && linux-mod_src_install
+	use module && linux-mod-r1_src_install
 }
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2098646f4164..b80455cfb6e8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index cfa28aad2359..ef5edcce2c4a 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -9,12 +9,8 @@ AUX lvm2-2.03.20-dm_lvm_rules_no_systemd.patch 673 BLAKE2B ac8eec01814bced1b1727
 AUX lvm2-2.03.20-dmeventd-no-idle-exit.patch 2174 BLAKE2B e5b53504feeac84e0458399b8c94f7c844f0b7a592b3458ef33f5af165a9dd0fa3c21804f0269a0529261af7060640b2efc92c6218c9dbc5d74f53b23e2f8b36 SHA512 5f0f735340a8f24432c0b0ce9b8e67971982a0b6e3c9878b34c05c20f348ce50018acde9944a8505462cfce927322ef264ce20a86dc77d1bad677f3411966aed
 AUX lvm2-2.03.20-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef
 AUX lvm2-2.03.20-freopen-musl.patch 1595 BLAKE2B 4e019fbf8b89f79ca19eb821bc434d84d5c986a10d82b4a33a3cc4b8b6aa30c27e912e2ab0d067cab94feb28b53826725f43dd0973a60482c20e6417149b6a35 SHA512 40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557
-AUX lvm2-2.03.20-locale-muck.patch 398 BLAKE2B adb1c2bcd216acb413733d9f3f3618cad14019cf090bf2204d384b85fb37c6ce2a35bff2af3ab12dd977ce38c8485bf4c254973e2f0381f62462a28b30898a95 SHA512 8573bd1305061b2262b29096a7eb64871aa5179c6ca20689bb1a9078cc2245555fc35927a5696d8872141c78365c4f1a858672889595f333091aab353f498fb0
-AUX lvm2-2.03.20-lvm2create_initrd.patch 2133 BLAKE2B 006bca3d88e4f4887d551c86a4de12aee88974dd9f16c211ff045f55d688185197552408640f5e80398cc234a81e6d7d4c98de7605bd874da0129448574083d9 SHA512 c7b11f2307b3d26df86c16c405777f9a6e52c575628b814a67c29243221f06cb518ca4781eafc9b9920d1f8a7505d274fd697ca13094e759b1af216269033cd9
 AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
-DIST LVM2.2.03.20.tgz 2739763 BLAKE2B 4dc223eca1a370450c3985a5f962a2450a2ed08f1fa40af98d181a1530960a7caa3e896a3b54f0f333e2d6818bf35378b9c491a1488a4d3815959ab0e1f987de SHA512 202ff19f6ab1e1ecdf448beec6c7db1a80885efda1a6eeabf44cd2cea40577405c388eabd86f59f34c6e9e400188050bc6d1a5d5daf02f2beda87eee73cd1a2d
 DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde
-EBUILD lvm2-2.03.20.ebuild 8902 BLAKE2B 9c05b3d93e5dd024574324619faf5d0907f4aa28a7190b75bdce257c39643b41f267af3c9675784d4b685eeaf5d095415eeb431b621fcf1a2517c6fbe96d330a SHA512 1944f60939380e0f64fa2a99e2e8747d0d2215ae3a8c7630d8f050ea712d5a7c7aec7ffae782ce9c7838f03d2d9421f03127a7f58829151c3fd7a2d5656d9d5a
 EBUILD lvm2-2.03.21.ebuild 8618 BLAKE2B 6bcc7043ed199f40458d50afde25a51d1a6bf9c0fa4879103224914d1a767276fc79a2e50610fc88bd1b8d25ee2716d519720a95c89978185dc8b4832201aa81 SHA512 1718c8247c8f2380f5c4a5d80df1c0c094053d37e42e1eb7d670f88475456c330c4e0dc7a31e46140e24a0def5a6a150c6cd59198484f8ec3a23101600665abb
-MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
+MISC metadata.xml 779 BLAKE2B 231c89183684444ebee20658ff9f9bf98121788d0755e989e52c6e79fcf9420d33630c19327a70cf31c6af6c6477fc9e5a84aef86cae264c9312340c72a9a639 SHA512 17284ccc792497fefcd484243458cfb5aa6da855d0867979bfc6185bdf8dca3b6121186f039e4e4d09e3fd6857f2d40a119bb396e17b9036bc4be927bb3fe55b
diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch
deleted file mode 100644
index c672a10e2cf6..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/make.tmpl.in
-+++ b/make.tmpl.in
-@@ -571,7 +571,7 @@
- 	( cat $(srcdir)/.exported_symbols; \
- 	  if test -n "$(EXPORTED_HEADER)"; then \
- 		$(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \
--		$(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
-+		LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
- 	  fi \
- 	) > $@
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch
deleted file mode 100644
index 007b2b5c1e3a..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/scripts/lvm2create_initrd/lvm2create_initrd
-+++ b/scripts/lvm2create_initrd/lvm2create_initrd
-@@ -54,7 +54,9 @@
- DEVRAM=/tmp/initrd.$$
- 
- # set defaults
--BINFILES=${BINFILES:-"`which lvm` `which bash` `which busybox` `which pivot_root`"}
-+LVM=`which lvm.static`
-+LVM=${LVM:-"`which lvm`"}
-+BINFILES=${BINFILES:-"${LVM} `which bash` `which busybox` `which pivot_root`"}
- BASICDEVICES=${BASICDEVICES:-"std consoleonly fd"}
- BLOCKDEVICES=${BLOCKDEVICES:-"md hda hdb hdc hdd sda sdb sdc sdd"}
- MAKEDEV=${MAKEDEV:-"debian"}
-@@ -119,6 +121,10 @@
- echo "$PRE Mounting /proc"
- mount -t proc none /proc
- 
-+# We need /sys for lvm
-+echo "$PRE Mounting /sys"
-+mount -t sysfs sysfs /sys
-+
- # plug in modules listed in /etc/modules
- if [ -f /etc/modules ]; then
-     echo -n "$PRE plugging in kernel modules:"
-@@ -179,26 +185,29 @@
- # run a shell if we're passed lvm2rescue on commandline
- grep lvm2rescue /proc/cmdline 1>/dev/null 2>&1
- if [ $? -eq 0 ]; then
--    lvm vgchange --ignorelockingfailure -P -a y
-+    $LVM vgchange --ignorelockingfailure -P -a y
-     do_shell
- else
--    lvm vgchange --ignorelockingfailure -a y
-+    $LVM vgchange --ignorelockingfailure -a y
- fi
- 
- echo "$PRE Mounting root filesystem $rootvol ro"
- mkdir /rootvol
- if ! mount -t auto -o ro $rootvol /rootvol; then
--	echo "\t*FAILED*";
-+	echo "\t*FAILED TRYING TO MOUNT ROOTVOL*";
- 	do_shell
- fi
- 
- echo "$PRE Umounting /proc"
- umount /proc
- 
-+echo "$PRE Umounting /sys"
-+umount /sys
-+
- echo "$PRE Changing roots"
- cd /rootvol
- if ! pivot_root . initrd ; then
--	echo "\t*FAILED*"
-+	echo "\t*FAILED PIVOT TO NEW ROOT*"
- 	do_shell
- fi
- 
-@@ -356,7 +365,7 @@
- fi
- 
- verbose "creating basic set of directories in $TMPMNT"
--(cd $TMPMNT; mkdir bin dev etc lib proc sbin var)
-+(cd $TMPMNT; mkdir bin dev etc lib proc sbin sys var)
- if [ $? -ne 0 ]; then
-    echo "$cmd -- ERROR creating directories in $TMPMNT"
-    cleanup 1
-@@ -460,9 +469,9 @@
- rmdir $TMPMNT/lost+found
- 
- echo "$cmd -- ummounting ram disk"
--umount $DEVRAM
-+umount $TMPMNT
- if [ $? -ne 0 ]; then
--   echo "$cmd -- ERROR umounting $DEVRAM"
-+   echo "$cmd -- ERROR umounting $TMPMNT"
-    cleanup 1
- fi
- 
diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild
deleted file mode 100644
index 1c7fd041e178..000000000000
--- a/sys-fs/lvm2/lvm2-2.03.20.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TMPFILES_OPTIONAL=1
-inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
-S="${WORKDIR}/${PN^^}.${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev"
-REQUIRED_USE="
-	static? ( !systemd !udev )
-	static-libs? ( static !udev )
-	systemd? ( udev )
-	thin? ( lvm )"
-
-DEPEND_COMMON="
-	udev? ( virtual/libudev:= )
-	lvm? (
-		dev-libs/libaio
-		sys-apps/util-linux
-		readline? ( sys-libs/readline:= )
-		sanlock? ( sys-cluster/sanlock )
-		systemd? ( sys-apps/systemd:= )
-	)"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	lvm? (
-		virtual/tmpfiles
-		lvm2create-initrd? ( sys-apps/makedev )
-		thin? ( sys-block/thin-provisioning-tools )
-	)"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
-	static? (
-		lvm? (
-			dev-libs/libaio[static-libs]
-			sys-apps/util-linux[static-libs]
-			readline? ( sys-libs/readline[static-libs] )
-		)
-		selinux? ( sys-libs/libselinux[static-libs] )
-	)"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.03.20-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.03.20-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
-	"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Users without systemd get no auto-activation of any logical volume
-	if ! use systemd ; then
-		eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-
-	# Workaround for bug #822210
-	tc-ld-disable-gold
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	local myeconfargs=(
-		$(use_enable lvm dmfilemapd)
-		$(use_enable lvm dmeventd)
-		$(use_enable lvm cmdlib)
-		$(use_enable lvm fsadm)
-		$(use_enable lvm lvmpolld)
-
-		# This only causes the .static versions to become available
-		$(usev static --enable-static_link)
-
-		# dmeventd requires mirrors to be internal, and snapshot available
-		# so we cannot disable them
-		--with-mirrors="$(usex lvm internal none)"
-		--with-snapshots="$(usex lvm internal none)"
-	)
-
-	if use lvm && use thin; then
-		myeconfargs+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myeconfargs+=( --with-thin=none --with-cache=none )
-	fi
-
-	myeconfargs+=(
-		# musl doesn't do symbol versioning so can end up with
-		# runtime breakage.
-		--with-symvers=$(usex elibc_glibc 'gnu' 'no')
-		$(use_enable readline)
-		$(use_enable selinux)
-		--enable-pkgconfig
-		--with-confdir="${EPREFIX}"/etc
-		--exec-prefix="${EPREFIX}"
-		--sbindir="${EPREFIX}/sbin"
-		--with-staticdir="${EPREFIX}"/sbin
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-default-dm-run-dir=/run
-		--with-default-run-dir=/run/lvm
-		--with-default-locking-dir=/run/lock/lvm
-		--with-default-pid-dir=/run
-		$(use_enable udev udev_rules)
-		$(use_enable udev udev_sync)
-		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
-		# USE=sanlock requires USE=lvm
-		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
-		$(use_enable systemd notify-dbus)
-		$(use_enable systemd app-machineid)
-		$(use_enable systemd systemd-journal)
-		$(use_with systemd systemd-run "/usr/bin/systemd-run")
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		CLDFLAGS="${LDFLAGS}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 -C include
-
-	if use lvm ; then
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts
-	else
-		emake V=1 device-mapper
-		# https://bugs.gentoo.org/878131
-		emake V=1 -C libdm/dm-tools device-mapper
-	fi
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
-
-src_install() {
-	local INSTALL_TARGETS=(
-		# full LVM2
-		$(usev lvm "install install_tmpfiles_configuration")
-		# install systemd related files only when requested, bug #522430
-		$(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators")
-
-		# install dm unconditionally
-		install_device-mapper
-	)
-	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
-
-	newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper
-
-	if use lvm ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-r1 lvm
-		newconfd "${FILESDIR}"/lvm.confd-r4 lvm
-		if ! use udev ; then
-			# We keep the variable but remove udev from it.
-			sed -r -i \
-				-e '/^rc_need=/s/\<udev\>//g' \
-				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
-		fi
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld
-
-		if use lvm2create-initrd; then
-			dosbin scripts/lvm2create_initrd/lvm2create_initrd
-			doman scripts/lvm2create_initrd/lvm2create_initrd.8
-			newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-		fi
-
-		if use sanlock; then
-			newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
-		fi
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		if use lvm; then
-			# depends on lvmetad
-			dolib.a libdaemon/client/libdaemonclient.a #462908
-			# depends on dmeventd
-			dolib.a daemons/dmeventd/libdevmapper-event.a
-		fi
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_preinst() {
-	HAD_LVM=0
-
-	if has_version 'sys-fs/lvm2[lvm(+)]' ; then
-		HAD_LVM=1
-	fi
-}
-
-pkg_postinst() {
-	use lvm && tmpfiles_process lvm2.conf
-	use udev && udev_reload
-
-	# This is a new installation
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if use lvm ; then
-			ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-			ewarn "# rc-update add lvm boot"
-			ewarn
-			ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want"
-			ewarn "to enable lvm autoactivation and metadata caching."
-		else
-			ewarn "Please enable USE=lvm if you need the LVM daemon and"
-			ewarn "tools like 'lvchange', 'vgchange', etc!"
-		fi
-	else
-		if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then
-			ewarn "LVM was previously enabled but is now disabled."
-			ewarn "Please enable USE=lvm if you need the LVM daemon and"
-			ewarn "tools like 'lvchange', 'vgchange', etc!"
-			ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details."
-		fi
-	fi
-
-	if use udev && [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to cause problems for udev-enabled LVM services."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		udev_reload
-	fi
-}
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index e668a8bb6fae..e4619ce76b6e 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-		<flag name="lvm2create-initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
 		<flag name="thin">Support for thin volumes</flag>
 		<flag name="lvm">
 			Build all of LVM2 including daemons and tools like lvchange, not just the device-mapper library (for other packages to use).
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 52d3f54b1637..8e71ddcdd457 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index 72b4d0cc4630..ecc35c1bb690 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,4 +1,4 @@
 DIST acpi_call-1.2.2.tar.gz 12403 BLAKE2B 3195ec7e4d6189abdbb1409914d97d481f63ec79ec89a2ab630120ea99aabf8ca5890c500149a386a4a661d17e58387a6b252b625b6abadef1d977691156745e SHA512 3916a211bcc4a2435c6ba9664b1c86d8ab587c052a03e6edccd00fd7d01c6a756003dcc146e22e2cf688795600589c8cac1d83774c989794dcadc91f5caa2b5e
-EBUILD acpi_call-1.2.2.ebuild 695 BLAKE2B 8df9796c1c8c2d66d2a0e02b42170477abae9fe39cacb914a026e06b52289dfa222d72780fa82679b4ac73fb7b1363f0342702a70f97ad1b5631c9f01b106c70 SHA512 d924f609372a0965218a2bbb0380403a71b0207863e5f16938495e62948cda4e10c769a9950f1b3dba8272f4923964f2e1c6072e261ddd179afc0f1ef3097071
-EBUILD acpi_call-9999.ebuild 670 BLAKE2B 02dd23b77eb28cf9425e3039c61f594a044c0dd7bd4ded1c91d70bb2a970e0b7b5adebe4c6ead52ec3fdabeae1ff5bb69c5cb980d452804e1966ed6c2d510a63 SHA512 7ee0c7e030b5494c94b4e74c85c29bb31a579db2f9a3bb67e0c5ca4edd3da5511a6aba1a8ee78ab430440a58a23ea1e3afc8e8b0f5bdaae1738c77c29aaf626f
+EBUILD acpi_call-1.2.2-r1.ebuild 663 BLAKE2B 3e3b6b9abd1165d8a5990cba90fdd222306726be9282d2a1469b6cd8fc8fda101263f443379004d2f273e91d03292c8e5aad1ba2012231c407b6184a3ab0a8f4 SHA512 3774313eca40cdb19fa7ba068ee8a1b2db020cfe3abc9fe76aca1d81e0569160ccdd1adf0cd1c893815d08c13f7fb194f229b7dff6f841bc3223388ab35fd06c
+EBUILD acpi_call-9999.ebuild 638 BLAKE2B 7f4b2f82975006d8bd9f975c5bdb3e99d51486fa53bb2c6bb9b31d75d7f5f430e7c878efd3737825b13120ec6283f84e39c58b38046ccb1d673b90c90d5ddacf SHA512 3c860d9b5aed261ec773710585cf8080adf03e92c96142920d338b89463f6496bfdd5b8e09bb8ee84b62848d6b93c23e7de81d275afb970cf1bfab8e8ab7e9b4
 MISC metadata.xml 410 BLAKE2B 5ebcbe3474317a93bdc9b8bd8c033300de713d3906638585d8296262c084f7101ca189edd5cc8bcfeaeba6dea68ca75f7349a5e189f94da4dfa85145c939767b SHA512 fbd1f13cfdfa756b2feb04e8b426e8e26eb835d037833aa0dac48aa1ed1f88f0ce985ff3812282298c9fb533279dfaab8bf8cd79852dbb0b1953d7d0209f7985
diff --git a/sys-power/acpi_call/acpi_call-1.2.2.ebuild b/sys-power/acpi_call/acpi_call-1.2.2-r1.ebuild
index 90e2e0158a01..b7fd9601068a 100644
--- a/sys-power/acpi_call/acpi_call-1.2.2.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="A linux kernel module that enables calls to ACPI"
 HOMEPAGE="https://github.com/nix-community/acpi_call"
@@ -14,18 +14,17 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples"
 
-BUILD_TARGETS="default"
 CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
 
 src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+	local modargs=( KDIR=${KV_OUT_DIR} )
+	local modlist=( acpi_call=misc )
 
-	linux-mod_src_compile
+	linux-mod-r1_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 
 	if use examples; then
 		insinto /usr/share/acpi_call
diff --git a/sys-power/acpi_call/acpi_call-9999.ebuild b/sys-power/acpi_call/acpi_call-9999.ebuild
index ba449334ffc0..c8b96da325e2 100644
--- a/sys-power/acpi_call/acpi_call-9999.ebuild
+++ b/sys-power/acpi_call/acpi_call-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3 linux-info linux-mod
+inherit git-r3 linux-mod-r1
 
 DESCRIPTION="A linux kernel module that enables calls to ACPI"
 HOMEPAGE="https://github.com/nix-community/acpi_call"
@@ -14,18 +14,17 @@ SLOT="0"
 KEYWORDS=""
 IUSE="examples"
 
-BUILD_TARGETS="default"
 CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
 
 src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+	local modargs=( KDIR=${KV_OUT_DIR} )
+	local modlist=( acpi_call=misc )
 
-	linux-mod_src_compile
+	linux-mod-r1_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 
 	if use examples; then
 		insinto /usr/share/acpi_call
author	V3n3RiX <venerix@koprulu.sector>	2023-06-02 15:29:04 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-06-02 15:29:04 +0100
commit	27c1d146e5ee9e472a31a7958ad4dc70a5451ea7 (patch)
tree	fe573cd3516126d757c143a469871b88e5851548
parent	bc3875d3a71ac3fdb07c0fcf863843b4fdfcf0c0 (diff)