gentoo auto-resync : 11:07:2023 - 22:30:49

109 files changed, 938 insertions, 510 deletions

diff --git a/Manifest b/Manifest
index 24c397b4ba2c..fd1f217cc798 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29274 BLAKE2B 9e0abea61c88c09e9a1e8a296f692fbb454efbd193cb76f30cbb98d1f69dec68b5f6bf2b6061a15753986129c784da85715e2dc4c0f1801f9cfa6e13c6c8f635 SHA512 08d825221238f68de918f86365b33218d50850cf1bec5e1cc6f20b243fc12690ab299d98da3ac90401d5438c0dc741385e148045f351146b799155112b47011d
-TIMESTAMP 2023-07-11T15:09:45Z
+MANIFEST Manifest.files.gz 29267 BLAKE2B eaf278b469b5d9a9664122b52778d0d683bb2c01b227699d0fc57869400a8f265db204d46a24272bf9b87374d1256d874228c56d4e357a73a78d73883ca50523 SHA512 5a4774d79d7e709eb6a25dc10edee033d0738f5f73db44050cf1a2b28f5e8f6ae0fb2f93290220515bcb4c30df114d8840688e8c2aff0b0353b822634513cccb
+TIMESTAMP 2023-07-11T21:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmStcLlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmStxRpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAyxw//Usy4oNL8q3/0bZvhsefuxoLzVng6ur0Z6mQrzmTNhalg0OU6a9JsbfRK
-RsW9Fu2zwFnSGR0YkP9UPiAl0PwEfjaoXBnpj0h4VhBj6EzM/IUHVKRoC2XgRDRS
-ln0yeGANI66UZ8xrceYD5K9PYr07k+ZA4VFwGL/RlmS8lGnPj/kyZJ+Gdo1561O2
-gKycwwO2Dr126SGiVm8PRLBAvnRRW4kEG+4iEkUs/7w22IXAOxisGcqq1S4rTITC
-3Sc57SCmGrctJxD3mOCX4tOLQCLA8q62W7+1KuHeqG0Fb8cYDnjlf+/px6uxOoyN
-3glpFVZdgjkvnn0KcKyIPq2VdcTM++v20gON6QP21dK74Q40GrqOw9PMT3bTBSgq
-eYsG3loTuDnxns1aR631sjV0/l4swWUuu3Uat1oZpQDmF03vnOY3sO34LbJKLMvm
-IfRAbGQDuIfqZm3K+m4Ss4+AcRpmOAHiq9jwfzKSRlzpmIeBqFQr9o6NFY5Bkw9R
-6mgwGaOsrLin9DR7KoRMDddQQYmMY0VvpDSYTljyiaHtMD/80zJ5EH3brmcNx5BD
-Ek0nrvRbOl84gcP7ItCCIzk0ReQR74yZt5Fw5YyaR78nfaHERtnUHgfKjL1YcuGK
-5+gj/bgmYJ8XioJGvOvTHt72jM1yqTBzxrSpczkgIhW/zO2kHN0=
-=BgZs
+klAlCA/+OD4c8DfMIIDGjvWaJiu2z31OcGkhWkdoRbtSwe3Z1zKPt/+Vy3NGoUvK
+DpSrrGdHAwjfwpZ51rJLoSc7zBRKTWSqxVH+IM1EgWDh5xObrn0U462MjKa5CiTF
+UR4mfMtlCDxKgnDlp/fAlKXQdn6cF+LdrUOai+FX5rR618usRpoX07CBz4YDmdew
+dNQG/7AgnzCh7FUxbCP0bZd9c+egjquLXbcSKADZTFvm/TsLahaUrIeAzbt9Vlx+
+n7x4BfjaCf1nSdcbTaui0dKkag9QgmI4x7Xzdt2+MSkuF577ns+RGjMxikLAFpXy
+thUVX6/hPT3c1675YpQONbmgk2wCQexEyoxm45Ib9/uivEcsP9PwUWmUDIzURzVZ
+710FfPv512oBKh6Khk7LIpmEnStLXnAh3wzGDSmLaMQrevn0xN4WB9fpY4XHowWa
+u/cu40FWYDmKOGyAsTMgmoePy2GY2c/LLrBnySYzCTaWg2VOzrCFMhEPefRPf7ip
+0ZtCrFRXAOiHXWwZ/wxUlYeI7Kizn5mSUSpKHcYPG+2lFqu6WAJ+sxkX49opaxc5
+G1uddfqaG+gG/RMx6ZYu5IQHEed1vlKDzuefBzWEy9krj790JQONRY7It9aHvh+r
+k8vh7IQDjZEcJ2QK9WRXUMuqsn9G0Rg/9CG1Dp9/gUynMAiF5zg=
+=Ybrl
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f9f7104e2e6e..7df93d56eb96 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 23e424b01b13..8ec12abd9dbc 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index da1640e5f21a..312084af3437 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -3,5 +3,6 @@ DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B e66fa84dbe7cd5baa3d4438484ca2c09bbd2cbdbd0a5b1f64ef30f2ed3e899f41f97d7651655057d4c0c7a152b045b16cee31197a26827173c447700657feffb SHA512 4dcd91910425916f594e0e3b99e7edfd401823dc43d836857ffe4c1dfd5f689b777d4faffc8ee1d491a5eb6f2c078f51d8cf53099baab2190745fc13f7f9718d
 EBUILD brotli-1.0.9-r5.ebuild 2079 BLAKE2B 4f8b2c3b1b69a5ca78f1a727fc150f6339413b865d07c0ad487e4ad597785fbcdfee12e849caef006690fc7e8a9a28e08f68379c84335824234357409b2337c6 SHA512 52a60700208ef0a3f560274a43a08d67aa98dce8dd5430264a86c6c5d82f4b9011863203ed5b9b3cd293ae18c6a42ab628e4efdbacf7bae66ce66fc56da3f9f5
-EBUILD brotli-9999.ebuild 2087 BLAKE2B 4210b994d36f5bda2a2cbc0566db6b7e0f198e65635edc7b4471657557a295dcb312fe86038aa8ac7434fa5a0c3bfe157a510a7e5f42d24d40652a10b134f10e SHA512 9d088308a12f81c2bff502b11859f97ebfa4e4bec343968398b5d9682c8b1ca1df504cca7eacd4d2f494531d6c47dd7cb19ab460df5a7a92ce9127fb81cb26d9
+EBUILD brotli-1.0.9-r6.ebuild 2111 BLAKE2B f3fe3750c8034115a85745c1dbfc07813fffa14d047d92b6311cb6329e125034aaabfe36595f02c6fde949066bf86758b430d766dee73a5d387b8a175fb93bed SHA512 52497bb1830cdb278fcaa51cb6ad6a714393ecc7e142d1dc37b6bfa9276fb38dfd80a8fd05a9fada6e6e633567f45b5700e9b206420f991579776a5490350ff0
+EBUILD brotli-9999.ebuild 2119 BLAKE2B 25fbf0cd0430bbba3aa9f55ba182c36fb1c3fe3361cd838b0395b47d513d6c92ce62e065749acba376a76c62ad869516bb5f4ba6c6a4cb3ed14c958c4c70da30 SHA512 2d6082b789e188234370bb48e347d596af807371b55d473e93b165c7d883a5407b1cd0afb7117fe900fcd3c418407e5a17b22471c7c3a5bc346944a20e18ed81
 MISC metadata.xml 829 BLAKE2B 31c7c9adc087001ef6feb8937752317fe46ab500de9c686cf450a9184574b6e4483214e12791b8a81f9dd591a6a5d1ab9fc6f3997831f1e7805d475ff54ac5ed SHA512 c49f2027ce150e20d76f50268940d0ed231419ad57904d1cfcfa76cd4dd281c89e1c16be907c3140026781ae74266b8f37b9a6455893f8e8d824e8e57281573d
diff --git a/app-arch/brotli/brotli-1.0.9-r6.ebuild b/app-arch/brotli/brotli-1.0.9-r6.ebuild
new file mode 100644
index 000000000000..7a77db722acd
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.9-r6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit cmake-multilib distutils-r1 flag-o-matic
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="
+		https://github.com/google/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		test? (
+			https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz
+		)
+	"
+fi
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli/"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+SLOT="0/$(ver_cut 1)"
+IUSE="python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+		test? (
+			$(python_gen_cond_dep '
+				dev-python/unittest-or-fail[${PYTHON_USEDEP}]
+			' 3.{9..11})
+		)
+	)
+"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+PATCHES=( "${FILESDIR}/${PV}-linker.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	append-lfs-flags
+
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	eunittest -s python -p "*_test.py"
+}
+
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+
+	doman docs/brotli.1
+
+	local page
+	for page in constants decode encode types ; do
+		newman docs/${page}.h.3 ${PN}_${page}.h.3
+	done
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 5a1e03ad6871..b50ed0890702 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
-inherit cmake-multilib distutils-r1
+inherit cmake-multilib distutils-r1 flag-o-matic
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
@@ -67,6 +67,8 @@ multilib_src_configure() {
 }
 
 src_configure() {
+	append-lfs-flags
+
 	cmake-multilib_src_configure
 	use python && distutils-r1_src_configure
 }
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f3583a472be3..0b22eb904d8b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 82067d0e12e1..295589a43ee2 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-EBUILD acme-2.5.0-r1.ebuild 1506 BLAKE2B 711f38374397cc66547e93ddad257c04b9c35e8f4712473a38274c8319aabc4a37ceed8869c8bef7b9a76560c07752222e343bb04498c0c4b4a6b2335746fa22 SHA512 10f2f52125f190106ba6efbadcd2f9120d4d014350e88796c09e3bf7f82a580ec85d91698da3fdc14e5012b42b37c82f9d9e55f8dc170882262e49852558979b
 EBUILD acme-2.6.0.ebuild 1506 BLAKE2B eaac3de9e1b624f7ce6ae78429e94b7828dd3075ca8dccb438833fdbf3441b13d4e66c9a7b933691581c8edb87ab2a8971641b67b66b8387b46e52a74dc4b57f SHA512 dfe6e029e7f6c525d366b5399ffa5513ce2fb113cab50892d9b4dea01b74ca867d316f81dec93f93a14fbb902b596f2662358bcf561a69c172ea7094520bbc2e
 EBUILD acme-9999.ebuild 1510 BLAKE2B 90d6f2b5c740938e43199b63deabb24c58482977654f6c2a4eb76493961772a4f296452af46dbb1b9437c823a6916b6d2a5d6a3155793198720b5988604e9239 SHA512 b6324a3f7aae817df99ea8e58d21ba380824126dd810717a0053c4849754b833003d7cf399aefb514d9377accbb823ac81b2c9d0c0a9d095313d701e5ddc3f09
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-2.5.0-r1.ebuild b/app-crypt/acme/acme-2.5.0-r1.ebuild
deleted file mode 100644
index 3d1ceaa2e15f..000000000000
--- a/app-crypt/acme/acme-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="certbot"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
-# to avoid broken 23.1.0.
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 27d067394572..5e92c122d369 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-EBUILD certbot-apache-2.5.0.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
 EBUILD certbot-apache-2.6.0.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
 EBUILD certbot-apache-9999.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-2.5.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.5.0.ebuild
deleted file mode 100644
index 9ed5d0b39780..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-2.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="${PN%-apache}"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 5c9db771dcbf..c1bd43b3ddcc 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-EBUILD certbot-nginx-2.5.0-r1.ebuild 1184 BLAKE2B 6c732ea779afcb9913a2869f0b8b7f8d8a21c1604f96598b57de17eca68eb89df1b178f6189de3560e5530c501797524f5fc7a567a6b55195c2936e6a9476470 SHA512 0d816b6d331691f1ace1429d937a128d4b49217077c6004a2ac2fcec8ab27157e5ed5d45dc08b908aff8a0327e9952ce79207770278a5b093d4f1636aeae479b
 EBUILD certbot-nginx-2.6.0.ebuild 1184 BLAKE2B 6c732ea779afcb9913a2869f0b8b7f8d8a21c1604f96598b57de17eca68eb89df1b178f6189de3560e5530c501797524f5fc7a567a6b55195c2936e6a9476470 SHA512 0d816b6d331691f1ace1429d937a128d4b49217077c6004a2ac2fcec8ab27157e5ed5d45dc08b908aff8a0327e9952ce79207770278a5b093d4f1636aeae479b
 EBUILD certbot-nginx-9999.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild
deleted file mode 100644
index 5781f43cf685..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="${PN%-nginx}"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
-# to avoid broken 23.1.0.
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 90e331b690c6..dda83f6ca50c 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-EBUILD certbot-2.5.0.ebuild 1542 BLAKE2B 6e26484fdaef390362347b41f1dc4962d56916f5c01fac9687dfd29604af2e34372fabd663e39dc010ad84ba909ddc7b32955cd17ce8161553160d2db9f26aff SHA512 9e7fe783fdd75b7b0724d9c2f2d86d6b033fe6dabb807513de676873cf111ec91c0ff23734d6120390b2b9640a087b9f61e3b99807c84985b930a23dace4ee99
 EBUILD certbot-2.6.0.ebuild 1542 BLAKE2B 10c66c7271531f24633aac1c6449255f2d69c3326de897419ed47aad915856b6ab032e6411b606d8f3494553e7d5218e13f23a2dc9dbdaed0299bd6d6373cf12 SHA512 ce9805f2b4e3fb87d5786a82ff00f59c57380acaf3ff71a69ceec2b158915297075d7028ecd10b5659c16c924ca4b283b8d7703440728c637e9b6591963a17e4
 EBUILD certbot-9999.ebuild 1546 BLAKE2B ab591380064d9b0bf1abe4556e553d407019e77e939b854f9b068de6aa7b075ff41e104da9d05612dacc25009bf3ebf2a8511104a3e428343553078ac18466cf SHA512 f4ed476e1058aad7f6fa7866abdb286ccf2e5c5352f3ec0e4e7e593c0d4bcab57281887bb5d7debfdba5fe7710434ea5c7fc80dcc4aedea275584028cacf4f2a
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-2.5.0.ebuild b/app-crypt/certbot/certbot-2.5.0.ebuild
deleted file mode 100644
index 2b7d254bda18..000000000000
--- a/app-crypt/certbot/certbot-2.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="selinux"
-
-S="${WORKDIR}/${P}/${PN}"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-# See certbot/setup.py for acme >= dep
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-certbot )
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 2c0979ca94bc..01bb3532a45c 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/atd/Manifest b/dev-ml/atd/Manifest
index a8aaf01236e2..2372638d19e6 100644
--- a/dev-ml/atd/Manifest
+++ b/dev-ml/atd/Manifest
@@ -1,5 +1,7 @@
 DIST atd-2.10.0.tar.gz 3294787 BLAKE2B 7ef136e795a567eddc064986e1b78f3bbccf0433485c75742a989e7f48ca91b55444f01def67210c55de74f9283ee0316e6de0d38fc6d40a5ff499f16f0cbd63 SHA512 1f5ccd44cb5d7f41745d6399517f6b61c4dfc698a70f24594805ac07e0be240e2a44c1d992ad48622ed85a23384ecaab111b78e76e8e050d25d857356c3bf45b
 DIST atd-2.11.0.tar.gz 3300353 BLAKE2B e6f7f167a24eb6cd43900507e65646d251200db30ee01f8b4f1289f0e965af688bdcccaa6ef5590325ed9934ff4092554124c9b7c47687a2d05f271d8a245e86 SHA512 264e94015bebd096afd452845a63515c5efbd50d30c2cc19bf454079665a2119b2c837ffee809e67de9421020d3224ab2ed1ae8d99f301f32a056b1a7084a8ac
+DIST atd-2.12.0.tar.gz 3302788 BLAKE2B 12688b6971eb600106a56ae4e75228c562d6f482867114737d8037ab1543daa8b3f9dce85732f79f57b7f8d917641a165c2bbc40474e7e39427a97286f0a5c9b SHA512 96a0cb809bc1a063104b9941d1552ce2906cd1ed6348b8350cd4b095251c1f3a189f2e696ee28bce1a71a8601d906d22f600fa381ac318c0b7d7b2f84c328037
 EBUILD atd-2.10.0.ebuild 906 BLAKE2B 2124fcd7e1b59384148ff373a44d04303415e074ac96134a053a78027d3dd15a2127444ed39036ec66d3962100cfae97d653285f76ae4db7debecc8ea26d3c29 SHA512 4788912948417df6c80f56624e47d09115ecf4eb4e41d57e8998feb74fd0a705a19d7e6b3eccbec29323807c97cf962ad09fb5e5d0011a572ff8ec985a3bec53
 EBUILD atd-2.11.0.ebuild 908 BLAKE2B 6c0025924f513f27fc02ce64822118dabd19327f91096592b4a37ff44cbb3792d74eb9fb6431ff54c52350f8d9304ef7cc20bc6f5d358a4ea245edb778581850 SHA512 4f204bb0d6abbd014467f4b35954a94206de4e0e1318c3b2674fd52a733cc87058276782c158695148ae35afb77422f9d0089c641db3d8206318a9f475c4cb13
+EBUILD atd-2.12.0.ebuild 908 BLAKE2B 6c0025924f513f27fc02ce64822118dabd19327f91096592b4a37ff44cbb3792d74eb9fb6431ff54c52350f8d9304ef7cc20bc6f5d358a4ea245edb778581850 SHA512 4f204bb0d6abbd014467f4b35954a94206de4e0e1318c3b2674fd52a733cc87058276782c158695148ae35afb77422f9d0089c641db3d8206318a9f475c4cb13
 MISC metadata.xml 630 BLAKE2B e5fdd285f6179b8a5fbe5cc630ea78c35311eb4d8edd06678ffb4e819b86ec281986c6f8dd1b1409a3b5b90ee251969f920e06d4ac169f2cff766d008645a610 SHA512 61a346aa45fa8395f595c34ac0d80b807a5025ee76eaed653ade817ce5ee9d6c3e39dc60094cb3a8cbfac83bc018775f1502f3af8618da206e2e4b89c569438b
diff --git a/dev-ml/atd/atd-2.12.0.ebuild b/dev-ml/atd/atd-2.12.0.ebuild
new file mode 100644
index 000000000000..8cbc489b2d4c
--- /dev/null
+++ b/dev-ml/atd/atd-2.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Static types for JSON APIs"
+HOMEPAGE="https://github.com/ahrefs/atd/"
+SRC_URI="https://github.com/ahrefs/atd/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=[ocamlopt?]
+	>=dev-ml/cmdliner-1.1.1:=
+	>=dev-ml/yojson-2.0.2:=
+	dev-ml/biniou:=
+	dev-ml/easy-format:=
+	dev-ml/menhir:=
+	dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dune-install atd                            \
+				 atdgen                         \
+				 atdgen-codec-runtime           \
+				 atdgen-runtime                 \
+				 atdj                           \
+				 atdpy                          \
+				 atds                           \
+				 atdts
+
+	dodoc CHANGES.md CONTRIBUTING.md README.md
+}
diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest
index ed69ae8982f8..4f55bc0970b9 100644
--- a/dev-ml/dune-build-info/Manifest
+++ b/dev-ml/dune-build-info/Manifest
@@ -6,6 +6,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dune-build-info-2.9.1.ebuild 517 BLAKE2B a7c02238857706cecab9fe1c0efeedea17ec80c791f0fedc1361be9727ae6a45691b1746098b40e7dd25c7a22c599cfc9304254e4142c9f0f0e952055b06d344 SHA512 1b369cd3d131b4c5c293c157fadf24b600dd3dd9fc78dd120a858b19309eae6fa9ef4c7d4bb8ccbaf4add58a038ccfdd25830f47f877eac59371b2d7c8beaac1
 EBUILD dune-build-info-2.9.3.ebuild 573 BLAKE2B bed3c640cb8ca861fb0ec861efd1aec8ef0845f2529827212850c0ee6bc7f87ed6c702e64b18dd850d8a991b2de0f88c6e49109d412e99a2f2c1d97f50682bae SHA512 91d26ff3b81b0ee110a9c0236fe8c8f2e3eb534d4ac7ae3f80a85c73bbd679fcba9bbbe30b682476144fdd05764190873b98d76bbc95e3651216feaea6ac0ab4
 EBUILD dune-build-info-3.2.0.ebuild 618 BLAKE2B d806b89ad2bccdc3bad326829dd4d69ce9567511a42e83e9fe16f63a5c0670f28921f448b46a706e1b1fa1fa4bf0c2d2aa5f9f74a3b985a361a2095ed7d8f916 SHA512 886e272664f535374c0ca833d6994a13147aa5e561f23572bd43fd0c80ca10e9d0acb6ec6f1202ca4ea97a1ca5919b2ab62f2d1e388b4042a635d58df2ce1c8a
@@ -14,4 +15,5 @@ EBUILD dune-build-info-3.7.0.ebuild 618 BLAKE2B 15138fc586ca114f815b8679448a0269
 EBUILD dune-build-info-3.7.1.ebuild 617 BLAKE2B c871afad5d07e664161df67d3c08d4c21f098b99c403a2f709b464800ee5adf59f60b0822a6c1bf9161d0f3241f8b7f83c2e436dcf1fc65f838683ed213366db SHA512 4741c2ddb34812098ad5ef03da3aae5957a099b2800090f16fcf3eeeba19c65fa7400f113935d9e9fe229b6fdb7b3b35db358d18783f55873e86fdddddee6c9b
 EBUILD dune-build-info-3.8.0.ebuild 625 BLAKE2B b5c12761863e4a3b24b0b42b955ad504289d27fd4e16ca5be69c4c490fa51ae40e762bb8b68ea5754131fcd1ef7a1b98fcb05a359a3dfbee52c68031a28575a8 SHA512 5ba9d815dd97889fbb123b7be6412cfe880aad3a43319026cc32e0ff201390cd9cc7c0b5b251825904eb535af3c46de2cc1fda7d2da5b2741c438b0b163db960
 EBUILD dune-build-info-3.9.0.ebuild 625 BLAKE2B b5c12761863e4a3b24b0b42b955ad504289d27fd4e16ca5be69c4c490fa51ae40e762bb8b68ea5754131fcd1ef7a1b98fcb05a359a3dfbee52c68031a28575a8 SHA512 5ba9d815dd97889fbb123b7be6412cfe880aad3a43319026cc32e0ff201390cd9cc7c0b5b251825904eb535af3c46de2cc1fda7d2da5b2741c438b0b163db960
+EBUILD dune-build-info-3.9.1.ebuild 625 BLAKE2B b5c12761863e4a3b24b0b42b955ad504289d27fd4e16ca5be69c4c490fa51ae40e762bb8b68ea5754131fcd1ef7a1b98fcb05a359a3dfbee52c68031a28575a8 SHA512 5ba9d815dd97889fbb123b7be6412cfe880aad3a43319026cc32e0ff201390cd9cc7c0b5b251825904eb535af3c46de2cc1fda7d2da5b2741c438b0b163db960
 MISC metadata.xml 380 BLAKE2B a55122ee1d38e6491f4f2c955ab0271647054d171979d9b3a964c9d1c7239aeb17c89768008a36bd583b373069f387de809a8a62af68f725568f201f2be8b979 SHA512 9b49e03db4133c31c38c13f2502ebd56833c516d27facf46b9d83eaaf3982c3d5dd4e2dc2a1b5e5cbf8cbc60405f4aa2f0bd7a0886c3ead97598e139cac3d595
diff --git a/dev-ml/dune-build-info/dune-build-info-3.9.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.9.1.ebuild
new file mode 100644
index 000000000000..3d78214334e6
--- /dev/null
+++ b/dev-ml/dune-build-info/dune-build-info-3.9.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Embed locations informations inside executable and libraries"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND=">=dev-ml/dune-3.5"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p ${PN} @install --display short -j $(makeopts_jobs) || die
+}
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 953360c9e31f..0876f50e03f8 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -8,6 +8,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.1.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.3.ebuild 640 BLAKE2B 03acf53a5ff56128b81431b93f3a63f6481ba1038febaf5968ea45b05a7e320846d075d263d1c12a00275e39a32e1bc6b7261b6f0d583643772457e98ec9cc85 SHA512 cbd7dfc3eb477105f9712764d1c592f193d6093a5617d6c319d0e734fcc47c6c56f4cc48b517e6c67d231f958c13eec6534f52cfcc90e847492bb6052b9d9001
@@ -18,4 +19,5 @@ EBUILD dune-configurator-3.7.0.ebuild 872 BLAKE2B 5e035ad05ddd4b2f13432eff66db20
 EBUILD dune-configurator-3.7.1.ebuild 871 BLAKE2B 227b610d5f16761c951450e27afb484b262984f651e3d143355317b3bf5b40e4acb08c2ac11aad77e819278bf10b2ba5c4b01e5ec27c4a6c1647e198bb89499d SHA512 a29fa91ff1afc457b63f812498e109bf20c4bba1219887294c1d259018e8204c7ee91d5314960e0aa29650da1eecba8d124771f1f35850789015816d556e44c3
 EBUILD dune-configurator-3.8.0.ebuild 872 BLAKE2B 5e035ad05ddd4b2f13432eff66db204e4136d4eb55688e926c53758bf9df86a85f12b61ea72072ae3eae1859c943ae9494d67aeddf7382463a100902a9479a1f SHA512 cdd1308bf3dcbe1c81232487f0dc91c9934d7827ee663c3d46071bdd0489c8548a7169da6db9434b89bff5e6e36eaca31a3ffad500b63110a7198584f3b2bb65
 EBUILD dune-configurator-3.9.0.ebuild 872 BLAKE2B 5e035ad05ddd4b2f13432eff66db204e4136d4eb55688e926c53758bf9df86a85f12b61ea72072ae3eae1859c943ae9494d67aeddf7382463a100902a9479a1f SHA512 cdd1308bf3dcbe1c81232487f0dc91c9934d7827ee663c3d46071bdd0489c8548a7169da6db9434b89bff5e6e36eaca31a3ffad500b63110a7198584f3b2bb65
+EBUILD dune-configurator-3.9.1.ebuild 872 BLAKE2B 5e035ad05ddd4b2f13432eff66db204e4136d4eb55688e926c53758bf9df86a85f12b61ea72072ae3eae1859c943ae9494d67aeddf7382463a100902a9479a1f SHA512 cdd1308bf3dcbe1c81232487f0dc91c9934d7827ee663c3d46071bdd0489c8548a7169da6db9434b89bff5e6e36eaca31a3ffad500b63110a7198584f3b2bb65
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-3.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.9.1.ebuild
new file mode 100644
index 000000000000..2ef2249b6a21
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-3.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Helper library for gathering system configuration"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# This enables dune-configurator to use the vendored csexp module
+	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
+		vendor/csexp/src/dune || die
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 912e234f7f1f..337056d16b0f 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -10,6 +10,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.1.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.3.ebuild 4427 BLAKE2B b1e9d3675cd29e48575b1470cd62c05cb5a9f10cd904041c262282705cef38ed1fb29447de4591ec2dff2bf732f952681eb9739455823a583c9dfd067aaedc13 SHA512 21f02b96e75fa18e29c832309c68817f54e1bf0f41860854a0655bd9ba75932d477b8f28a7c9abf3556f3f554aff7ee9db5ece2f9ca0432aed308f9d68f3a7a7
@@ -21,4 +22,5 @@ EBUILD dune-private-libs-3.7.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c936415
 EBUILD dune-private-libs-3.7.1.ebuild 783 BLAKE2B 0e5c4ad9466bffc02f904bbad79cc6ff4c5b2ada28ab60840a756d3c3daa23eb6ca42398cd27a00355d11f13c1490324f54fb078f4a3b93b43658bee62fd4462 SHA512 9b6095ac9ee29f000beb9108eed8a992e8832dc71b4c1ce5b5dc0c9d1358936728cacea8929e0f6fe691c9908eab57cd72057a8e77d74cd53733e58e79a3a5fa
 EBUILD dune-private-libs-3.8.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
 EBUILD dune-private-libs-3.9.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
+EBUILD dune-private-libs-3.9.1.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild
new file mode 100644
index 000000000000..797e233bbac6
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Private libraries of Dune"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/stdune-${PV}:=[ocamlopt?]
+	>=dev-lang/ocaml-4.08
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest
index c9d7647191ad..e8922dc0d422 100644
--- a/dev-ml/dune-site/Manifest
+++ b/dev-ml/dune-site/Manifest
@@ -8,6 +8,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dune-site-2.9.1.ebuild 596 BLAKE2B fa03797d6cb98422acafc3854035967c7f8b58271f7155e4abe02061357165df76223e6eb01f76b67468ce09e1752056a242b247b3432ad086367a12b6bdf662 SHA512 c6d3e08817f15d05b9f07f2cc40b6908deb00e68fd79e5ebac95a86c57b95d2d31071e6dbe9b4d87401a5813e23e7ae1b6077ba22f74a356b93dd5a530a333e6
 EBUILD dune-site-2.9.3.ebuild 652 BLAKE2B d99c298f108e590fd24614fb8ddc8d449c3cfad617316726caa1a2aebccab7ff975b0f77a53c3ecf52e24ac0271931eaa934d109c286f0654749bd7fe1b266f9 SHA512 282bf34cd9a35c455ea8b4bb7c5b17a3be2d57036827ae938943fc38bbb9792b3f066bb575659554df9dd6e36cb7c095cbcd9eca28e959f66fa875e623f701fa
 EBUILD dune-site-3.0.3.ebuild 648 BLAKE2B d0cb9e9cc9e960c953fae2444f3fc4f313172417a78c45e1ddbdd661eec88b8621ea7bcf28b1f43dfaaee97831f964f31ba17271be4c9a34d4e4e9c0e367c9bc SHA512 99010735c6d813698e73a17d7c3b937b2a8d07295c1fbf071461dea7e2bd4d20e78e78f3e4863da715268fd9a43bf630199bdfd100a6afdf358d387281fde0ae
@@ -18,4 +19,5 @@ EBUILD dune-site-3.7.0.ebuild 649 BLAKE2B 9a97fd12311d329b1b86a89b8f010ec3db5f85
 EBUILD dune-site-3.7.1.ebuild 672 BLAKE2B c71af94e9dfa07f9b76fffb3b633dfc107a413ff2d482c166a71fe8a13d756acf48384d9493876bc79f1e33d49f06a18592638ec075abd37a6ca40dc140d8eed SHA512 597c9c50172a9e761bc7deb42d8021118b334ae516fba349cd99460f0ce7e4285ac3f7cf75f0137bafabbc46063491ead126c963c19a726b3d0210550cdf0013
 EBUILD dune-site-3.8.0.ebuild 673 BLAKE2B 7c1f4b6dc24926c08f3a653bf2d793ef66f2b79562e5a2eb87a667ee500a102f30c619f82c4c665aac9942ab880cc850ea10001f0b30afee4738c4a3b69d5a42 SHA512 4213c7ea543aed100577d55b40fcd1f155eda907178a670a530f66e42a5bfabbbddb44ebb9dd22e000958121beb9d9e02f5e632a348c9c8a06c795d21d1a228a
 EBUILD dune-site-3.9.0.ebuild 673 BLAKE2B 7c1f4b6dc24926c08f3a653bf2d793ef66f2b79562e5a2eb87a667ee500a102f30c619f82c4c665aac9942ab880cc850ea10001f0b30afee4738c4a3b69d5a42 SHA512 4213c7ea543aed100577d55b40fcd1f155eda907178a670a530f66e42a5bfabbbddb44ebb9dd22e000958121beb9d9e02f5e632a348c9c8a06c795d21d1a228a
+EBUILD dune-site-3.9.1.ebuild 673 BLAKE2B 7c1f4b6dc24926c08f3a653bf2d793ef66f2b79562e5a2eb87a667ee500a102f30c619f82c4c665aac9942ab880cc850ea10001f0b30afee4738c4a3b69d5a42 SHA512 4213c7ea543aed100577d55b40fcd1f155eda907178a670a530f66e42a5bfabbbddb44ebb9dd22e000958121beb9d9e02f5e632a348c9c8a06c795d21d1a228a
 MISC metadata.xml 380 BLAKE2B a55122ee1d38e6491f4f2c955ab0271647054d171979d9b3a964c9d1c7239aeb17c89768008a36bd583b373069f387de809a8a62af68f725568f201f2be8b979 SHA512 9b49e03db4133c31c38c13f2502ebd56833c516d27facf46b9d83eaaf3982c3d5dd4e2dc2a1b5e5cbf8cbc60405f4aa2f0bd7a0886c3ead97598e139cac3d595
diff --git a/dev-ml/dune-site/dune-site-3.9.1.ebuild b/dev-ml/dune-site/dune-site-3.9.1.ebuild
new file mode 100644
index 000000000000..7bf2f44ff50c
--- /dev/null
+++ b/dev-ml/dune-site/dune-site-3.9.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Embed locations informations inside executable and libraries"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die
+}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 2ec8881d6d64..950da0a2d77e 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -12,6 +12,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dune-2.8.4.ebuild 925 BLAKE2B aaf039c23fdec35db8eafa1362e05e0a0007b4d5a59483726cffdd4c3f2738ab53cae26451001fa051fe46444f29d08ffd3e22233acaa3280db2c761822c1295 SHA512 175a4b03a248ade24a4a0fc232d13364f5332f9cd686056710dd1fce04b27ac59d81b3844ef1476867f3c5f646167dc40ada4609afc5594ac721ca5f216670a7
 EBUILD dune-2.9.1.ebuild 904 BLAKE2B f98314d3cd1daa6fd08610daee2695a30b4c751bc1d060aad8b99b8e3e138fbe9751a92b5df3e1d1f62a8235b509ed884c75f2e11673d8a8a3cb50ddc414bdd2 SHA512 10a59aa34098669ca0d6d6a568cc63d124fd174850bb66591e9798b452629cc7647d6204050a4fbda2db394782c17590155467d798783018ff1205cde4b92e0e
 EBUILD dune-2.9.3-r3.ebuild 1265 BLAKE2B 0aa481a6b75ba13972682b92d5c39d07bf84918b09c7b210ebd667e53a4eb7173ea4ae4ca136cb55ad07b6c8bed1f033eaeedcff56af6c8644007df85df29d01 SHA512 46a7ecc0d6fe9ea59706dd71c26bc7064e735f5045f62e4204f474459d09671e028c6c7129a18bffdce6585739545f49093c0ba24b8a9fd22ca849a8c5fbcda8
@@ -25,4 +26,5 @@ EBUILD dune-3.7.0.ebuild 1561 BLAKE2B 46637f8691911208ab05dc8c1c2b22df8eba240ff6
 EBUILD dune-3.7.1.ebuild 1565 BLAKE2B fb9eb53ad7861e8ee463d1d3ba4ab4b064f9be5e5dc2c06c5db2d47667b750c1f22c46c9b8ebf66865dff90deab4bd779a06d0ed356bf51c47df38ba3316bc72 SHA512 67e67dc445792fa5a2fb0bba48b39a85c2b8704489852c57695de9f499cba23bb2324d93b36e44e7457ce9f48f7f2c8af6d9a695645e8abc90d1d62b986b8d2f
 EBUILD dune-3.8.0.ebuild 1566 BLAKE2B 3b3eb946a1582234454251077f31c79a968f29f88a49d33e7371ead77adf2cb53e55255f783fd27040a1a6bb70bf71a17e01429f6f795a615577a8657534b1f6 SHA512 fe1d4ae81f2b38ccedc2a9308b6aff22b24ad37fa2c8635ecfede8d7952c1a4d0ccc420e9500b1d696aba2aea652dcef6b211a409728a02dd952e25261d08b2d
 EBUILD dune-3.9.0.ebuild 1566 BLAKE2B 3b3eb946a1582234454251077f31c79a968f29f88a49d33e7371ead77adf2cb53e55255f783fd27040a1a6bb70bf71a17e01429f6f795a615577a8657534b1f6 SHA512 fe1d4ae81f2b38ccedc2a9308b6aff22b24ad37fa2c8635ecfede8d7952c1a4d0ccc420e9500b1d696aba2aea652dcef6b211a409728a02dd952e25261d08b2d
+EBUILD dune-3.9.1.ebuild 1566 BLAKE2B 3b3eb946a1582234454251077f31c79a968f29f88a49d33e7371ead77adf2cb53e55255f783fd27040a1a6bb70bf71a17e01429f6f795a615577a8657534b1f6 SHA512 fe1d4ae81f2b38ccedc2a9308b6aff22b24ad37fa2c8635ecfede8d7952c1a4d0ccc420e9500b1d696aba2aea652dcef6b211a409728a02dd952e25261d08b2d
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-3.9.1.ebuild b/dev-ml/dune/dune-3.9.1.ebuild
new file mode 100644
index 000000000000..4055f5de2e82
--- /dev/null
+++ b/dev-ml/dune/dune-3.9.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing elisp-common
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="emacs"
+RESTRICT="strip test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# This allows `dune --version` to output the correct version
+	# instead of "n/a"
+	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
+}
+
+src_configure() {
+	./configure \
+		--libdir="$(ocamlc -where)" \
+		--mandir=/usr/share/man \
+		--docdir=/usr/doc \
+		--etcdir=/etc \
+		--datadir=/usr/share \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		|| die
+}
+
+src_compile() {
+	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
+	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
+		-j $(makeopts_jobs) --display short || die
+
+	use emacs && elisp-compile editor-integration/emacs/*.el
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc
+	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/doc || die
+
+	if use emacs ; then
+		elisp-install ${PN} editor-integration/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
diff --git a/dev-ml/dyn/Manifest b/dev-ml/dyn/Manifest
index 573c924a742f..a69998096d78 100644
--- a/dev-ml/dyn/Manifest
+++ b/dev-ml/dyn/Manifest
@@ -6,6 +6,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dyn-3.0.3-r1.ebuild 735 BLAKE2B 50178b1198063c8c4948fcdca0e2ee28788f9c028b315cb64f3f8ed94918e00bf7b5ef99cac87608c21394a854eb053f7f7dbe1527833a421bb1d1cb3a7e0db6 SHA512 03840527586ee0c0fce79d25467ac1345b6c526dd743284da848e1a020d663a4496cd098eacd4b5f03811367df8ccc7fabee9a596fb0932beaae1438f73fecf1
 EBUILD dyn-3.2.0.ebuild 653 BLAKE2B bc2933bc852929940726bea62cb14c93f77f2e542c60dfaf4ae14b4a49a51932ba76db8bbe8a4b584e4f82d74c233a85d9d3df86dcc81042f69319b2b2715bc4 SHA512 24b480d8439a6717ef3dd8e38eebc7edb7a4ed493efcfb3d9346697ea7a39213cd5cba0c32318d938856bcaa78a8ea0fcb4379a13c1da33a9bdba35365a4123c
 EBUILD dyn-3.6.1.ebuild 655 BLAKE2B 97de7f78f64e637d813eb83c97072ed09a8f18a4bebf224cfb48ce8c90394e4502aaaa6be6c04106a0931f010eb6a0602aec81ff3098037acf7fe210a96cf037 SHA512 34ebfe9530dacecc41aa5f1534e4cde37719fdcb6f9f4d81be3fe0360d65b805cf7168fc264e5f47776271a758056abdf8d8a356110d29a9d3de35c6d3c8c687
@@ -14,4 +15,5 @@ EBUILD dyn-3.7.0.ebuild 660 BLAKE2B c769168187e381237eec8a74c5e78a77eee8cc7be355
 EBUILD dyn-3.7.1.ebuild 659 BLAKE2B c2c2ef854e283c81600f409fce6e745443d3ac4a81ef099d4ccb9089317482cefdaf65755042503fe1579863e0071057fa73e9da910bff8c9e1fb1c2f3a684f7 SHA512 91226e8f4ea177a86d1e666696ac3795e3ce69cf64e953c37227b5d75aa5afd902df5da295658c2735c6a1140bba835b1cdffb3f5944784684db0e0e98ff7765
 EBUILD dyn-3.8.0.ebuild 660 BLAKE2B c769168187e381237eec8a74c5e78a77eee8cc7be355845a52e9bcda195d18452738eced0610f8b83a0b470075d78075389f726b6fb6c8ae981a00e0ae206fd6 SHA512 d11b82c425d67af751f9fe01d533a7c1b183d84536d90b924f6bc1beb779a607ff87319788aa24f6c0b895a65d6e60c7cf3e76e998ec49f06f0e8b334a3a2c18
 EBUILD dyn-3.9.0.ebuild 660 BLAKE2B c769168187e381237eec8a74c5e78a77eee8cc7be355845a52e9bcda195d18452738eced0610f8b83a0b470075d78075389f726b6fb6c8ae981a00e0ae206fd6 SHA512 d11b82c425d67af751f9fe01d533a7c1b183d84536d90b924f6bc1beb779a607ff87319788aa24f6c0b895a65d6e60c7cf3e76e998ec49f06f0e8b334a3a2c18
+EBUILD dyn-3.9.1.ebuild 660 BLAKE2B c769168187e381237eec8a74c5e78a77eee8cc7be355845a52e9bcda195d18452738eced0610f8b83a0b470075d78075389f726b6fb6c8ae981a00e0ae206fd6 SHA512 d11b82c425d67af751f9fe01d533a7c1b183d84536d90b924f6bc1beb779a607ff87319788aa24f6c0b895a65d6e60c7cf3e76e998ec49f06f0e8b334a3a2c18
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/dyn/dyn-3.9.1.ebuild b/dev-ml/dyn/dyn-3.9.1.ebuild
new file mode 100644
index 000000000000..a3d55d2d7132
--- /dev/null
+++ b/dev-ml/dyn/dyn-3.9.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dynamic type"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="~dev-ml/ordering-${PV}:=
+	dev-ml/pp:="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/ordering/Manifest b/dev-ml/ordering/Manifest
index 095f5d8055c9..3c5670c43e18 100644
--- a/dev-ml/ordering/Manifest
+++ b/dev-ml/ordering/Manifest
@@ -6,6 +6,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD ordering-3.0.3.ebuild 723 BLAKE2B ad341964914e19c0d9509ed4990ef2913d9c7338d72897fac8b82d03d0b6169caf15adcb62bed2a9beecfe85e00a8aedae938c7473e7e4f45bf28813eb3ab689 SHA512 5d128cc3d8edb9528e81d02017c07acbcbf8f70141e12875e9ee5a3384b47ee3308ab96959225a7c38ee43d2d07378884ba68eea910f65bec006bb92b3ac8c16
 EBUILD ordering-3.2.0.ebuild 641 BLAKE2B 44fadcc5e9f950bc8f44db92b642138da20c85e9bfd88b809b199e47665ecfe5318f17d91bc8150dfcf62940100973db06b29c0a0519ac0d336df7337d35a06e SHA512 c8deace1291c0ac0075d65c8fdf38f619ce8f1933e83800ad48b60a9ae2076d3633b5b964b3964694d17a4bdd9c7b14fd418c2fe1d7e15282ed83a2d1f0736d4
 EBUILD ordering-3.6.1.ebuild 643 BLAKE2B 390ad8cacb4eb1556bacc120d790781c5b4a70fb909a5654a30e0bb0ee5e1b700728de852065c00a17a1e412dd5b6bb7a0257800fa11a63382ff0e06c9320128 SHA512 ea847e26eab7998b97ecfe02f6a484596af2114626c0b62f2ae24f21dd2cbd2d607e5efadb69a0325b9ba1ca57d2abed639a4b580c4ec3f5c4224bf4c4fc5a13
@@ -14,4 +15,5 @@ EBUILD ordering-3.7.0.ebuild 648 BLAKE2B 564da55b0cdc8bc6ccd67ad86cdf1e11f9706e4
 EBUILD ordering-3.7.1.ebuild 647 BLAKE2B fc86778fcb85b28dbd848f6469e541a2d424eec0f3185be5c884ce5ceda6cd6694e0edea602acbe66770a9774a341763310259bf30565f54895915b85a6b4cac SHA512 a2cfdcefbad3220b3a5e9a758c9e61029a0d7d59af8d530ca903b77352a01c16c48eb14b13f09ccabc92764f41b8955cb758b151b5bdbbbaa7e302e8eb283a92
 EBUILD ordering-3.8.0.ebuild 648 BLAKE2B 564da55b0cdc8bc6ccd67ad86cdf1e11f9706e401fab26974b1108b9493caa1df7bc10f683b37e6424ea99698745ab47eedb500fc202cbaced3bd08c1d7b251d SHA512 c69d4b8c5e9cf5b92bed2bdd1e65e707d4ecf61ecdb0920b91a52070282c45a60d5135818afa5bcbd483f3ccb476b5adbcd8607cf58b52d234a80fcfe5eaddec
 EBUILD ordering-3.9.0.ebuild 648 BLAKE2B 564da55b0cdc8bc6ccd67ad86cdf1e11f9706e401fab26974b1108b9493caa1df7bc10f683b37e6424ea99698745ab47eedb500fc202cbaced3bd08c1d7b251d SHA512 c69d4b8c5e9cf5b92bed2bdd1e65e707d4ecf61ecdb0920b91a52070282c45a60d5135818afa5bcbd483f3ccb476b5adbcd8607cf58b52d234a80fcfe5eaddec
+EBUILD ordering-3.9.1.ebuild 648 BLAKE2B 564da55b0cdc8bc6ccd67ad86cdf1e11f9706e401fab26974b1108b9493caa1df7bc10f683b37e6424ea99698745ab47eedb500fc202cbaced3bd08c1d7b251d SHA512 c69d4b8c5e9cf5b92bed2bdd1e65e707d4ecf61ecdb0920b91a52070282c45a60d5135818afa5bcbd483f3ccb476b5adbcd8607cf58b52d234a80fcfe5eaddec
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/ordering/ordering-3.9.1.ebuild b/dev-ml/ordering/ordering-3.9.1.ebuild
new file mode 100644
index 000000000000..3302c44ddac1
--- /dev/null
+++ b/dev-ml/ordering/ordering-3.9.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Element ordering"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND=">=dev-lang/ocaml-4.08"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest
index d036ae642df3..c5232fe8926d 100644
--- a/dev-ml/stdune/Manifest
+++ b/dev-ml/stdune/Manifest
@@ -6,6 +6,7 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
 DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
 DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
+DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD stdune-3.0.3-r2.ebuild 880 BLAKE2B 2ead44e52c3f7a95b40f7cf1fb9ac4ce6e6ea1d0033b349db4fcec2a4d676c34449516fcb73101ced3f5e3e2abdc6d44a9901778dfd610fb65eb4d07f919195d SHA512 cbbb5c0cc62cd24f0ad4df2415cb33077527f2f6ba31af69d832d56733f2fa2c78b28c7ce30ce37668b74b02f4f1f4a6e418871a4a56b9422188ee74ec2a0546
 EBUILD stdune-3.2.0-r1.ebuild 798 BLAKE2B 34a506ce7f21df10539ddd5ce3459c62bc3141bec6a36f6d9a93077e3a8fa7ca10b58763fa6397538600c9e449661dc3acf9c761cad6bf0e156b4d0fff92663c SHA512 b70c6909e49e9e19cac20d9485f4dfee157fd5996d3142cee4d8e85e4a109b39cb5bb6e384ffacc7293da344e30d6b433c02238e6bf25710252e06a9167f50ee
 EBUILD stdune-3.6.1-r1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
@@ -14,4 +15,5 @@ EBUILD stdune-3.7.0-r1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549
 EBUILD stdune-3.7.1.ebuild 799 BLAKE2B 15080bfc4ea1d21e5d478e469db27be133023573747fbd51e5d02d88ff4c0f77157fde8cc94a10c181facf0cf170774a0d9127ddea771fdbaffeba9aecc340ef SHA512 902fefbba7e7e552a76bfe93104a3d4afab63b087de5e22d55e65b0183045cfbf0cc85c70a141281ea6c8d82cfd467d1e47110934e301bf328f16ad79acaf5cc
 EBUILD stdune-3.8.0.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
 EBUILD stdune-3.9.0.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
+EBUILD stdune-3.9.1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/stdune/stdune-3.9.1.ebuild b/dev-ml/stdune/stdune-3.9.1.ebuild
new file mode 100644
index 000000000000..8d82be573c81
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.9.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bbef1ba7f5a5..bafe94be454b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/deepdiff/Manifest b/dev-python/deepdiff/Manifest
index 883790e42e53..273cc231926e 100644
--- a/dev-python/deepdiff/Manifest
+++ b/dev-python/deepdiff/Manifest
@@ -1,3 +1,3 @@
 DIST deepdiff-6.3.1.tar.gz 392651 BLAKE2B 605dddc7c9d5895388141cbd3ed1a566c0631050719f3bd849578d40497323c0e9c117a8b4c73b21010600caec775f7c226818d0f15f4f1a8f4c3829414323ce SHA512 13d9edf42eb50b6e63e038a2c17d7d54e82e5e6b5ddc3420cc457d91e220da92391b17c238ed3a49d0f69168cad887c2278182734be23265d5c53928b28c4c42
-EBUILD deepdiff-6.3.1.ebuild 786 BLAKE2B 040d74f8dba99a9b829e52a0c06c0f0d62470f8c5c5279c7e18d0b35de289f079a5130b420e7836f33fa724a3d6662b8102618d6a47deda60f2c7161a7492494 SHA512 081b06158a343f3e4982143ceb199ae6f9c6f573d1094b6e1153cb676dc99597c0cd7db604494a4c014d898495910d16ef6f43c137b99160e0bbc0f21265a7b6
+EBUILD deepdiff-6.3.1-r1.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
 MISC metadata.xml 369 BLAKE2B b1418f3fdd2b49fc003b02e8eaadadfdb71a6133fee9191095852155368946e43542d92d318328a5cdc3610392f31faed85ac5f7e39024b32c399d73cb3bde3b SHA512 f15095a60c5c63447e57d8ca85f5b93eb55f3a42a4fd29d1af7116ba4f48c496f56e9e17aaeaba323d44823bafd7e6cb751b14ce6e092779eecdd34759ea5c1d
diff --git a/dev-python/deepdiff/deepdiff-6.3.1.ebuild b/dev-python/deepdiff/deepdiff-6.3.1-r1.ebuild
index 821fedf90d5b..e41b020f504f 100644
--- a/dev-python/deepdiff/deepdiff-6.3.1.ebuild
+++ b/dev-python/deepdiff/deepdiff-6.3.1-r1.ebuild
@@ -27,6 +27,8 @@ DEPEND="
 	test? (
 		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/tomli-w[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d070a4152d36..49f7ffe0804e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 1e9054f0d633..b883361340c0 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1082 BLAKE2B b837e34a29f5b0c1f719082a87d4040834c1615e1e1a84dfe178b7e86265d430f65b44db35af9b0044e1a964fa6044f1843722bbbd5077b2406606bfbec5907a SHA512 e2797e77b3971a8b0058a50c478b391448db16937019e9c2033c1b43be8f730302b12cea2eb781753ab599df583196e79ac3c2898d062f4d564df7e10812ca20
+EBUILD cmocka-1.1.5-r1.ebuild 1114 BLAKE2B 156ddac2e886aa284dded8265b99b6f6630982a3d4e63e308fd2d7fc72da02e00f44e4d5dc55cc61045b188458822c8f7e45a0e19ca1bcf65eb2a5abcbfd19f8 SHA512 a44d7254e0bc168fe42513260147a0363167d6e4c03a968f09c7b5b4a385e1df1e9da2965553170a32ef20adce586dbd8f31cf3c7253c8fdd7e35817d16b811e
 MISC metadata.xml 260 BLAKE2B f2a46bd04167517ee453a39cc2dcc848d4fb0760026483acd86fa86829779666837e81f8a9012c69c0eb89d5fbd9fb22002a2c786877ddd5c81ca1d80a0eead9 SHA512 a44f57da0d8fa3e4c8df9d9052e53ba139603c7312d4b13fc3c311455e41488c0bb855712817929c4f551747ee6651ac0c3428f28129e4a889a56622281b58b6
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5-r1.ebuild
index b2f60df8bddb..15f0abdd3156 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Unit testing framework for C"
 HOMEPAGE="https://cmocka.org/"
@@ -18,6 +18,8 @@ RESTRICT="!test? ( test )"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 multilib_src_configure() {
+	append-lfs-flags
+
 	local mycmakeargs=(
 		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_STATIC_LIB=$(usex static-libs)
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fc6bdca43ad3..786a5381aac6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,9 +1,7 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
-DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f SHA512 2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
-DIST meson-1.2.0rc2.tar.gz 2173996 BLAKE2B 99707e8d57a95ed9ee381f05e5c22a5f73433a472c5dcad25999af8cb4c7a52d4604eee260e22a84cc2fff402fed0a57d0263f7e43e4986482c49b73f06920e0 SHA512 3090d33e0b4b695f407ebc196ad5508c1f617cdb04d97f265e7e13d12baa568273b04c4c0dbd8cb9a6a19fe1fec2047698bd3a4ea62929637887d835edcc6eac
+DIST meson-1.2.0rc3.tar.gz 2179074 BLAKE2B a195ccbc2fdf601ec7a0bbc4d858f04b37a843be4705e58f40274ada82615b63fd02f0e681138595d122bce76e274d69c6937247a578ae6bd76d71329693aa9d SHA512 af2659d88d8b8db46c4b96a6c6b2da0ee71899600f8c6a65d1086503d3ee003b28f2ab37782bf678a7f90d6be5f2de10f7032e002008b57136b8f905b90dd5dc
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
-EBUILD meson-1.2.0_rc1.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
-EBUILD meson-1.2.0_rc2.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
+EBUILD meson-1.2.0_rc3.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
 EBUILD meson-9999.ebuild 2946 BLAKE2B 0fc44fb33f5d79d53c15ab84caad219f80437530f4b3620f2c0a1f336a11710601bd2a3eb408ec6adf6204a1dafa09d97b3fe403d66a380c7017d753849aaca0 SHA512 3101b94bdb792a5bbc7b3411e5d77d7b36781d08b7746523c9e7584e65204b025ccbfba7cc924829b7f0a84309a6a90455293cc8dd0964e98de7798200a7241d
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.2.0_rc2.ebuild b/dev-util/meson/meson-1.2.0_rc2.ebuild
deleted file mode 100644
index fefd68d177e5..000000000000
--- a/dev-util/meson/meson-1.2.0_rc2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2016-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	inherit pypi
-
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		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"
-	fi
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}
diff --git a/dev-util/meson/meson-1.2.0_rc1.ebuild b/dev-util/meson/meson-1.2.0_rc3.ebuild
index fefd68d177e5..fefd68d177e5 100644
--- a/dev-util/meson/meson-1.2.0_rc1.ebuild
+++ b/dev-util/meson/meson-1.2.0_rc3.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index c67d3ac6e530..7a8996dbece9 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 36804a63c23e..a9adf7381edb 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,5 @@
 DIST kdiff3-1.10.4.tar.xz 1112620 BLAKE2B c9bc254fecdfed2df4e75c4b1668083ac59eec43ffc4b17e5b16042e469041a4ce7fb1b1cb12e6283645ff8a89532c68d5fa0d6025dbe9781834be4a1cc2d893 SHA512 42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c
+DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223 SHA512 567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2
 EBUILD kdiff3-1.10.4.ebuild 1130 BLAKE2B cd197319fba952a492111451cdafed43bd08544f4af6cf3633bcd640a4bf66934abf69e79f4d6646e892fb8eebe124f9cfb9889f27fb14542dc04db84414fe14 SHA512 918b4db154262eb286819b32143dab7256ccd51334c860a8720da4a1e47210a60072d45d00e3e23ef3937561a15293c1c4a5bb62565c9555bfef82b945af3951
+EBUILD kdiff3-1.10.5.ebuild 1108 BLAKE2B 322e68d0830f4805332996cfab8bb7f292bf9b10059e77895010032091c3b3fed3d363cb144084ac604d238125af848fe0452d897545680b63c2da394c87a800 SHA512 b51af2da70926b606e196436423c97e14b90199bb1a144ddb34086f1de7c5e3d0314c9006fb72b67ff73798880d6ab5b515d03f8467093380a7481360913030f
 MISC metadata.xml 431 BLAKE2B 6848facdd79d1805d96f6b9c8b8fadd673ac7884eb14b31c854e7043d8474ef2702ca0b43b6ddb235ea70a25b41b5ad93a2616d5ce2b87a53a53bcd4c42839e1 SHA512 7f2f61311bf3f8f926d2f6538e3f693ffbc059068062e6c5313d4b48c0ad4e8155f9ccda52f79e65ffdcd529002c9b29f84dcf6b612e3984db9444177509bd0c
diff --git a/kde-misc/kdiff3/kdiff3-1.10.5.ebuild b/kde-misc/kdiff3/kdiff3-1.10.5.ebuild
new file mode 100644
index 000000000000..4c421ae349ce
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=OFF
+	)
+	ecm_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 988ee316523b..e44d3125214f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index b839ab632fc1..2ef4c0c443f9 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,5 @@
 AUX openjpeg-2.5.0-gnuinstalldirs.patch 11415 BLAKE2B 9916b82721b9e75dd175d8cf6b85aa9f3b0bbba4d72b5d9c21db853ccf7a40d970db051eff159040fa7b4eb478a5106879044b103e0fb30078704f51c4cb3eef SHA512 d559e1e101b88ea9f391d984e7fe2a28ed5572692f3fbf8c7e79e17105ce83d17ca2a378688c595a8da4f60925de5bf57569424de51a627e629d39479e04c682
 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306 SHA512 08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624 SHA512 4444225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae
-EBUILD openjpeg-2.5.0-r4.ebuild 3002 BLAKE2B 1fc7abfae69c21c4f9dc7634c1a29d8a6f861d6b131afd014eabf7b33f5c4b1b384c2bb8aa8de1d3551666278cd03dc5c70439a9a62de4342cbb96f39d518cdb SHA512 71122894229a069f85345bbe66d281751087be8abf4fdf535e5ec0c6f2681b3737cc69f9a5704a2302424334333477c87cc43d6042e355321b152e453316d27f
+EBUILD openjpeg-2.5.0-r5.ebuild 3021 BLAKE2B ffaf9295fe43545c114b550a78250a8e5f52b96e2b6a258fbf5f01c2015791daef6a21fac59418528749a782ebd471046ec6108831a71532da1c9ae6480ba312 SHA512 453d8de65142576caa49867b68f6b331f68b1c14195b7823a255ef40832724204673a95429c7ea00253b417c8bf05218b6496f65aeb33f2d575fce9ad1abb7f4
 MISC metadata.xml 551 BLAKE2B 39647e4fca09d2f613785e350aed813dedb0fb109d718a2ab9b08f7d30d55eaeab4abcf3c58b1434ad239548c966aefac7ebcc3a13d50220ad4a2e59054a75d6 SHA512 a2d0283f5b3d97b6d942d865fa3433f007127dbc63e9479bdf06b8e33c8885dfe6c642cb1b1a8595164fa7fe9961ed44a8c8e70086d7b4dea2f75c1816bbf793
diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild b/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild
index 8c7cbf99b42f..859d250dd7f8 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild
@@ -49,6 +49,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	append-lfs-flags
+
 	local mycmakeargs=(
 		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
 		-DBUILD_TESTING="$(multilib_native_usex test)"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9b33ad970a30..2ec439cf4078 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index b36fb98fa1e8..81973eaa9bfc 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.9.3.tar.xz 1820640 BLAKE2B ea030328d88f583e88959e7536f4e3e086354befc40395700fac8314a1e7c3da7a2f9a614ff9ad98491d9ec4d8b24ead05a2214b94f55786a5e493c1a585056c SHA512 f40c7eaa186eb7d3163635286a8ad89bf6b29dce851b4fadc0814eec7759ed7fbac37e4596365bac4df93c5b655a7e943f8414e7c8f661b29aea7bde5367ed73
+DIST kid3-3.9.4.tar.xz 1834140 BLAKE2B 7a429b763bf4b0a275f9ba41dd0af314d564bcc8963093fefc10499e3e0e567d838515983b23cf9dfd5121adecce63b83d2179abca7904345d5b9f15a3c87aee SHA512 28fe76ab6101202445d419c1a8a1bc4dfe31c9924fb6d28203ff9c0d2926b20e3a10a5f8b10e9193ff889e93100ce8bc6663baa29cfdecd5ec9dfb3445489348
 EBUILD kid3-3.9.3.ebuild 2104 BLAKE2B 32bf7d2b2abca113d302d37c5da2545f9a50d803bf436d08547c08b2bdc191958e3ef1c827b864f37319a3732aeb5988b07e5f901cd5f801ab94caf10208aa2c SHA512 4c0a45d627f1859d912dbea12321bcdaa6a246bb391657c99725cf7366890503fbf6d449d6c7527416345f6caf920b159607f557bf068626ff52f7d45c13d92f
+EBUILD kid3-3.9.4.ebuild 2097 BLAKE2B 1c67248caa586f9b1ad574676913d38286f5fd4f0debfa83ae0f3d939a0e5eae5a6a82d5998a5a27e5fcea09208b1eb360195da76d5e8f477da98384d50926a5 SHA512 1194c68c7927747b56a493d78eb23d35d74acfe140d165ef24791f91360c40faf1af5875bdd2884f0c186ef8ebc8bf743ffee5b70e1392521d51f5ea28f13e2b
 MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
diff --git a/media-sound/kid3/kid3-3.9.4.ebuild b/media-sound/kid3/kid3-3.9.4.ebuild
new file mode 100644
index 000000000000..2bc1178b0bb1
--- /dev/null
+++ b/media-sound/kid3/kid3-3.9.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit cmake kde.org python-any-r1 xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:=
+	acoustid? (
+		media-libs/chromaprint:=
+		media-video/ffmpeg:=
+	)
+	flac? (
+		media-libs/flac:=[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+
+	sed -e "/^ *find_package.*QT NAMES/s/Qt6 //" \
+		-i CMakeLists.txt || die # ensure Qt5 build
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=OFF
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8eaa3581380c..a0ad160a23e4 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a99ee5814309..fd45113718f0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jul 2023 15:09:41 +0000
+Tue, 11 Jul 2023 21:09:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 127947e90727..c66d07128a18 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-07-11T15:09:44Z
+TIMESTAMP 2023-07-11T21:09:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmStcLhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmStxRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAEwA/9G7PtBh8lw21Bh04VqkHWmkULw3Q1a9KFwBLxydbN6AVrfDotbVxxHQDD
-hOlzRlO6hogioy8utIP+idOKpUjJIJXdUHVidp7+HArEoL/DHf/XeXEwUAaebMr5
-z0WgQOfr0rlX0sZQ/hlTVzJwiNnG8BdaCXqHv0atkDrYr2BavmY6Mhyedsg2vOd7
-x0XdMW+x1DVvB4wTTwmnMIhreHHgZjn9jhPiAoZuwe1gSkk8km5c1jeEAVtdRTIM
-r3UfnsOU6RqBFW/IKZ1sp6aRjBFq5og8uJlmAu17pvyqBQ6RHDRxT++K1GrZ2xOd
-30K3nzr2Ad/ZtF80n0/W6fy3dZCFSAnQOd+0bzEgRnQHV1OfbwmBp/oCDF6ykCB6
-luaVLXeISQS6XRtjW3AAjLflf/bsFDQKu03a9gTNcOSHKLiNkaBJbGHPhv2afmNW
-4hJ1cbF44rLvB3O74aeYxZTOBdwIBQXy6DVbYeRDjH60OkbimtqIbMoSB1Lle0aH
-E6rw5RxfSYTr93cYPGFVqTrzt6Abt5+ZcBTxMuHc2cMllo/fITt+amvtnKkrJfPQ
-KSWfVduSg8BJM96U7reRmrXF1YpgsHE2EaP/ldAawyYNjSsuIcqp7Bead4Ga3Key
-cFr+h5UsDbB563hRhDRQVSD5Gg30/LKPHP3KJaf0My2GLSebNlk=
-=xGfN
+klAKHQ//br+mBHI+cCvMXNZRja96rAGE8wxEZmVShZIKreG3l3XXyCxp6gPp2Sho
++w98IzbGwweJIXVYDswMrDMCgYO+iRgD0nGqPe2DA0JiLImJfR4wIt1oDeYk3CjU
+c2fKptsa/vf8hukoUA6Q0ArXLC/v+y8b97Ae48aoYASsBvjB642ha+4TBBCVLLsI
+G6ldhK5W0opv4kp9x8R7NyBjo0Y4/IoICMvYi7uKMqau9ZEsfTZDgYRV1keRplkJ
+ZjCxBxIwx8JdiZ92cFMm1G1Wt3J/Vpfjah/pzVb60jHnTC6mQVBx1zFQ+sPIHYdg
+JOGG3b6hWYpmLHJ0qzLDcYP2LaZAXCswah8gwOSK7c1iyWEVVPtlMwVkrWHd2vZd
+67RwkyCSXW+3hsBSNAPkRXOKU3GZtW/QNXC5W6+2WC3DgGi8mAw6rxSH/ospQQnd
+r69Fc+uZM1nwC7monVEF/OzHg5N3Bu4x1OY/sqxWxMFoVPC/6FLkrsK2/GaRGEgY
+tUX5x1GxG6D6Y1CHzayaBfGl9MmayVJiuXOM74ppsc5qmBBukDf9O7MZFtlwzFuS
+PbcLIC5KUDm/aBvd2+CxSGYR6Rx6nXfwAFlUe8op4EqsHwqqlLYtb2RhTXkM1pni
+c3VBhJG7tON6RacksmPohQ1GpprdFx+wvpQJG8jHlFiHZ/b1rhk=
+=FvDt
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a99ee5814309..fd45113718f0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jul 2023 15:09:41 +0000
+Tue, 11 Jul 2023 21:09:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cb1ac9dc8897..b369d77975d8 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index d4f317b71f8c..0104e865b1db 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/brotli-1.0.9-r6 b/metadata/md5-cache/app-arch/brotli-1.0.9-r6
new file mode 100644
index 000000000000..5382d57c2b62
--- /dev/null
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r6
@@ -0,0 +1,17 @@
+BDEPEND=python? ( >=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(-)?] 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(-)?] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) )
+DESCRIPTION=Generic-purpose lossless compression algorithm
+EAPI=8
+HOMEPAGE=https://github.com/google/brotli/
+INHERIT=cmake-multilib distutils-r1 flag-o-matic
+IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=MIT python? ( Apache-2.0 )
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e69e7775d0abc604a889819393e2a4d1
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index 79bf7f59f981..a21a6084f653 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -4,7 +4,7 @@ DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) pytho
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=8
 HOMEPAGE=https://github.com/google/brotli/
-INHERIT=cmake-multilib distutils-r1 git-r3
+INHERIT=cmake-multilib distutils-r1 flag-o-matic git-r3
 IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 LICENSE=MIT python? ( Apache-2.0 )
 PROPERTIES=live
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 pytho
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc404d841ef2015898daf4d1f4d33705
+_md5_=b606233c6c1cba857ce489c078a815ef
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ee273733abf3..b7a672c15592 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-2.5.0-r1 b/metadata/md5-cache/app-crypt/acme-2.5.0-r1
deleted file mode 100644
index 0b90c5ab90ce..000000000000
--- a/metadata/md5-cache/app-crypt/acme-2.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-23.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.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.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4: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=An implementation of the ACME protocol
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-23.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v2.5.0.tar.gz -> certbot-2.5.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e8003d342e7198efbd30ff8f1ba658f8
diff --git a/metadata/md5-cache/app-crypt/certbot-2.5.0 b/metadata/md5-cache/app-crypt/certbot-2.5.0
deleted file mode 100644
index e1f75a8c714d..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( >=app-crypt/acme-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4: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=Let’s Encrypt client to automate deployment of X.509 certificates
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=selinux doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v2.5.0.tar.gz -> certbot-2.5.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=418f8fad24b0ae295da4d35f79122bd6
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-2.5.0 b/metadata/md5-cache/app-crypt/certbot-apache-2.5.0
deleted file mode 100644
index e4009d538cc8..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[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.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4: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=Apache plugin for Certbot (Let’s Encrypt client)
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v2.5.0.tar.gz -> certbot-2.5.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=21542bd1e7f5078c1bddd85e5463e2d9
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-2.5.0-r1 b/metadata/md5-cache/app-crypt/certbot-nginx-2.5.0-r1
deleted file mode 100644
index cff61fe40992..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-2.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-23.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.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.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4: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=Nginx plugin for Certbot (Let’s Encrypt client)
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-23.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v2.5.0.tar.gz -> certbot-2.5.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=50062253f2858478cd24f613e474f20a
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c97d72d5782d..6d574839cc1c 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/atd-2.12.0 b/metadata/md5-cache/dev-ml/atd-2.12.0
new file mode 100644
index 000000000000..98a75aba08ce
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/atd-2.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.08:=[ocamlopt?] >=dev-ml/cmdliner-1.1.1:= >=dev-ml/yojson-2.0.2:= dev-ml/biniou:= dev-ml/easy-format:= dev-ml/menhir:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Static types for JSON APIs
+EAPI=8
+HOMEPAGE=https://github.com/ahrefs/atd/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08:=[ocamlopt?] >=dev-ml/cmdliner-1.1.1:= >=dev-ml/yojson-2.0.2:= dev-ml/biniou:= dev-ml/easy-format:= dev-ml/menhir:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/2.12.0
+SRC_URI=https://github.com/ahrefs/atd/archive/2.12.0.tar.gz -> atd-2.12.0.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=30da3903a1c08405615b8a8c855e0aaa
diff --git a/metadata/md5-cache/dev-ml/dune-3.9.1 b/metadata/md5-cache/dev-ml/dune-3.9.1
new file mode 100644
index 000000000000..24dc25fd9f51
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-3.9.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
+DESCRIPTION=A composable build system for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=multiprocessing elisp-common
+IUSE=emacs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
+RESTRICT=strip test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=elisp-common	dde4f515dde15603a26a3755438e9c78	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=a722245d691d8793435c53dfb0200c6b
diff --git a/metadata/md5-cache/dev-ml/dune-build-info-3.9.1 b/metadata/md5-cache/dev-ml/dune-build-info-3.9.1
new file mode 100644
index 000000000000..f60e7d8f613d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-build-info-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-ml/dune-3.5 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Embed locations informations inside executable and libraries
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/dune-3.5 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=816d8969be6d60355b46cabdb83c6acd
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-3.9.1 b/metadata/md5-cache/dev-ml/dune-configurator-3.9.1
new file mode 100644
index 000000000000..14e3f35bff0c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-configurator-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Helper library for gathering system configuration
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=fa5901cee25b3915bf8128fc8661546d
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.9.1 b/metadata/md5-cache/dev-ml/dune-private-libs-3.9.1
new file mode 100644
index 000000000000..ad2493c06a92
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.1:=[ocamlopt?] ~dev-ml/stdune-3.9.1:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Private libraries of Dune
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.1:=[ocamlopt?] ~dev-ml/stdune-3.9.1:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=4c9498458190eaeeae95329707d2571d
diff --git a/metadata/md5-cache/dev-ml/dune-site-3.9.1 b/metadata/md5-cache/dev-ml/dune-site-3.9.1
new file mode 100644
index 000000000000..7c3868c72f3c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-site-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=~dev-ml/dune-private-libs-3.9.1:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Embed locations informations inside executable and libraries
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-ml/dune-private-libs-3.9.1:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=beb7b8dac5f867df30853d7160e6481e
diff --git a/metadata/md5-cache/dev-ml/dyn-3.9.1 b/metadata/md5-cache/dev-ml/dyn-3.9.1
new file mode 100644
index 000000000000..ffbacc681fae
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dyn-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=~dev-ml/ordering-3.9.1:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Dynamic type
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-ml/ordering-3.9.1:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=511ed694c22c345f58ca5282be17d2df
diff --git a/metadata/md5-cache/dev-ml/ordering-3.9.1 b/metadata/md5-cache/dev-ml/ordering-3.9.1
new file mode 100644
index 000000000000..f0a20a10d294
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ordering-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Element ordering
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=7e0204472e648a15dcddf5197c060698
diff --git a/metadata/md5-cache/dev-ml/stdune-3.9.1 b/metadata/md5-cache/dev-ml/stdune-3.9.1
new file mode 100644
index 000000000000..c36fbc22aa82
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/stdune-3.9.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.1:=[ocamlopt?] ~dev-ml/ordering-3.9.1:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Dune's unstable standard library
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.1:=[ocamlopt?] ~dev-ml/ordering-3.9.1:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.9.1
+SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=c7c0debae68bed48faef4a88e6c550e9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index edea4280be41..34b1ab374d03 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/deepdiff-6.3.1 b/metadata/md5-cache/dev-python/deepdiff-6.3.1-r1
index f687e76f7064..6610318ce9b5 100644
--- a/metadata/md5-cache/dev-python/deepdiff-6.3.1
+++ b/metadata/md5-cache/dev-python/deepdiff-6.3.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=test? ( >=dev-python/pyyaml-6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.1.3[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.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4: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=test? ( >=dev-python/jsonpickle-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.23.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) )
+DEPEND=test? ( >=dev-python/jsonpickle-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.23.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) )
 DESCRIPTION=A library for comparing dictionaries, iterables, strings and other objects
 EAPI=8
 HOMEPAGE=https://github.com/seperman/deepdiff/ https://pypi.org/project/deepdiff/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/d/deepdiff/deepdiff-6.3.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=032038c83c202faec1c8b5f19ccd9f0e
+_md5_=882c0214cdce931e25122eeeb33aa8f1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f0f3b1be6194..2b4c9ad3a3d3 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/cmocka-1.1.5 b/metadata/md5-cache/dev-util/cmocka-1.1.5-r1
index add594aa6635..a67f05eef31f 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.5
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.5-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Unit testing framework for C
 EAPI=8
 HOMEPAGE=https://cmocka.org/
-INHERIT=cmake-multilib
+INHERIT=cmake-multilib flag-o-matic
 IUSE=doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=858fcd8215d6f8ce2ba168dfffa1a5a0
+_md5_=6c02c901f29633ba75b4ecd4380e1255
diff --git a/metadata/md5-cache/dev-util/meson-1.2.0_rc1 b/metadata/md5-cache/dev-util/meson-1.2.0_rc1
deleted file mode 100644
index 195816069e79..000000000000
--- a/metadata/md5-cache/dev-util/meson-1.2.0_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3: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
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=8
-HOMEPAGE=https://mesonbuild.com/
-INHERIT=pypi bash-completion-r1 distutils-r1 toolchain-funcs
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0
-RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3: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/m/meson/meson-1.2.0rc1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5c98fc14cfe15d91418327180e7df574
diff --git a/metadata/md5-cache/dev-util/meson-1.2.0_rc2 b/metadata/md5-cache/dev-util/meson-1.2.0_rc3
index e3b7e65d5458..0ed8b9fe3c3f 100644
--- a/metadata/md5-cache/dev-util/meson-1.2.0_rc2
+++ b/metadata/md5-cache/dev-util/meson-1.2.0_rc3
@@ -11,6 +11,6 @@ RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0
 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/m/meson/meson-1.2.0rc2.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/m/meson/meson-1.2.0rc3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
 _md5_=5c98fc14cfe15d91418327180e7df574
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 92729531d98f..68ead2ee0418 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.10.5 b/metadata/md5-cache/kde-misc/kdiff3-1.10.5
new file mode 100644
index 000000000000..c0825a238e91
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.10.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.106.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtprintsupport-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 dev-libs/boost dev-qt/qtcore:5
+DESCRIPTION=Frontend to diff3 based on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtprintsupport-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.10.5.tar.xz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	ecm	19519473dcf88ee9005d248652004e9b	flag-o-matic	ad475baa777c9978fa035216c8264a10	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=35ffa8c2d03a1d4daa7e2deba6b09910
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e8811aee7f16..15618115a833 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.5.0-r4 b/metadata/md5-cache/media-libs/openjpeg-2.5.0-r5
index 466344512a7b..cbca0627d815 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.5.0-r4
+++ b/metadata/md5-cache/media-libs/openjpeg-2.5.0-r5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.5.0.tar.gz -> openjpeg-2.5.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/1f3d093030f9a0b43353ec6b48500f65786ff57a.tar.gz -> openjpeg-data_20210926.tar.gz )
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9dfb1274e1d3de424f0b33fcd4428304
+_md5_=81e0f02c2d3aa76d141935f1c9512e1f
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 43df9fd73ff8..e42c8e6ea328 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/kid3-3.9.4 b/metadata/md5-cache/media-sound/kid3-3.9.4
new file mode 100644
index 000000000000..affbe80eb070
--- /dev/null
+++ b/metadata/md5-cache/media-sound/kid3-3.9.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) dev-qt/linguist-tools:5 kde? ( kde-frameworks/extra-cmake-modules:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:= acoustid? ( media-libs/chromaprint:= media-video/ffmpeg:= ) flac? ( media-libs/flac:=[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) test? ( dev-qt/qttest:5 )
+DESCRIPTION=Simple tag editor based on Qt
+EAPI=8
+HOMEPAGE=https://kid3.kde.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake kde.org python-any-r1 xdg
+IUSE=acoustid flac kde mp3 mp4 +mpris +taglib test vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:= acoustid? ( media-libs/chromaprint:= media-video/ffmpeg:= ) flac? ( media-libs/flac:=[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis )
+REQUIRED_USE=flac? ( vorbis )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kid3/3.9.4/kid3-3.9.4.tar.xz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0b12b261b30a34768bea25a1cfd8b45d
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 3a959818113b..f11d723972e9 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/geopy-2.3.0-r2 b/metadata/md5-cache/sci-geosciences/geopy-2.3.0-r2
new file mode 100644
index 000000000000..8664b7c53e80
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/geopy-2.3.0-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4: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=>=sci-geosciences/GeographicLib-1.51-r1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Python client for several popular geocoding web services
+EAPI=8
+HOMEPAGE=https://github.com/geopy/geopy
+INHERIT=distutils-r1
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=sci-geosciences/GeographicLib-1.51-r1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/geopy/geopy/archive/refs/tags/2.3.0.tar.gz -> geopy-2.3.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e1d2806f4c5dbbbb01acc2b98438013e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e3fe2c4d34ef..23c16953195e 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.9 b/metadata/md5-cache/sci-mathematics/fricas-1.3.9
index 144c0ca5b75c..bc62faafb830 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.9
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm test
 DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecls? ( dev-lisp/ecls:= ) !ecls? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) )
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
 EAPI=8
-HOMEPAGE=http://fricas.sourceforge.net/ https://github.com/fricas/fricas https://fricas.github.io/
+HOMEPAGE=https://fricas.sourceforge.net/ https://github.com/fricas/fricas https://fricas.github.io/
 INHERIT=elisp-common
 IUSE=sbcl cmucl gcl ecls clisp clozurecl X emacs gmp
 KEYWORDS=~amd64 ~x86
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecls? ( dev-lisp/ecls:= ) !ecls? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) )
 RESTRICT=strip
 SLOT=0
-SRC_URI=mirror://sourceforge/fricas/1.3.9/fricas-1.3.9.full.tar.bz2
+SRC_URI=mirror://sourceforge/fricas/1.3.9/fricas-1.3.9-full.tar.bz2
 _eclasses_=elisp-common	dde4f515dde15603a26a3755438e9c78
-_md5_=3cb6744774a23e140d00cf79c3e7c623
+_md5_=35812382b7d50c6b37f0f91cf9eb4f15
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index d56b0e8bf519..a9a62f77f45f 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.3.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.3.13
index 5784ea38ca29..c87b5b83be6c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.3.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.3.13
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.3.12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.3.12.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz
+SLOT=6.3.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.3.13.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 58453eaa4cc6..444b26f0d784 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-07-11T15:09:44Z
+TIMESTAMP 2023-07-11T21:09:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmStcLlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmStxRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCTOg/9ElDkNo8lAGTW7TnS3vkIZ4X+kaTXAZqHHrZFT1kCJHqULGQzoH6eKc8Q
-RRtIANuHk0K8ZQR6LNGcNU0IUwjiwCFmjGGf9stCqj7TDbcp4IeeLdSgZJKipgaq
-mAi3E3JsKgQGAjHdyM0SrzdGJYlWEOvIrvy9BzdxWtMY52nVV9Qgp1O+9BI1p0uM
-wv0e/gq71Jr/uxh3LUd/yduUHNsCaiDFMkCSPg9QHQpp+Xa2Tk1pjCSy3xKZrra3
-C8bQv6IqhWjAWwBpbYJnWF8jFKC3wPhEoFa8gS8TRnbl4cS62kKfplPahAXgBKyC
-bPZw1fmoq6OrOTofHNHkpH0Qf4+UWdKu/u1qzgtJ6jFpf3nGq9J9An69I3U7ZwXf
-lF5JrmKVnyZgqEs/DUUKpXWRyVXKXe7pNQK35PGlLJLViO9S1mWrG9o2lMkL6b8j
-N5gS+nMjf8jkgbvbWE9P7qd6V1fxcNeR3fwWSmYgxlu/sayQnoIKy5JPd3QbXHcJ
-RSpBKNnId3jvXOPMwWAOiUBlSc0hAxKFtvsDCuPo2FTunPEGnaRrApT9Fni0c95r
-2LaEPPopti5teNaCdblmlZUrIiSHFyF5PDeeM+NWP5K98SJlzvezA1bBRTPzOph8
-sCWl1iXQOpLf/Em+OQQzoG4IZf6J6Md6h/xrRpj632YZlmtRJic=
-=QPhQ
+klDtKw//QfShtg1cyDRiTg5BjUFhUVXvd/ld3DIRCpR8b3RowbsENtR2lrCQ2Ch9
++VFa8VYZ5rluwaoEv8VUjYVTyMWUAdocwfuGkGD2oibJIBIwn1+C37SeGNx0MX/9
+G999sE9wQJNmPC6YCaq6KKDG4IDhKSy51tS7jkJWsZ/3GSfe2dbK2rV41jKx4gec
+ZrJV6dQDK3jnsWSYJYrlW7S/wGfBtdS5vvULLujEfRvwUfKvntx07urXAdoSFdPY
+Ehn+BmW0gaJ2DyAn71tGVv6FLDb7cVr78jLnEgPsoVgY13xIv4NxeVLjCCf9NP30
+NrEoURCxmSxv2G6682xMz3cV9j/nNetWT/d+1EBdamUnaOlEu8uf9bOTwvUraXuK
+va2afIOVgBqA3AoQlqInUMANFvLaZq7FYelBZzv7GYR1XB0zLO8UIfHF1NsUAST+
+/Fth/5lq5/45A1r16iOVdc6ST6fw14AJZcXoTiEP5I0tLYsj4gNI3QDUT0571LD5
+Y3IqYu39AgN6c66szQeFPJXz/SgP8uMgCk6eIF8gSqTRLHfKeABiA+V3+x7j6UlD
+P9u6ypaCVNv7+5hL6k3JfBmQW7GvizRzrojoe9HjDnJtJjexElb8ZRX5hbVWr1Ih
+JeYSvTZH4LpKLV4wU/6+RefdUxaabUkQ8ATi2PRajQCiWxZ/Dgg=
+=3dyl
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a99ee5814309..fd45113718f0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jul 2023 15:09:41 +0000
+Tue, 11 Jul 2023 21:09:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 65178cc6f33d..2de1dc4eecd8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul 11 03:09:41 PM UTC 2023
+Tue Jul 11 09:09:42 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 646bfeed507e..d83f38680a65 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jul 2023 15:15:01 +0000
+Tue, 11 Jul 2023 21:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index bcaf72936122..9eafbc0886c3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d63a47ebb27364f491b10aae259d3a71ee1c310f 1689085918 2023-07-11T14:31:58+00:00
+f110ffd2f30010c8e24b5f8a5c06e5957dffd8d7 1689109390 2023-07-11T21:03:10+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c9689ae3a456..097a7b8a573a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1689088201 Tue 11 Jul 2023 03:10:01 PM UTC
+1689109801 Tue 11 Jul 2023 09:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a99ee5814309..fd45113718f0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jul 2023 15:09:41 +0000
+Tue, 11 Jul 2023 21:09:42 +0000
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 89f1cdcd35fc..88be087478eb 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geopy/Manifest b/sci-geosciences/geopy/Manifest
index ecaa25ec88bf..3f24a3ba8116 100644
--- a/sci-geosciences/geopy/Manifest
+++ b/sci-geosciences/geopy/Manifest
@@ -2,4 +2,5 @@ DIST geopy-2.2.0.tar.gz 289811 BLAKE2B f876a867a19e5178eba1fa6b7389159e820fc6a9c
 DIST geopy-2.3.0.tar.gz 290677 BLAKE2B 5bd981902e734d76289e628e92a14a550d92509a69585dea94c669256ed279655ed27d03752307c21c773f0364a8c62671d34c49fa889bc933ff021716062422 SHA512 ede61870f38ff2fb7c79f282b06711e6677f6054d082f3b0a1d9f5eace4e7597e65938fc7eebd2c31ceeb27e02de8d1e1a71d71bd66613b6d9185da5e4261a4f
 EBUILD geopy-2.2.0.ebuild 566 BLAKE2B aad5a81479acf78b9fe0e23a6948053521e1a5e7b5579fb0fe32bd3a78d8d620529c7996ab48371ff616a8ca1583ce232658852f6ccf1426e14c527c70127cbc SHA512 62d5f7bccc1f5a7e0f91386591192fa70e4ad7c2242ac0b68bcd7e65a10b7b43a430bf2c6d57112c05c7e39a64bf97702854acd759a6bfa9607d577f7b6a61e0
 EBUILD geopy-2.3.0-r1.ebuild 567 BLAKE2B 7cd002220ed3acae0f532817fdfedd279f4369400c4b285813f576f715ec58b7cfb31456a229e5bf2d2c96ee04614f7de1ff6c7e99700a024cda96b35a6a3ab2 SHA512 78a2e7bc4173d3c3145ce5f4de27b60695a307b640fa4f0b16a8ede59a83f57dcc85f5b3388e9e2e1704748cef94dba59c11ce20ec3a5ee017f891aecdb1f7a5
+EBUILD geopy-2.3.0-r2.ebuild 599 BLAKE2B 19c30c22017697e225cd8b58e20b6b74457853a108053541e7aac7f9c2f55f11781ff6d7a07419c64bde690bc3aea628580328fb245103b251cd7fa6fc98ea0f SHA512 0f7f8141685b8a8235f1dfab1e38ccf841f14e0e58092e12558863e89786fe4902f746796ca00e96389847aec2a05a3c18c6f70d7628d85e983e0d567dca8088
 MISC metadata.xml 634 BLAKE2B fbb38a6646d84c1c9849403f00ac08a6420bd1a6b691d836b97285cb9ab98d19bcc43250cfaeefcd51be32100571e21b77ab943454e9ecbe34a72d06b7b276ce SHA512 37a5779945ccf10eeba0f03131a66783e72363765549d56c26dce6272d267c6b61940beded8be930a1a503c76f8e23327c155ee4af4413870b9c59cef089856d
diff --git a/sci-geosciences/geopy/geopy-2.3.0-r2.ebuild b/sci-geosciences/geopy/geopy-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..33a688f525c5
--- /dev/null
+++ b/sci-geosciences/geopy/geopy-2.3.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python client for several popular geocoding web services"
+HOMEPAGE="https://github.com/geopy/geopy"
+SRC_URI="https://github.com/geopy/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+# Need geocoding service to test
+RESTRICT="test"
+
+RDEPEND=">=sci-geosciences/GeographicLib-1.51-r1[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 17081ef57729..fc0d8cf75c7d 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index ed6f4eeb28b0..8b35b5416db4 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,6 +1,6 @@
 AUX fricas-sbcl-2.3.2.patch 656 BLAKE2B 2b4e2ade98651f221461991464d70eb0e0ec3d534c0f9e0b98f790506acf94a2cc7eae9d8b20ab704c1dba156301b2703b9a5d1b78296f4f1eafa9d2cda091ea SHA512 e5134750092b4efd517311b1734d39cd4c2617e390d5228df7e393a2b95b1ccbd68119d5fb3e9322ddc6a346d5741ac41db8912306ea8b97960482fdb04c2c23
 DIST fricas-1.3.8-full.tar.bz2 10878913 BLAKE2B 214eecd430a2b758a10d985f512f3c79f6b12de35bc29e8f0a3fd296fe871b2e9a6b362060cbeec317dc355bd3c661fcab44087feeaa092fe6afcdebd0fb94a8 SHA512 330554f9dc36b47451195e3dee88fe26a80ab2bf9b6750d651cd53c5ba16b9c9736176936c7c69e699685be25aa62b6a099ed7340913e946a4f5e53579835dbb
-DIST fricas-1.3.9.full.tar.bz2 10949173 BLAKE2B c535d2a384fa55db53b6901d3ba5d1cc8eca35ccf67a2664f934da427a808b5adc7a5522b935f5dcff89795c0ca5816818d9cf37399b6f9bdc63cfe4d622a7c3 SHA512 9cfcb8bad52550a46216509154d5c06dac23625bc14d504a1febbea7ff771fd3172f91c2824df51375b8d85adc19959a5cbbfa2b77a0095ca37e8a4d4b8cc405
+DIST fricas-1.3.9-full.tar.bz2 10949173 BLAKE2B c535d2a384fa55db53b6901d3ba5d1cc8eca35ccf67a2664f934da427a808b5adc7a5522b935f5dcff89795c0ca5816818d9cf37399b6f9bdc63cfe4d622a7c3 SHA512 9cfcb8bad52550a46216509154d5c06dac23625bc14d504a1febbea7ff771fd3172f91c2824df51375b8d85adc19959a5cbbfa2b77a0095ca37e8a4d4b8cc405
 EBUILD fricas-1.3.8-r1.ebuild 2465 BLAKE2B fcaa6624015409bda2208852822991bd7bbf930604695a090f95c0c3c9d1a85d3b57722a7a2fb7474c0b3a3d5ce877ea1f653a50f7852698ebb568ac484a3170 SHA512 bf02a18f3fe11e72b60f2aff1b14144491efadb839f97b48456364a93acba616ea5e88b5d2542031d7e2db2f5c0ac6c6bf03812ce65e66272f1fbaf3ca4ab2f2
-EBUILD fricas-1.3.9.ebuild 2421 BLAKE2B dd12613e17a21fc97b01683bfd5b8cf73a6a46be784a3dd9d5c67d0c5054005c2459b3a10be800d0801835f462b209f5bf7aab87ab2b2b50fb78b32f34fc3091 SHA512 dbd6608ace1a241a3fd4cc104c847a8e652042cd321938b1dec02d2211d8cbd40535a78c3cd365371100732facb2c17cec46ba89f9b55e799a9b04ef7a984487
+EBUILD fricas-1.3.9.ebuild 2423 BLAKE2B 7819a17a916b8a4a4e7077cdd6f00b2e4d234c9d95ace955cab1cced1ed170492fcd0c79221be0ec833e3c7391455601cf61d387cbae07be7c91d2bf1a14511d SHA512 c653dcb6094082aae982d54d9d71f163aef8916b3af79fa3b471dde66b787292c0e98df3e0251419aadd9717a2366c9d9ee2fa4b21c1a521fa2bec727dbcb9f3
 MISC metadata.xml 1117 BLAKE2B 14376a1b8894543618dd6204b4cf28f8d24b175a9258484e14866f6ad6c60d2369830c49221d06c37c63c35b886b7ce2d04334510f1640c6e27809762dc10a19 SHA512 83c6155c3a2341d655621f308109840dfae3a758d4e157b517363744f5d08bb03de984ef675f923c9c74d4793ac14bd5427cce89c5a0f340431fc6040b582cdb
diff --git a/sci-mathematics/fricas/fricas-1.3.9.ebuild b/sci-mathematics/fricas/fricas-1.3.9.ebuild
index e3004457c1e1..7d21f5311d26 100644
--- a/sci-mathematics/fricas/fricas-1.3.9.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.9.ebuild
@@ -5,10 +5,11 @@ EAPI=8
 inherit elisp-common
 
 DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://fricas.sourceforge.net/
+HOMEPAGE="https://fricas.sourceforge.net/
 	https://github.com/fricas/fricas
 	https://fricas.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.full.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-full.tar.bz2"
+
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index fdd05d3de679..271c367e006b 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 8a47f4e9e779..ce3a37a9dbd5 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -12,7 +12,7 @@ DIST patch-5.10.186.xz 4834244 BLAKE2B b3d243b06b1b20d705d8554f30799cd9a901329f3
 DIST patch-5.15.120.xz 4331856 BLAKE2B 2e7584c86c374073b2ede9c8f89ed75d422ff374b8da01ef6d5e30d6fef562767fb03ae3ac76c5a8a88c658cda01c0f8fb9081286c1299680ddca15e5bc995b2 SHA512 c762422490b4e50db1bf4be303d818e1ebd8958dc43f7fea2da5d245bbf5da1bfdb5687c0fca342033209a108a31104762942824e3ee64b624b77ac53fb0dc3f
 DIST patch-5.4.249.xz 4933168 BLAKE2B caabb7456be35c5a7aec130b0f71e858325848bcbea5396f4d8808139d2cfae0d1d850e51d97d8a6af4f7d94881446663bf3dd5508793d741a2bc6dbb8e2e66b SHA512 23f670b48e0ce8fa579a0ff0ed31c6d2af44aa502acfba6449cb9508501e6f6119614109e177f2608465cdeaa8583e943ee2c7bba28bb63c63bdf4f3ff86c2f0
 DIST patch-6.1.38.xz 2539584 BLAKE2B 046382fa12b3a9f0920cf2481ffb73826207a11e7f88da16d4edd407cbbc188c1e6ee7017b72d1d7d7df28b41d66309e5a2307c3d4b9857bfe4304e3ae5bb284 SHA512 c19ba12c9401efcc17c535fd25e2949a483c9e6faaea584250d82ca5193a756c463d6b22c860da3d235c6597f5432e924be82a9517343ec7262a6080349b9234
-DIST patch-6.3.12.xz 745420 BLAKE2B ab98047f4a07a267f9dee0741815d6fcc4538ae83a0197ea0c9bc900f704124aec1037f24c3847847d304fc2b135ea9828c3fa9baa206b668af7438364bac193 SHA512 58ee3cede09e3c8b90b83cfbbcda774af0aa7de384afc027b084dd729a0370ed71c201ef80b3859785309393d093e60871c46e9cadec916442d867e55081d69d
+DIST patch-6.3.13.xz 862924 BLAKE2B a4d717950f3f3a835b318e589da68ae19c39617c81b65c5a736dc51c27141bfb8a2e8af27e7f7bde2f1595225afd21b540d37798d383a3f4dc734e021d74ba0e SHA512 64bb922b465ffbfb13ff62231bbac7ef96f92ca91cac300862b234d59a623b62f324370953fc88e5b7f67b3d992bedcbd12ce25d6864c97eb73de5ed81c8de4a
 DIST patch-6.4.3.xz 23644 BLAKE2B d3e63d5ca6249c3bb8999cf5115b44bab5e7adb2251b460c6328be711a31749ec39ebbc62a0d8b2ac33f844da593d680ae70a2d1c526750ea4466a218ffe6ac8 SHA512 50e72d91866dca5206796cb4fdfc96e344612213a0588aed419e302eadc6a9a232448b08e47ed03c0532baa7856eb90e6f856da90c36d9c7dd795f2b72e292eb
 EBUILD vanilla-sources-4.14.320.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-4.19.288.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
@@ -20,6 +20,6 @@ EBUILD vanilla-sources-5.10.186.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51
 EBUILD vanilla-sources-5.15.120.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.4.249.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-6.1.38.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
-EBUILD vanilla-sources-6.3.12.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.3.13.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 EBUILD vanilla-sources-6.4.3.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.3.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.3.13.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.3.12.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.3.13.ebuild