gentoo auto-resync : 28:01:2023 - 14:51:38

author: V3n3RiX <venerix@koprulu.sector> 2023-01-28 14:51:38 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-28 14:51:38 +0000
commit: d414c993cafd9e31a370c4a5aae042c710df2419 (patch)
tree: a4e123f32e84e3c7c7fdde2f083b1831f018bef6
parent: 21dbcce41990b13f301240313be05c8d013a9258 (diff)
335 files changed, 4045 insertions, 2188 deletions
diff --git a/Manifest b/Manifest
index 570d630e9f83..30109cfb1fd6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29454 BLAKE2B 94a8b8b501eb864a4a170a791ef342e67dfa8afad399145863e2aa1c93cc72bc049e1ec6276278fd8f3536100b9fc611722bfed4762a845cf293d55201b85a23 SHA512 a326f9d7be2f434a61e6155fa6049674955462e8d6533f731b1d3d4e29fab9df4fbc4b042d637190e289c166c4b8ce6d58ba11ea343f28fa670d2325bf41ae9b
-TIMESTAMP 2023-01-28T08:10:00Z
+MANIFEST Manifest.files.gz 29445 BLAKE2B c3b6c3fc97b00593713116f24aef1abc078759f791396de4f363a6169b791ec88782ca4adc0eee48cc8ad15037a989a7d364fa5667a0a8d65a4d9ed71fd3c512 SHA512 573145ada853921a46bb71076d817b826b00c8558fe17d593357bcc4d0c66d6bd72e1fff4457395859c75c37e15a3a1bf4413a2943cfd1985e12dd74d386fa1f
+TIMESTAMP 2023-01-28T14:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPU2FhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPVLLdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCJVw/+JdJQZY+PQr5zHgI8SCM6Osn4+NwWB56jxlkMo3ZKhmfdqfdDzJ2ZXatN
-heZHBlxUTPj/7qtCMY0Kmy/FslVNZEOoc5yD4S/WBguhP9kn09SLuznkbaYXEiIH
-4/6JKK7EUiujO9KtwJCqTNMDZfQESqRsw8osC6gogx8Nf/C6bFRy20m08KhKDxZJ
-0RWZ09Wx/sqIY/hRPKZ/Kr6oSA85G9Zh8OWiKxKj+bYy83hyw9iGuh6V1YyVToae
-RTIvYZjyKZpF/aAvhqqb2QyGSpKPKN/2BDAnPY4ra2oxEH5v8iye/9FoTS8Un/wt
-cpiuSnoVQ/BX34FpFlrrr2GVrS99RCR0WrOD/rF6SfsE9Sif1hYcPw1kEdLiHMbd
-jE/HlSUUnB5NzD/EM+Twn7OFKKogtXiZW23txKbFOAGXfr4L/fJ0g3Z0F3qTkvsz
-O7n9gxc0vq1NVMExy6M9x8TSabdAVU38brcUhQOGLRi0IPQSwLtkUo97y361T8IB
-8ljsD8mPwz6eYZTr6OBuegIDis+VLHWWQyH5v8iaVCNJmug0ZvfnAbtlOF9uN9c9
-v1i9pSv88RADxGfIAf1sbQ+4h760T/0ClZ5K8U2YROBWZiIQa01uy047F7x5MFI/
-IKgZdQqPFkN3Mi+qYUqfHXFPE6HRM4jugYLwL/LiNbElb6cOPd4=
-=pAo8
+klAU0BAAlwDQnbLfVPsaJX/kAGP1DDFv1XQN7fKly9Oy0uqOgQwlL5kISixucmGN
+RectFN5T4DuHV7xqmWDT/rjmb++Js7wvWJHUAnW2gfi4CsOQPDLdfxYs7J1Aat/d
+yyBiLRIz/N7QDdPQ+BpxYI5HYu5izLGZTPqtL6kC9LdNq+a2Vp2rFFvhAgmP486Y
+zeDmSRUp0+4jyQ6sXBuZGdhNWLNo90aurAs/oiiBpThMnpgtlZpdFzBhopwNUjHm
+M53cbDsoaHCCuh5yJecMmQDccwatPKQE/nIYT1mW54c9BNRrsbJDcWfq6ew+R5bc
+Y508YHoeDsjX8bR17gcS9piRu/jP3Da8GSmgqpejUJ/GMuZ4pSAynvw443HQ8IuL
+plRvKaH8+bMBjmfDLyX4vkd2FHytGTs30hg80WQ0PiAiX7P3DZCp6MXZmEY0qUqB
+qTX5ls2MFk5Wbpn0ffvR59tosq2aJYxqxPQFPnj38AkVurCweZzsKTKt6E4AMSi4
+EWtaaMTqmNv4tAs+ex0skH2rEwMH9ICwJdw9zto8NphuzSfI4Oe0Xxz8ExF3kIpI
+u5+0nQPk0CqIMovXwOmlaOzi7cObJQejQ0Zr9ToQAijQmCXG9EadY3Y97OJ8Gmrv
+jM+DXlXN9dSZ2etrQc06tWQh/rVLhzzdyAIX/fi+S61sCT2NCho=
+=PTP5
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d8c451a79eb7..b360151f5ccc 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 2cb53025a3f8..12d0af168cc0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index d24e9de7db32..7271cd6cbbf6 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
-DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53
 DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
-EBUILD retext-7.2.2.ebuild 1974 BLAKE2B 335ea5bffe099a924833814f7e1594f015137c4ae1ecf775eafbc846b0252e5f76910a430be1cd449cbcd5416019dc40446b0b03fccc420671e475ddca8f3ce0 SHA512 9f78988e1cf9fe087141ca65e6471b53faf73961aef73c62c96e6426188b68a736f19ea70731594cf0dcbb7bc6e6e19937b0369062849d93c3bd5e9b47b73313
+DIST ReText-8.0.0.tar.gz 492823 BLAKE2B ba80f01f1a40981220c0b3e16dd04bf551319a35c1a5c7f6d5e70135404537e74fa4625fe4c05c7ee54202de9ae16d181c110fcae9b9172761ca5ecf6400f7de SHA512 0f2480bcc8569cf60ebfe55847a2a068d1e5dd262a4ff212873bf58660ec31e9c37d9b21bdc66229d681c065a0d96b6ff11652e8d9a7c77841ea551480d1154c
 EBUILD retext-7.2.3.ebuild 2018 BLAKE2B 08ea81e9ceb305b49beaaa5a18962dcbc0731a90963d5c1882ea178e680c40197187fb5c01e656fd4e33d5d8f21e30befa2612725d55887957227772bfa89fdc SHA512 d65c72d7362b8dc516ea7762dd0cd148be655be5319c4f1d494a02578e77007732721e3dc6e5378c9e468e20f5e5c6f454ca25281a126ed03c2d7093251bac9a
-EBUILD retext-9999.ebuild 2020 BLAKE2B bac6292802ba863335c58999db676b12fd0a61e3377ef59e0560ae75bd407b63b16eb83a616c2f760ef661934c1ac6c7935a9c1f7c4bf22a500903f12f58c489 SHA512 b80bd4eb9fbb3ca533f58b4b2e4f69a620e592e88be8e20fce9a251282afbe448f83c313b93944324201fdaa13ddb0cc8ac7d86bc07a5a3006494dcb717224d2
-MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c
+EBUILD retext-8.0.0.ebuild 2023 BLAKE2B ac09433aa2b2713715f8d3add08730b81c9584a2416a2e7efe0ed004c21c00125c79bbd8db3a226aa3ff4ff7e193dce215b12954017464dafe42ad38bbeec772 SHA512 200b2dd4bfdfa20e3cb0676738e68085c08c7479086aba517b67fe4685a777ee5171733fffb89e70c60e404232cb222833c992d022c79ea331eb193a2d69269b
+EBUILD retext-9999.ebuild 2021 BLAKE2B fa3331f9f9c2e1f3747f1a4244675211a88f1a68f63f80ed01f263d08520c96912edb74dc235f0036a58901a5ea1ef3011a7739b3807a9c128ecf0370a0eb79f SHA512 d67040cdd57a25ce56ca67837a4029a8d6c1fd5f0d5d7ed11edbf4b31febda8ae78b4a8a65f80f69a76b78787fcdefe11d1da977ffe7e73b5a3e44ef073bbdb7
+MISC metadata.xml 535 BLAKE2B 94fbf92941c956601e9ec037a78919fcbddb572baa20f74c0daae31e438e44d214b57926cfa6d31eb176b8be72d2078e44686bada4a4794e130956c7d91b5865 SHA512 5ed97d1ed19c618b1246375d02860f96ce7f58aa759c467ae69e35d6b003cdac44f5c59f166ae6970e9a082e783550381b34540ad1ba03d661a3f3fde7d26dec
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index b1491bfcc579..469bc89b126c 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">retext-project/retext</remote-id>
 		<remote-id type="pypi">ReText</remote-id>
diff --git a/app-editors/retext/retext-7.2.2.ebuild b/app-editors/retext/retext-8.0.0.ebuild
index 6f565cd7558b..8ed93a38001b 100644
--- a/app-editors/retext/retext-7.2.2.ebuild
+++ b/app-editors/retext/retext-8.0.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please don't add pypy support before testing if it's actually supported. The
 # old compat matrix is no longer accessible as of 2021-02-13 but stated back
 # in 2020-07-05 that PyQt5 was explicitly not supported.
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit distutils-r1 optfeature virtualx xdg-utils
+inherit distutils-r1 optfeature qmake-utils virtualx xdg
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -23,7 +23,7 @@ else
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="amd64 ~riscv x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+"
@@ -37,34 +37,38 @@ RDEPEND="
 	>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-qt/linguist-tools
+	test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+pkg_setup() {
+	# Needed for lrelease
+	export PATH="$(qt5_get_bindir):${PATH}"
+}
 
 src_test() {
 	virtx distutils-r1_src_test
 }
 
 python_test() {
-	esetup.py test
+	virtx eunittest
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	optfeature "dictionary support" dev-python/pyenchant
 	# See https://bugs.gentoo.org/772197.
-	optfeature "rendering with webengine" dev-python/PyQtWebEngine
+	optfeature "rendering with webengine" dev-python/PyQt6-WebEngine
 
 	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
 	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
 	einfo "For more details take a look at:"
 	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 413cc5d08d66..cf7bf4d8be84 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -37,12 +37,12 @@ RDEPEND="
 	>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-qt/linguist-tools
-	test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )
+	test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] )
 "
 
 distutils_enable_tests unittest
@@ -57,7 +57,7 @@ src_test() {
 }
 
 python_test() {
-	eunittest || die
+	virtx eunittest
 }
 
 pkg_postinst() {
@@ -65,7 +65,7 @@ pkg_postinst() {
 
 	optfeature "dictionary support" dev-python/pyenchant
 	# See https://bugs.gentoo.org/772197.
-	optfeature "rendering with webengine" dev-python/PyQtWebEngine
+	optfeature "rendering with webengine" dev-python/PyQt6-WebEngine
 
 	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
 	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a83b7bd234c2..e9f71a670c22 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index 3548b61e78f3..57e7a8dc8c45 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -1,10 +1,7 @@
 AUX 50vterm-gentoo.el 213 BLAKE2B adb1452d0bf816beceec4367a33176034f90c46b1649178cce093160117d14c01d1ccebefa57bebbf276d01e812223876a766567fbbb95589851b51db2456db2 SHA512 2847b924a1e3218d433391396681642a88192396a60f25f5da6824a9546a0f155d068b1bfc2115f0698b87e07ca50845ebbdc0a71de2ff8203fdf14b7e43ef0d
-AUX vterm-0.0.1_pre20200713-dont-compile.patch 907 BLAKE2B fdfa5bfc294558ebbe428375c817387ffd2e8c560c66c597815469460997d2f58e4734ee81d0780421cf0d1b512a74ecaf7ffc0fb5ca4034083eaa0a5f38e309 SHA512 359bebd557cca3fd31479bf3596d2d06e6b451faf57a074c4bbbf17e956d62f87a6695055f72697200f00df7c664aca970de89af69cd5470fe4faa0ad0172a95
 AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28794f8b04b8f7e02e824373a75ba214c3ad213dc598f5390c22d3ad068fa2c8b041232664ff5170b08d21c8e9d60b8ea1eb3dae44a48 SHA512 8787887ec2d7c2ee09710ca8683bf90e3ab81d930288e66d74a926f3619f4bea2e37f1bdec0021192b85dc3dbcf778b4e4f5ad82805b35033b212cb43fcbe5e6
-DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0
 DIST vterm-0.0.1_pre20210618.tar.gz 58389 BLAKE2B 71221d470e01d647093e3a3af0c57b416ef23e81ff4d783d032613e19f1d467752fea0d242ea0f72092e3cdabbdb88ba15a840d9e4116cf5aa95d54a020efe0d SHA512 9e23eff1c9c5d2cc8e970bb4d9910b3e0258987d09b765ece188641ff5e2696e30d59a409f45253f243162b8e71c0ea301049ff37c93ffec1e1c25206ca9c5d2
 DIST vterm-0.0.2_p20221118.tar.gz 60288 BLAKE2B a86e2a79457eb02212402a3054bd867af38caf2c52e1d2fd21cbd7a665f2383909ef99fa6291c9e0a6d9841d65dfbda175937bf219ec7e1e8fb8bd1c5add300e SHA512 1825ef38afc2d4144611b81c49c64b5271bc58cd96f6d3bdc6869d2d9c7cc7785864621035e3e787f7c2c0634672806ba217f3c3d589dfc342d59bd5480f96a1
-EBUILD vterm-0.0.1_pre20200713.ebuild 972 BLAKE2B 13876ff1c427de41c5c0e529f7793fabc5850cec6a07551777815ca3d985d442c72cd8b429546397d073ab1987493e8bdffc0308290e99df285883b90af19db9 SHA512 01598b7b2515e3a082bc56676b5f448ce20f978e63c5896475b683715fd8a53a6b63b238c870ae0e3c92218c3049e93b2ec7da3074e04f88cd5739252bfa5773
 EBUILD vterm-0.0.1_pre20210618.ebuild 1242 BLAKE2B 9ccf5d930934d0b3fe78ef29c21ec51e2785ae9077b6d6f81d0f887b4c1eec87019ae1701b4c84021436bb6feea19b211574242ae7dddb5015a25449127e5637 SHA512 2a2c915c097b7f5eb2c4691dedfcf976dfbfd94d9540aeba5829db3c2f10852aa39f36550e84e825cb05e657e592fc19394a073d49a4ce5d7031b6ca41840d64
 EBUILD vterm-0.0.2_p20221118.ebuild 1387 BLAKE2B 2170bfb0df4e8c5bd23c23be18fe2297cd9c74871581fc0bca04fbee6c2f69f25f71d22bb617cc4505c5ed4df25a311eb24980a01796131e0eb94aa86a52ee0d SHA512 794fda5744e6738fb6bc060fcd8d20054f490623775f067e4a93c0858ced6b8a5c2831f11fba1b2196bf369c9b915a825b7058ac594d4111aa4af8ecd45515ab
 MISC metadata.xml 634 BLAKE2B 09ec6e8f2b00735c5fc3dbca525205b0b98a580feecfea36a1c2b435bfd6de2e4b5e85c47c07f4830da1b3ddc8793d06e4e6ec3a02e5df19c876e0251226f5c7 SHA512 09d9be89b4275192c5048eb3a7fc3729d6d4923861bc5ab075c8097e7bb1f6776649e82440e53b1d0236dc669a4580aa2da31da5cdc5994b59eabaffdeeedc61
diff --git a/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch b/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
deleted file mode 100644
index 6b08ae812360..000000000000
--- a/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Simply error out if the module is not found. Don't confuse the user
-with messages about compiling the module, which won't work outside of
-the package's source tree.
-
---- a/vterm.el
-+++ b/vterm.el
-@@ -121,14 +121,7 @@
-           (message "Compilation of `emacs-libvterm' module succeeded")
-         (error "Compilation of `emacs-libvterm' module failed!")))))
- 
--;; If the vterm-module is not compiled yet, compile it
--(unless (require 'vterm-module nil t)
--  (if (or vterm-always-compile-module
--            (y-or-n-p "Vterm needs `vterm-module' to work.  Compile it now? "))
--      (progn
--        (vterm-module-compile)
--        (require 'vterm-module))
--    (error "Vterm will not work until `vterm-module' is compiled!")))
-+(require 'vterm-module)
- 
- ;; Silence compiler warnings by informing it of what functions are defined
- (declare-function display-line-numbers-update-width "display-line-numbers")
diff --git a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
deleted file mode 100644
index b3df66ead641..000000000000
--- a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=26
-COMMIT="f41849c2c9c1899f22d1c3d4f871ec47c82627ce"
-
-inherit cmake elisp
-
-MY_PN="emacs-libvterm"
-DESCRIPTION="Fully-featured terminal emulator based on libvterm"
-HOMEPAGE="https://github.com/akermu/emacs-libvterm"
-SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="dev-libs/libvterm"
-RDEPEND="${DEPEND}
-	>=app-editors/emacs-26:*[dynamic-loading]"
-
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${P}-dont-compile.patch )
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( "-DUSE_SYSTEM_LIBVTERM=ON" )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	elisp_src_compile
-}
-
-src_install() {
-	elisp_src_install
-	elisp-modules-install ${PN} vterm-module.so
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 279972e7bb08..a36d7a45801d 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index e7385261bf27..914d4088df96 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,5 +1,5 @@
 DIST manpages-l10n-4.14.0.tar.bz2 102563001 BLAKE2B 500744ab21482e83e076543539dac58b16e2dfb1f4a0f38b9adfe933cc69a0d68534663e3bc07f053ad3580021b34150fe8a40e9ecd0d01b968f8570ca74b051 SHA512 335b7b34ed6135b5ceb53a75cee2f71198733df02ba8727d55863f2ceb4ae37c44636d78feca123f5d53ba07018af2ce51567c0605b242dcb441a0a56dcf9106
-DIST manpages-l10n-v4.12.1.tar.bz2 90676890 BLAKE2B 7f261407007971063abc34f1154f5ab7d5a268dd21c76185f47cfbd73a1091950a3dc7bf0d4ad6bac56259fecbc1524b35b42316a1c2103f426ed936e203607d SHA512 42f5c61591959a0d804c215a9baddd6a182b30aedf5f6d6899f621cc8da9936fc10a1353aad5027eb4177f391f9708cc3018333256444433e937d37d8cdd3067
-EBUILD man-pages-l10n-4.12.1-r2.ebuild 2112 BLAKE2B 8ab78f455497c8761f70a55987bfc1ec80db54b20b29d3b782fb02dbe5addeaccc14531822e8088cb20d532d0d15e7eb1c333d7f812a1701495e2ad92c956ed7 SHA512 a4216b00dc86e76b790a80136edfc704ccbe935fc03dc2aca8059fbe894371f845520da8e921bfdb088730c8a88e0bc90efced57c3796a0d71fd47c23ffd28b8
+DIST manpages-l10n-4.17.0.tar.bz2 108073280 BLAKE2B 4604b0c406cf16bb87ef5b7d1f43868b0ecfa085cfdfd6717e2156bd953ead0fa33d6960b78cd9e98a8e8c448c7c01bc669b91b04b3a11cc58c52c2963812f86 SHA512 e53fb8198bdf9ca2380c5cc487b2864b361011d3293202245fed4af1644563e478428547cd7c307be2556d0aeb88f7fad8ecaa34e837326319d4adb554473372
 EBUILD man-pages-l10n-4.14.0-r1.ebuild 1758 BLAKE2B fa36fff87ba8946f2fa54d3372084145074ca90f7cc88227b16e756d7517bc9093928aa69a98ff56eb5dff0974ab638edce53ce2c954382ed3acc9ecb53e020f SHA512 c145dc8e1e648b74052cb2c93e85482656d6749e387bfe29c4a0aa91681e33b0d584edd2dc81b96ee8ab0afbc886e405496d50fcb7289eb34c70dcb736766bb0
+EBUILD man-pages-l10n-4.17.0.ebuild 1806 BLAKE2B e3dfcb1edb229849726ef88fac44b65d355bc2954f8b6597269c2306c1d098c2d29474576c3f773d00f338d3c741799d883042854b18a79bd35fa3c3668fb412 SHA512 d091edfb0f010b1c1ce6c195035cd04cfc2b1ddd61738d26bf7405ec1478a0123c32b8bce8dce0cfe9638d49df44d6b82bf723a6c4386b4fac250b7409bd203c
 MISC metadata.xml 236 BLAKE2B 4573b45e3f887eefa853dc47285138b1804285f5fca6cbc79cc9a475d19d9fe653ae5be35dfa9e8b04e5cf8e0de0ad4c58c8ec1b0c013213a01c13e7cbec2394 SHA512 3c9ef4b64af9b84abb15d7e0d315767d85a0ddb001471e4e8f0108ba4381fcf4bf3d7474929813e0da27d068e75b1bae56fdaadbb701d4f5f8a768e25c1b882b
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild
deleted file mode 100644
index ac1e949bfd3d..000000000000
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN/-}-v${PV}"
-DESCRIPTION="A somewhat comprehensive collection of man page translations"
-HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
-SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv)
-IUSE="${MY_L10N[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
-
-RDEPEND="virtual/man
-	l10n_de? ( !app-i18n/man-pages-de )
-	l10n_fr? ( !app-i18n/man-pages-fr )
-	l10n_it? ( !app-i18n/man-pages-it )
-	l10n_nl? ( !app-i18n/man-pages-nl )
-	l10n_pl? ( !app-i18n/man-pages-pl )"
-
-BDEPEND="app-text/po4a
-	dev-lang/perl"
-
-DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md README.md)
-
-src_prepare() {
-	default
-	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
-
-	# some packages have their own translations
-	local noinst_manpages=(
-		# app-arch/xz-utils
-		de/xz.1
-		de/xzdec.1
-		de/xzdiff.1
-		de/xzgrep.1
-		de/xzless.1
-		de/xzmore.1
-		# sys-apps/shadow
-		{cs,de,es,hu,nl,pl}/groups.1
-		de/su.1
-		# sys-apps/sysvinit
-		de/last.1
-		de/mesg.1
-		de/mountpoint.1
-		de/utmpdump.1
-		de/wall.1
-		{de,es,fr,pl}/initscript.5
-		{de,es,fr,pl}/inittab.5
-		fr/bootlogd.8
-		de/halt.8
-		{de,es,fr,pl}/init.8
-		{fr,pl}/killall5.8
-		{fr,pl}/pidof.8
-		de/runlevel.8
-		de/sulogin.8
-		# sys-process/procps
-		{de,fr,pl}/free.1
-		{de,fr}/pgrep.1
-		{de,fr}/pmap.1
-		{de,fr,pl}/ps.1
-		{de,fr}/pwdx.1
-		{de,fr}/tload.1
-		{de,fr,pl}/uptime.1
-		{de,fr}/sysctl.conf.5
-		{de,fr}/sysctl.8
-		{de,fr}/vmstat.8
-		# sys-process/psmisc
-		{de,nl,pl}/fuser.1
-		{de,pl}/killall.1
-		de/peekfd.1
-		de/prtstat.1
-		de/pslog.1
-		{de,pl}/pstree.1
-	)
-	printf '%s\n' "${noinst_manpages[@]}" \
-		| sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
-	assert
-}
-
-src_configure() {
-	econf --enable-compression=none
-}
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild
new file mode 100644
index 000000000000..26437923cc43
--- /dev/null
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A somewhat comprehensive collection of man page translations"
+HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/${PN/-}/-/archive/${PV}/${P/-}.tar.bz2"
+S="${WORKDIR}/${P/-}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro ru sr sv uk vi)
+IUSE="${MY_L10N[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
+
+RDEPEND="virtual/man
+	l10n_de? ( !app-i18n/man-pages-de )
+	l10n_fr? ( !app-i18n/man-pages-fr )
+	l10n_it? ( !app-i18n/man-pages-it )
+	l10n_nl? ( !app-i18n/man-pages-nl )
+	l10n_pl? ( !app-i18n/man-pages-pl )
+	l10n_ru? ( !app-i18n/man-pages-ru )"
+
+BDEPEND="app-text/po4a
+	dev-lang/perl"
+
+DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md COPYRIGHT.md README.md)
+
+src_prepare() {
+	default
+	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
+
+	# some packages have their own translations
+	local f noinst_manpages=(
+		# app-arch/xz-utils
+		xz.1
+		xzdec.1
+		xzdiff.1
+		xzgrep.1
+		xzless.1
+		xzmore.1
+		# sys-apps/shadow
+		groups.1
+		su.1
+		# sys-apps/sysvinit
+		last.1
+		mesg.1
+		mountpoint.1
+		utmpdump.1
+		wall.1
+		halt.8
+		killall5.8
+		runlevel.8
+		sulogin.8
+		# sys-process/procps
+		free.1
+		pgrep.1
+		pmap.1
+		ps.1
+		pwdx.1
+		tload.1
+		uptime.1
+		sysctl.conf.5
+		sysctl.8
+		vmstat.8
+		# sys-process/psmisc
+		fuser.1
+		killall.1
+		peekfd.1
+		prtstat.1
+		pslog.1
+		pstree.1
+	)
+
+	for f in "${noinst_manpages[@]}"; do
+		rm po/*/"man${f##*.}/${f}.po" || die
+	done
+}
+
+src_configure() {
+	econf --enable-compression=none
+}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 7f462fb35fa9..d4ec5a861fa4 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/recastnavigation/Manifest b/dev-games/recastnavigation/Manifest
index 9e13f8a89ef6..98549b037c07 100644
--- a/dev-games/recastnavigation/Manifest
+++ b/dev-games/recastnavigation/Manifest
@@ -1,6 +1,4 @@
 AUX recastnavigation-1.5.1_p20230102-catch.patch 370 BLAKE2B f8f58742fe01770b432741cd593fc057b42e293494ab08efd5a93ab7220e2a18bd52e9965fcc23f301abebf58f89a858e8d541d894c07625751c71349cb25bf4 SHA512 7a052928b13fb09415dff6333a7bff0cd2fe8c93b7ef1383ec36e2d4a7d25f226a2ecbfa7400755c95f75dd463f64dcda4a2fd8b991732e4bd3975a11bbe1d0e
-DIST recastnavigation-1.5.1_p20210305.tar.gz 1542880 BLAKE2B f1066a48c7269fe67deba17768187522db9c0ece11293a3ff54311a6400cd38f32340985729bb38109bc1262099b44b7bf92974dfeb80c47953e58e6eeab73ea SHA512 7c3a8ce3e38de81eeb31332584896af9f234826c7f7f831eccb36972746c8b528ffde7ae4ee0d25baf814ece030a4b029101e07ea89aacc33c6d44f1ae2cf265
 DIST recastnavigation-1.5.1_p20230102.tar.gz 1276864 BLAKE2B 0958fd76c1855dee0d4d4ee8b0e31cfac3c1bdee1f5f767c4dec0bec75b3c919760d9201ba27d772602200e9416e08955b7ef326603ec21fb9594f2d40c079bc SHA512 4820e473735b08920bca7032851b258e8748c093bae331b11c0c9f630e9973264d9ca6277f7d92818b0a8c0864ce2601f129b708ec7976c9baead88d7b844f76
-EBUILD recastnavigation-1.5.1_p20210305.ebuild 883 BLAKE2B 923a020bf25470dc0255f54ec3d94d9377770a6f6a980c83fa052ba2cb6a0d66cbaad9776b162b4259ebd3f36a3b09c09fba1bc9900d0fc3bd7cdb35c81b24d6 SHA512 042ff545ad90fde39182ee24cd99852b2a71ff800fc780d6ecb269a2b872b4354f6bfb8286b190987cbf13336aa9fe567291817e45688845ca0e8e186436ed5a
 EBUILD recastnavigation-1.5.1_p20230102.ebuild 961 BLAKE2B 67762fbdc910e5a45da7cd553d4237f1639599c91fc739bd4ca636ee7d1fe92d2d122efcc61204f0e78c22d5710388d09ea585341fe5ae4d2b196d7027c76819 SHA512 d478677ca1b01d0cceab08b6dba664fd574a3291c2242ad0fdeae1064e815ce1cd2d3fe397c1c59904d9fe505207d69eb27406b25cd0f4b5922592e2fbd1e548
 MISC metadata.xml 518 BLAKE2B fba57dea48cf34834a98d45b6562b2a736357e0cde55c389a6d77c843eacfd11afea73f0e11d34997f4f8c7476f8c4c1bf3b73b287462e104eb9bd98ae152573 SHA512 5c75aea0977d0f4f2c1bea36a17ed12531d6537f6b4d597928eed3ac244a02ad17bbe07f45dbc43a737b32bcdfbf91cfa035fcff1e5231cb987802a11aed9bae
diff --git a/dev-games/recastnavigation/recastnavigation-1.5.1_p20210305.ebuild b/dev-games/recastnavigation/recastnavigation-1.5.1_p20210305.ebuild
deleted file mode 100644
index 7f703bf0120d..000000000000
--- a/dev-games/recastnavigation/recastnavigation-1.5.1_p20210305.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Navigation mesh construction toolset for games"
-HOMEPAGE="https://github.com/recastnavigation/recastnavigation"
-MY_COMMIT="c5cbd53024c8a9d8d097a4371215e3342d2fdc87"
-SRC_URI="https://github.com/recastnavigation/recastnavigation/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="ZLIB"
-SLOT="0/1.5.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/catch )"
-
-src_prepare() {
-	rm Tests/catch.hpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-cppflags "-I${ESYSROOT}/usr/include/catch2"
-
-	local mycmakeargs=(
-		-DRECASTNAVIGATION_DEMO=OFF
-		-DRECASTNAVIGATION_EXAMPLES=OFF
-		-DRECASTNAVIGATION_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index acc954f441e3..7fc2ce0f4409 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest
index 94b284b19a4b..02cbd7928a9e 100644
--- a/dev-java/java-dep-check/Manifest
+++ b/dev-java/java-dep-check/Manifest
@@ -1,3 +1,4 @@
 AUX Main-0.5.java 14974 BLAKE2B c8cab47bca61f5c792d214f817768ed9455bb31f407ea5259e760ee8e66c6ab7cd811079bd8d1764fbf0c70da4aad1d9ab5500385c3894292b6e8e8e51c54e6f SHA512 3111783b22e01b357bae675fabd9af86536d4db82cc7dad1f4dac4c3a64efd84f3b6f35e5b5698dafc696d3ecde49589bcb167967130004e3fd1716db9d868f6
+EBUILD java-dep-check-0.5-r1.ebuild 569 BLAKE2B 2b9933f75e44676a3d49678a52704bd31db8c255337f3eb3ec351649a71ced0b9c0bd351cfb078d08f416d3e3551aeaed6d6c49909b1020019d34425ffbb3518 SHA512 ed18e8786b7c94b86b852c1bd21cb6ee921cedb85603f81d60e44c7a57a0c1b712b69e9a710e98e6519e95c49458472e9cc0b28da0691084c46e9a1363612ffe
 EBUILD java-dep-check-0.5.ebuild 647 BLAKE2B 58800f4548bd8ab3c08f2048262107bd1e4814272bb5a4bd02e1f1b635ea342dc08056a65b1c1f11e02b57651ca919445d4b40791cbabcf31960c5b30b5d8490 SHA512 ce2333b6507ad80c1a6103ead8a5c684b2d90696199a9ae1449d939136b9c7607a7569f929bb6531fa72b6426d840d018c4b2baf805df9d3d98e76a5149e6499
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild
new file mode 100644
index 000000000000..0678a35a78ae
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:1
+	dev-java/asm:9"
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+JAVA_MAIN_CLASS="javadepchecker.Main"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fa2bffbe86bb..3dbe38f45e29 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index ca6381751c4f..df3bd694a1c4 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -1,9 +1,4 @@
-AUX crc32c-1.0.6-fix-big-endian.patch 1743 BLAKE2B c4da7347ca01507c92c4ea587afb24322a09faba43b60b3c80a5fa9e9c9a4311aff2bcfd25f0afd85e3444cbceb6b4339b930be7122b315191c07f0866332f39 SHA512 442f333f9ec0e57a4dbab3a7e31028adec4d201c945000cc2ad8e3d8f7cfd94a0295a885d7e25ccd7e56eb30d38568c6f3b145138e64e3b332bf311da02e32b4
 AUX crc32c-1.1.1-system-testdeps.patch 755 BLAKE2B 5eedd88abddcb93e33dd4dd37b442608921dd6d015fd0909a789bbc6b36301dfdb0de7c6a9cb7c804db82ca6dad5efe1359406bccdaf24019ab33b9789b4bad1 SHA512 110425199b18dfd4265315fcdc78cb876b18c2abbaf796c1ef6fb035b8e901a159bd38a84efd51112b932f3c93525c95963406c43f9796827dcbe5e70ea967ac
-DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
-DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc15ce18070cdcdb12fd9b67f7ec732a53d8af7dc4b77add859bf64c4fa8bc52a593830de931a7bd12c60498cc SHA512 c276160ec960a38cd535c998336472694819bc6eb37beb711bd43a31441d1808c8a14d3a1f0eccc780785b19f739a4a51f923867a20b0707c465e0cc03f457e9
 DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
-EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
-EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
 EBUILD crc32c-1.1.2-r1.ebuild 856 BLAKE2B 727ca6f288f2cf114b4ae825e20ca4886a15265c8adabf3e3b7bc5d741c4c9d93540358e49700c4761a2db7a088078425e7461b4fccdf3747c7332185028efbf SHA512 6dffb253127acb0614bb45952c92ab9023d49b53c0939b10d4670b217f3c51d75a469a16b7b7ebee99d4b8a0148934d870e909ee7c62e3a655dcb91c91ee2468
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild b/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
deleted file mode 100644
index 53b6e710e340..000000000000
--- a/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
-HOMEPAGE="https://github.com/google/crc32c"
-SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-big-endian.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	sed -e '/-Werror/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCRC32C_BUILD_TESTS=OFF
-		-DCRC32C_BUILD_BENCHMARKS=OFF
-		-DCRC32C_USE_GLOG=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/crc32c/crc32c-1.1.1.ebuild b/dev-libs/crc32c/crc32c-1.1.1.ebuild
deleted file mode 100644
index 0086632b41ee..000000000000
--- a/dev-libs/crc32c/crc32c-1.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
-HOMEPAGE="https://github.com/google/crc32c"
-SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.6-fix-big-endian.patch"
-	"${FILESDIR}/${PN}-1.1.1-system-testdeps.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	sed -e '/-Werror/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCRC32C_BUILD_TESTS=$(usex test)
-		-DCRC32C_BUILD_BENCHMARKS=OFF
-		-DCRC32C_USE_GLOG=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch b/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
deleted file mode 100644
index 3bd09930946a..000000000000
--- a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Pieter Wuille <github-sipa@wuille.net>
-Date: Thu, 18 Jun 2020 21:05:38 -0700
-Subject: [PATCH] Fix (unused) ReadUint64LE for BE machines (#41)
-
---- a/src/crc32c_read_le.h
-+++ b/src/crc32c_read_le.h
-@@ -30,14 +30,14 @@ inline uint32_t ReadUint32LE(const uint8_t* buffer) {
- // Reads a little-endian 64-bit integer from a 64-bit-aligned buffer.
- inline uint64_t ReadUint64LE(const uint8_t* buffer) {
- #if BYTE_ORDER_BIG_ENDIAN
--  return ((static_cast<uint32_t>(static_cast<uint8_t>(buffer[0]))) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[1])) << 8) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[2])) << 16) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[3])) << 24) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[4])) << 32) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[5])) << 40) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[6])) << 48) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[7])) << 56));
-+  return ((static_cast<uint64_t>(static_cast<uint8_t>(buffer[0]))) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[1])) << 8) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[2])) << 16) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[3])) << 24) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[4])) << 32) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[5])) << 40) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[6])) << 48) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[7])) << 56));
- #else   // !BYTE_ORDER_BIG_ENDIAN
-   uint64_t result;
-   // This should be optimized to a single instruction.
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 54f732c989be..083a34a9ff38 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,5 +5,5 @@ DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc3
 DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7
 EBUILD libpcre2-10.40-r1.ebuild 2967 BLAKE2B 0c087143613d9e99ab1af30739b9cd8c27e1f9c574e4095cc4bf8493dcb28b0c5c9fb3e5d8c489c1a15808f1be29bb5442489c4d230a902dab67e5586f7af993 SHA512 ff546db5cbf866d3d2a15982e1b7dee4a2d00ac815cb5125911d726969482d31360895a943fb66b7ba4e79d500d00d4e47942a341a05e21f22d166a89b92bf40
-EBUILD libpcre2-10.42.ebuild 2515 BLAKE2B 29c32b28adaf9832a43c1ccab2cb03b538918946b3490d2d9cb61d7cae50010c3549448cb1e44cbb22709ee448afcd6625f5947ce981256dc9911d4a09345624 SHA512 0282dab3f9e281130f412937d081f51f50baee163f174faa8c7d54db7a7115fde9c0beadfa66e9f50193c985d7e760b92236bef5bfb1354efd8cd20d84e4ab0d
+EBUILD libpcre2-10.42.ebuild 2514 BLAKE2B 8b327486764475faf776e60d80ba102fb2a3144d0efe36a71efdf22f9b59f68a0252826e445a307a28e1bbb69c1206628beaa063043771d57706b52b961a702a SHA512 afa9d502441cf3c16df65e63f63d1fe0930490fc8071351822ee91866b0b01acc41cf25be06d0fdae686b495db93900c25567839d5b237b9b45dd7fe61016cc9
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.42.ebuild b/dev-libs/libpcre2/libpcre2-10.42.ebuild
index a4fe2829c736..b6d46c3e715f 100644
--- a/dev-libs/libpcre2/libpcre2-10.42.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.42.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 490c283d6901..d976fd1bbedf 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -10,4 +10,5 @@ AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21
 DIST tre-0.8.0_p20210321.tar.gz 146294 BLAKE2B d740bd0e99f50f5e4d8105f5260e43a81b6af9857a21e386e437ab8d48a9e0de23eae03e96cf6b9f4d2d37f72d0fa73ef7343086271ea80f166bdba3f04475a9 SHA512 950c81f681970fc737cfdd6815445f05a018fc742b964cea3ce19f0249c677dd715ece4ff8e543fa9f3fd23b503eafa00aea00dbae063af9bc7e08dc1bc33aed
 EBUILD tre-0.8.0_p20210321-r1.ebuild 2403 BLAKE2B 0b631a238be1ec442760034fa209fc62754a68493bd4585a802be19dcfdb8546b7ab64743f15beb385c376271748442ad76c37f223062f13961738a1559783d2 SHA512 742e71d0677c0d285820cb26ede67c9adb8160dbd533b333c90686c1cf611547cc36fe094686d904125e2f2cf0ec1510a32e8e3ab3fa8226ba696b3c608a60a2
 EBUILD tre-0.8.0_p20210321-r2.ebuild 2182 BLAKE2B d063a1f9a818cf46cfe75d667ef2a4d4ac3258d771c5bee78d800f9b4be2b3a07fc0fc3ee51db9b9571ec2e3fab7373a4d501b83bfd1c9d53efd92d44f5e4932 SHA512 5987d873b55c4cb92c09789c9a93301e779857853fb35ce247b19c2f6d870e1ea4633de2863ecbc12c62d9fa66e3e165fad402c8878ad7e79d2f68e4eaca1edd
+EBUILD tre-0.8.0_p20210321-r3.ebuild 2233 BLAKE2B 8de6a6e8bf87d1cc57993efb222894063cdbe93a535258c5a8511eb581364feaaecdaef95471f94c3ef9e454e6d9af5abf9f1d1def594325605d200afbe5bb25 SHA512 b11d930f9cd27892be431b7797451bb1a486bacdf4b056f23a1b38b24b7e9e0a860e357ba398ca906b5bf9a559d384bbe58037161a0d175952be7f35783b5cf2
 MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
new file mode 100644
index 000000000000..98e45554992d
--- /dev/null
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+COMMIT="6092368aabdd0dbb0fbceb2766a37b98e0ff6911"
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1
+
+DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
+HOMEPAGE="
+	https://laurikari.net/tre/
+	https://github.com/laurikari/tre
+"
+SRC_URI="https://github.com/laurikari/tre/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+agrep +alloca +approx debug nls profile python"
+
+RDEPEND="
+	agrep? (
+		!app-text/agrep
+		!dev-ruby/amatch
+		!app-misc/glimpse
+	)
+	python?	( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="
+	python? ( ${DISTUTILS_DEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	agrep? ( approx )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/0.8.0-pkgcfg.patch"
+	"${FILESDIR}/0.8.0-CVE-2016-8559.patch"
+	"${FILESDIR}/${PN}-chicken.patch"
+	"${FILESDIR}/${PN}-issue37.patch"
+	"${FILESDIR}/${PN}-issue50.patch"
+	"${FILESDIR}/${PN}-issue55-part1.patch"
+	"${FILESDIR}/${PN}-issue55-part2.patch"
+	"${FILESDIR}/${PN}-python3.patch"
+	"${FILESDIR}/${PN}-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-system-abi
+		--enable-multibyte
+		--enable-wchar
+		$(use_enable agrep)
+		$(use_enable approx)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable profile)
+		$(use_with alloca)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	if locale -a | grep -iq en_US.iso88591; then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.ISO-8859-1 is installed."
+		die "en_US.ISO-8859-1 locale is missing"
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	local HTML_DOCS=( doc/*.{css,html} )
+
+	default
+
+	use python && distutils-r1_src_install
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 825373f7c856..47e7e067e45e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 9c209a2a794b..c3464e33c09b 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -3,8 +3,10 @@ DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237
 DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d6a0d346de49fcbc01ef16fe3c33e664486de4cb2d09f74e853e39b9a01778e7e0f489497fdd34fc9582d895a0d3b SHA512 fd98e79d5b3bb935b2a4077a07894c159b48e142268c2e30ebff2cbfecc92266b454be69f5080b315eefa9184372e5e5248bd8a3b2b9d6cad59e2d517c94bd02
 DIST ppx_expect-0.14.2.tar.gz 45703 BLAKE2B cd1371f6e7e0519c1b30c6d471a1f4be6cbeffa0bf65de1472c9809265c35c307cd36ebb12548f60ab2acb6e9786556f29ae4752ee5cfbfa19fdc2dc14f16aa6 SHA512 bb00e15057ea403241781d2d6a385200496adc79680a01d031416192f8c93efd75a6998602a90d0aba7fcb2110e876b058126bb6397d5ba7fe5dd48c03202169
 DIST ppx_expect-0.15.0.tar.gz 48825 BLAKE2B 9363497cc5a507d4f9c51be11a3fef254cbd2541c146a1248755763bed6f54a69738ed72ac590e270856b9c04a5949c9bbd59ba25bc8e7d1fc9d76574bcc70c3 SHA512 945ebd31a94debd4a65c3a8dd7e6481e7debe043c48a60bab4085f9d05cba5b8663bf0f5498cb4cd0e86a24182b21006506f20873e5242b31db5de5629113ade
+DIST ppx_expect-0.15.1.tar.gz 48800 BLAKE2B de36b8eafb1393c6489f60d91a4eb0da15e0108db7b56536011cb4e0e7fd2168ab97d76256920d40bcf39283435b19b69afe17204a3ecca615ced9c3482e974a SHA512 483c320dcfa628a1140d727e63fe4c5e2b298d9c58ab9975f8b3b5fcfbb3348f04a901d8b4a8d8288b14959fddbf2578a8b48de7352e4ce90439e26a27026780
 EBUILD ppx_expect-0.14.0.ebuild 819 BLAKE2B 4eb0953a127a11b3f821ec9467a03e724bbefd68eb7f35bfdeb775138249678984b5b67e62d9bfb59df33e22e1d846d11c4affd872faebaf0aee77c58d0f7246 SHA512 65dab86e344058b67073e95eabbf4570657bbde26ba0a3abfc622cb42e5e582c88b23474deaf6894890b7196ef61b993ec37a81412243f93da7eeb82238ab23b
 EBUILD ppx_expect-0.14.1.ebuild 767 BLAKE2B c23fecbaa66262a0fc54367cbb60678e9085183e94daac26e1efa556d85d25726278cf818152b8e41d1940683eec0c88d1bc87bc3effedafec6befd7886b0b87 SHA512 c11c1f23ed243c66a91419578276bad046880b7ea242a96708ffd961ff3da40e1d3951e3e99d4aa50d75a2de034435346fb99569f2980d336e59c47fe6073e76
 EBUILD ppx_expect-0.14.2.ebuild 779 BLAKE2B 7f5972403701fa477ccd97dfdd02ac522d7f59217002f478bf50b5aa525799d0846e47a29ed79c949784e24a9e60c295b1c40de1325a9d322400074f87acbc87 SHA512 66e0b351a5ca2a0048a719ae7c3c2a834c075896888a7d4364b277fea90bfbf51995fb0ed7c5100f522469df410dbc87416328b755c5312a89c9dcf95157abcb
 EBUILD ppx_expect-0.15.0-r1.ebuild 553 BLAKE2B 1e16e8fa8cc15c31eca0e6bbe8066deb5f83706bc8f2591ba58525f2d82af91c7495979040d86a2273e3b2f2aa7ecd67cfcd87184ba1fbebe762613a109a9101 SHA512 373fe00e40a6601400aa92d07a7a47b4f6d912f9b435192672c755ce1d2188e6e674ca4526be674deb12a6b37a44090f9d0114c3b201b47f47f3c49863954964
+EBUILD ppx_expect-0.15.1.ebuild 553 BLAKE2B 2c26342088b9b634df75e72028d32b154ab6001ea1b6f45a0a0fc9ee8353e9e6d73081b4c15ad9149a2aa5ccb1fb045f0ece5adf3b360e9a2dde818a32b3981f SHA512 153a82a7886e0101ce4f85ff28c8e4c1f3340b63a12a2f5f00126934e4015cf9041e99083441a151379c61fb745f5b38b7c28c579099fcc49802ef452f0e02c9
 MISC metadata.xml 424 BLAKE2B aa0469c6e2e68d01d80a467c0904f683f71612dfaa586430fc21a7dbe4284951b12f12e518491a9c14886b5d8b915573875a733f946a44b8713b82bbc05bd08b SHA512 de95b09128ed6c02327103f1ba2cf58b079e7e5be40ceaed1e199fff54a6e78a8a1c96b2cc6a4c99638f226ef942f5633c47885e005d878e0f9060e091d62109
diff --git a/dev-ml/ppx_expect/ppx_expect-0.15.1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.15.1.ebuild
new file mode 100644
index 000000000000..015618a4a1e6
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.15.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Cram like framework for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_expect"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/ppx_inline_test:${SLOT}
+	dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_import/Manifest b/dev-ml/ppx_import/Manifest
index 34a0f989d3a4..8eaa2d110c9c 100644
--- a/dev-ml/ppx_import/Manifest
+++ b/dev-ml/ppx_import/Manifest
@@ -1,4 +1,6 @@
 AUX ppx_import-dune-ounit2.patch 282 BLAKE2B fa927ebd180a00201f234589ede38afce69817507d731aa1c849ddd3c42fd5beb7aaf67e6b57902800311556f0cb9c0436c81bd718a4b5c12fbe4a1aefec903f SHA512 7e62dc441cfed1f2a10ef9f539f35caeef0faedc1e752eec23e8a3c9248ae607ee77600d270bcb9c9be8244ce7b8f3991c7cbff9f82522f2472f9aed514bb861
+DIST ppx_import-1.10.0.tar.gz 13927 BLAKE2B d036b730dd9c7b5be9fcbf175103ec6f1e2a14111575135a9cfaf935b936165418b34a4b0a37e0d112b7fbc1315526ce21a9db5bebbd99e1898c4a3c245dcf94 SHA512 7d4aeab6512014b5a16fdcc4d26ac29cc22223e18c7ab26e26f9fdd5bcd625c22aa9ff2e6c2106f45408316eaaf755437979961d97139da5973026038c210935
 DIST ppx_import-1.9.1.tar.gz 13820 BLAKE2B 295796041ecad89c95bd6a6fe14a9d9bb969f7d984388cca5181c31b8358affeb92a4d200bb9e11449a0216995a8477b809acf251b049e8331eea9e6bb918cb7 SHA512 37bd54bc477b91a3aa4b2433a9817c6d939f1e4a1d950b83b05964d22540296582cec6513a0959fd036f738dbd6ef9df13430183b8bdaa9425c7640a5fddf4b3
-EBUILD ppx_import-1.9.1.ebuild 635 BLAKE2B a87a4481874ed181269bc593ce5189e9ab0752468de415a41597443d547274add0da03732353ff49448cf4d3a270dcc996b9a5519e7ffce483622c8bd0be10cc SHA512 dbecdc368bbbb75b8ac94c956b94ac027dcec6b153de23fe703e485e3c62f6c10ac216de8aff7cfbbc76e16aeaf60ce47013365d6977c1ab62853f09708ac939
+EBUILD ppx_import-1.10.0.ebuild 635 BLAKE2B 7f221fe5fa6070acd20c7f9ccbd37051948fb715abda3387b2cf4b0339b93e62d56e5c4d8625ccdb51a224c335ea955dd1a8dd375cc2bc81e47eb6fedcd5e176 SHA512 4fc24c0faec3360aff924b6b2d0bafa3b8f3a95287c82278e4eb146e8d9cb5119ece58e4f22afaeb9192af96940410d837b64a13cbf3ffea543278bbfb6fea0b
+EBUILD ppx_import-1.9.1-r1.ebuild 659 BLAKE2B 40c085f823b4fed4710d65e616526ae47c0a0b625a0ba8770a6c470865ff8b2f65f5ba672365524ed8542715588b17ed40c2afe51e9e5153e9bbf20e29a08662 SHA512 ed0f015b618b1b341ca0d75d5b6b5ac39f2706e7c15bedbbccbbc6dc7eebc1e36a96a7efc6d066516b61dcb5dd52e553a67e277e0d0d75f146b66106360c47aa
 MISC metadata.xml 477 BLAKE2B 81cb703335066a9351b72b455943e55bf3f00d0ad3c3d096aed78f1ce32fb55abd7c125b660fb6f10ff106bd90c1b7e75a2a2826cafe0c5b2e7aae032fd51a0f SHA512 b1f653123da2a260e4b426d459f3b2578c9f24d8c4e387560b6a4dba9f5ffeee8ebff8e5561d343e734b87aee0734d86dad27dc4062d4519f398a3a306ab2dfe
diff --git a/dev-ml/ppx_import/ppx_import-1.9.1.ebuild b/dev-ml/ppx_import/ppx_import-1.10.0.ebuild
index 715ab4e1fd80..7e7bd09535f8 100644
--- a/dev-ml/ppx_import/ppx_import-1.9.1.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-ml/ppxlib-0.24:="
+RDEPEND=">=dev-ml/ppxlib-0.26:="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
diff --git a/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild b/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..c548ecf42c83
--- /dev/null
+++ b/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A syntax extension for importing declarations from interface files"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_import/"
+SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ppxlib-0.24:=
+	<dev-ml/ppxlib-0.26
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-ml/ounit2
+		dev-ml/ppx_deriving
+		dev-ml/ppx_sexp_conv
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-dune-ounit2.patch )
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index c24f86f0752b..3dfce1f32f27 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -3,8 +3,10 @@ DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 DIST ppx_sexp_conv-0.15.0.tar.gz 67450 BLAKE2B 06ea07b90237a288922cfc5a9f6ab2730b7ebc208998c8472635af0fee50e5e2acd5972bcbffe20023fa423db4d788cfae3472d10569c47e444f18ce98599a21 SHA512 da526b5a783c5b2e6cb5d3fc39d69b2eb29807ba77d58ade82abb9267137e8536ec7b841f6ec51b9eb00008a26f71137e78f65df2023b1a47ea586f8d94ce66d
+DIST ppx_sexp_conv-0.15.1.tar.gz 67448 BLAKE2B 4994b609edd19bc70755c418ff7ed0972199ad6b3dde834ad32400c613113a3b3622dca160a4e49ed5abd6fcb9ced3f7580ffc1bcb055ca1d71a945ae56ea203 SHA512 f2b669e7c7bbbc8dd4978b47b73662dd0195ae85cdd71596485211cb5ab4daedcae9be4b33796674320e0d324b7ee9f90d3b219212be98ed792e3a89ccf8c41b
 EBUILD ppx_sexp_conv-0.14.1.ebuild 721 BLAKE2B b92b9a26cb8493b30f3a36f6f6924b2a774817cfa0d46059e783dba749240600c94f42c91a8fe77d721251362dedbb4bcd8ec0c3342d21d66290779e92343964 SHA512 97a91e245f35910228b2046cc1acd6d0546a421e1408f9e6aaaf54722e2009eb01f07be0f9e4637b9d783bdd63abeb0956ebd0d087242c5bc227463541b1390d
 EBUILD ppx_sexp_conv-0.14.2-r1.ebuild 704 BLAKE2B b683ed789bed2b027ef66cd4c6c59ef54b47f32812c8494d3ff7680e99cb518704d73ece5f8e84ed8012ef6be277f90dc27cd8172e283cf8347ff58853c928b9 SHA512 4efae412931fd671039ff0f17ddc8d094339549eb99de4de6db644d5fee0583d08dbc606c9a0bc3d39890594963d21492a802edbe40dfe30d7caf157d634d9cd
 EBUILD ppx_sexp_conv-0.14.3.ebuild 686 BLAKE2B 73e38ee622fdf75cf84d51f3fc86f6bae8ebb584bdf1bbc11b44fb33ad3071df39c69ab804a0fc04cee615be15976ca04801081f5df124bb97c4837b677c95f8 SHA512 887cf8e3459b09ff52ce5270816b096162afeb7bd4b75583c43e2d85871027a57ca0854fe490acd699ec975737b3454346e6c78cfb3c89c2daebdd3a4d47bcb6
-EBUILD ppx_sexp_conv-0.15.0-r1.ebuild 619 BLAKE2B c4e77465b0f1e63ff1ad4c8726b4ec7ff68bf9e764814234a14e4b9b22223af7f2bc6d2f54afd5d735d9451f03a30119fe61fba2ef5d5ffbb8e4eb143581c5e5 SHA512 d961a5247288e977b3442641cb8a123144c673e0949474fdd375010eb47308d9f3e6b95c814af45cc4ce8fb56a58e6ed1eb0c3e103fbaa55eec3310f10f434bb
+EBUILD ppx_sexp_conv-0.15.0-r2.ebuild 640 BLAKE2B bca4579cd46c603588a20a97834b77b3eaf2fe84f3005360162cbcf5e0c8d41622ad4bd919aaa35b9427f85ef4916021660c10526527fb15532d389675329607 SHA512 197b13bb83f39a6b8ff632575c7c0c98f21b817ec216ec4d4fb0bffff5dd665225023187349b94a65758af741851a22c4b96abca633d336694604c1e04e98425
+EBUILD ppx_sexp_conv-0.15.1.ebuild 619 BLAKE2B 8ea175fd0d1c588c5cd685d07892603fe52d9bab319cffda6b6db717454cdc6a3649f8d50322e0791df528ffaedc437b8c0904cd27feb85b4683de3c22e4b97e SHA512 95d3b1e625b145f42a0db15c8bec15e5f430ca005914a958dad73b5a028f767dc72e088f5f6ea2ba0a87279d96bd540b610c9c6ac088653a3403a53de7fb1ffd
 MISC metadata.xml 427 BLAKE2B 40cf563b5bf060e3d241038655ac6f7fa0d96e0d3aafd8bbe27cf77e5a997129dcecfb9cc907734a5fdadd720f848807aa60ae4bdf6a924cbce3b7277d605882 SHA512 e29de52e463fa9c21b92a52a6454f2cadc9bd6677d549c86ee43383a88af9ee43134ecca2379088a40f0e89aa7d98b552480e8dc2cd8042f9a8e5453e8ab1d6d
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r2.ebuild
index 4c2c44069a24..a31de8e54ea4 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,7 @@ DEPEND="
 	dev-ml/base:${SLOT}
 	dev-ml/findlib:=
 	>=dev-ml/ppxlib-0.23:=
+	<dev-ml/ppxlib-0.26
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1.ebuild
new file mode 100644
index 000000000000..36d60228d3ac
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
+SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+# Upper bound on ppxlib for bug #769536
+DEPEND="
+	dev-ml/base:${SLOT}
+	dev-ml/findlib:=
+	>=dev-ml/ppxlib-0.26:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index fed4bbdac52a..284c77ff912c 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -2,8 +2,10 @@ DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c22653
 DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
 DIST ppx_tools-6.4.tar.gz 19051 BLAKE2B dcb3e5a4ca5dd6243cae013739b93c6fe100ca21ad56c46e284255977f4e6d4263ef8d937ed672939e5b31bbe0904dcb1d71105f49385ad5d43404b19a9fe2c6 SHA512 514aa283f6bee11bf257abec98a751c656db63203caa4caee5ce606bcdee75891441a794b0bac22e2ff2e5d2760cd39ffaa2fce6bb118155daf05175917e6e7c
 DIST ppx_tools-6.5.tar.gz 19200 BLAKE2B 5cc847fcde8610ad37dbc7884e38869123a59d81549a2ae9e4e2b2a5525cff36fe3e1a31375090dff9b5179b0e12e46d25d54f3a4cefab8cb42de08bb4347691 SHA512 1dc3f62307690161fc7d9f54715918341429bbe13dd68744e9468b41ab7c15ec95cb865135d11c3e3edc6cfb02658b0c731ce1e7756267cf71143ea8e88318fe
+DIST ppx_tools-6.6.tar.gz 19265 BLAKE2B f4f89eeb314ad76c0337ed9c782ff2bf1473172a30ced4616ee35f34f8b25dd16aa0331fab48afd891a54eaf58599ed4c6730d4dd3ea7e462d967d8279b487c8 SHA512 7bbb9a8d9aaa68c54048fde383f7ba2499ac53bbc2d7e3ba907de342ea48ffded69acc2e4ca4c38c2b2b1004b5e004230988a36ad34a4b5361c2a3ad1f858a53
 EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
 EBUILD ppx_tools-6.3.ebuild 519 BLAKE2B 090073ee37b01219a2e098b8b81c7b67dacfafe2ffaf28b36aa336fe21a1c102f46ca5a3ebdb93ef5f52327f4d3ee6bce517581f000da2fd3e9702ba9ca62159 SHA512 eb42bda8bc1d545187448cf61b91d37652f1631b0d2e7619382f9ac6dd5f13d210a769f7e94904a084600fb3acb2cba3c5035eb3faac7376b80d53593333d7bd
 EBUILD ppx_tools-6.4.ebuild 521 BLAKE2B d2845934161c0d61e1ad4d3b9eceeb97c338cfbfa887e7e96bf60c1cdce2fee4966735074a11831a272db5718663cc9dc401d52b784c781abf2a6e2c073550c2 SHA512 d6c9660a6cd8982a87c2ef772a763fd631e642898c086e1eff63c050612a00eb864c438245db38dc99bcc272b534c4ae4bb897d9ff736d42751b100f07ca0374
 EBUILD ppx_tools-6.5.ebuild 497 BLAKE2B a4048f2190293001f30f45fae70d11956f506a261a379839044152135558b4b3122b9bea5f87dd8bfb988247ce3ed71ed5fcf1192afc981e5229ec9bd4a9304c SHA512 38049ff89408a072d55c90472f2e97f4db24433c0745525d48f486c482cc0e118a969a8e2fad3b08d1373e63c488eb81dd175507473f7b88faad7256b221593e
+EBUILD ppx_tools-6.6.ebuild 497 BLAKE2B 687227afa858a76cd745df7eeeaa3349a724775cba8a14e0be8d7c923e4deb34158c655b64d3ef4531dabe27c5fe63049fce37c1a1fc9a0a1bfc2c83d5c5066d SHA512 25e7ba8596766a9820fe6e693e40301de952198091aea6d2b1a7fcf1d9a986c87d203354be9d12bcb1f684504b11cc3378f9e2cae1f3b12549d07d484d237caa
 MISC metadata.xml 424 BLAKE2B ef86805d6a907c1d81fa71dd3599c66bbe5f6f2275b17c8f43998276d3c99329d96754717bfe935a56ed50fdf65f9e688a01832220253bc2d5909c0717661ff9 SHA512 5dc85ce4085784bda6fe0b3b601858f784c542c26444eb92068328324898d5835eba450ef723d3eb1317f1a0eae82a1e7a430c609bf57162b1c2ac5ea142c501
diff --git a/dev-ml/ppx_tools/ppx_tools-6.6.ebuild b/dev-ml/ppx_tools/ppx_tools-6.6.ebuild
new file mode 100644
index 000000000000..0716cf4a4310
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="
+	dev-ml/cppo
+"
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
index a3c582115245..35845ac21eb3 100644
--- a/dev-ml/qcheck/Manifest
+++ b/dev-ml/qcheck/Manifest
@@ -1,3 +1,5 @@
 DIST qcheck-0.18.tar.gz 105588 BLAKE2B 1c785815ed2d016852ebea3cdbfd1002bcc1054dba95db9290185d1283c9af9a3461fa66f24d43437789b7f361050a227ceed5c45327c694ae3a2846688f195e SHA512 08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe
+DIST qcheck-0.20.tar.gz 205616 BLAKE2B af693ccc2830a70e3ab783a05da828b54ff9ac357fa01cb2ddc3db29901c120a9c48b0c6090e5324aecaf4b8455001883c62e5e39963172aa5e0b124294169d9 SHA512 1fb178bee5353b870fe55e5c5379982345c2e1b7f417733be4168e8a58d448d26464d73f8a4470655ddea2701a2a44bc5b08b0de422c0f88f229d8a1ed9c3e87
 EBUILD qcheck-0.18.ebuild 727 BLAKE2B ca4ed46b96c98ff1908a51456e4a54c6adb3b57cb2922d07258f51c4f99d5fc8cb1f619d867363652ce55193c38bd990b9cf3e5e60dac4b839d4727b2c053699 SHA512 224e8c127acfa7e4247fa96485637687afd0e5680de79f84a0c097508894edee809e762a2632c2d747b5d114b770abc7be758afe168daeaf8b22665a4ec62e0f
+EBUILD qcheck-0.20.ebuild 727 BLAKE2B 96ca6a3156a67aee718a3bb6d62b2716564440821979815f8a7e7b26cb9dfff88ea9b193e4e3f7d23a0b3416c2ee4c542a2dec7d0e849e78cc1aa5b271364b63 SHA512 4715bafdc10aed34375216e13050595cb879d1a23b96010402db220c4bcd35552283401e926ca59db8d4de54d2f83820b7ddd0ca8a217a09ad86384ab145b60d
 MISC metadata.xml 386 BLAKE2B f81a52a0af6e27be6c9f1f4626e9e5cab4c0c94d80b37c0207fa5dfe6b649bd97d59f6c6a3287a5daa4cc992e2522611281bf275545bd0a8def330454898e3af SHA512 1890b50086763886883300812dd149c55df6af5d60117ca8331ebd6ee5d7874e4f7d729de0a8a959dd28a0bda92d4eec55b3aa2fc9e08d36cbd739b5dc9e5d5e
diff --git a/dev-ml/qcheck/qcheck-0.20.ebuild b/dev-ml/qcheck/qcheck-0.20.ebuild
new file mode 100644
index 000000000000..9a40d01067cd
--- /dev/null
+++ b/dev-ml/qcheck/qcheck-0.20.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
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck"
+SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # tests fail
+
+RDEPEND="
+	dev-ml/alcotest:=
+	dev-ml/ounit2:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	# "ppx_deriving_qcheck" does not install but only "ppx_pbt" depends on it
+	local i
+	for i in qcheck qcheck-alcotest qcheck-core qcheck-ounit ; do
+		dune_src_install ${i}
+	done
+
+	einstalldocs
+}
+
+src_test() {
+	emake test
+}
diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest
index 17194b8238ea..a0b7016f262b 100644
--- a/dev-ml/sedlex/Manifest
+++ b/dev-ml/sedlex/Manifest
@@ -3,6 +3,8 @@ DIST sedlex-2.3-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dd
 DIST sedlex-2.3-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
 DIST sedlex-2.3.tar.gz 114507 BLAKE2B ba777d90ceba41136ac552a2aea860b2932dc2c27d02a5875e8533d6740bcababe444d27427fbae59739a42901b3fb85f7b2ed8fd318f984734e7283ecd7e69e SHA512 f91bbda9e79417e0a7c723a8efd9644404ffc91c60898b8fa07a514c38bc8472eae34419405354ae80966feb8d3203943f78776ad395a16132c7c890e3dbd7d8
 DIST sedlex-2.5.tar.gz 134289 BLAKE2B 47aa67ed34ee0226b92d538e61bbf7252dcead236dd51d4a291c7b81f7d0747d1024e9eb0a274d7648b25cfa078108e3e62d54ea2702450171b9ff4ab60f7706 SHA512 5c511a89e43999b34e50cc820a4ac71ecd0315ef144da2af1653077d7497b2ce3658898b723a7c558693766e6bc57369349cdf78c4a4b962a23d4528161b78ef
+DIST sedlex-3.0.tar.gz 133248 BLAKE2B f1adb73087b132d4e99b4785af3a99d3d82ee860d16691c48fbec6bd2776d8de23f736f5d6f21b734c846ef793caa8e7c925ce58dfc472d205268eab39973c6a SHA512 564780b7af8b3ddd32c9164caa42fd24b2ff59e0bf9977bcee4c3ddea2be3f0c870bd95949b639c5f1942e0fa2604902f5cd3eb9041d59b6ee2367895df556df
 EBUILD sedlex-2.3-r1.ebuild 1032 BLAKE2B 8f270fd378c861c23ed396408e3b2bcbec55f463a51680bf617b673afb06db9a4d570b14987f90fc7b6e4b37eef016d99c101301ec10f4022548cffdefaacdfc SHA512 a865b7adc9af6b6302570555808864df07ebc1a6738b2946c7c83a56217e993dc291650f99c79559b8c1591eb2adcd35d5de754011005b32ec70041e68946ecf
-EBUILD sedlex-2.5.ebuild 739 BLAKE2B f5dd7e973c31d8d7d622247fed0bd021cab8256a007ca862977acbe3c01cd2329f3b18322fc5d4fa0dab1721578786d5b84baf2172954a3163db04257ae19ba7 SHA512 018ee0b964f12e52a9168dff43ca4d0fcd4762298a98f7f4a00179742345f9e6a22cf9f174ce8c30fb370c51df76a481aa8fcd629826250f7e2c360d5d9a636d
+EBUILD sedlex-2.5-r1.ebuild 745 BLAKE2B 4a87a88ca404eb8052396e4f80daeba228503911b0c06cd9195a79c911a63e754bc078084455d7f47dfecbe2231954c2c642f7381398194ad02cad8f76a54e40 SHA512 93aa3dd4ca9b431ea3af2ed001c05034e44ed8be996d21cfbd12ff9aa50b0bfd397ff048b150e7435dbdae5a6cd486bbe9f7cfb97b7604d450911f29b50e8b39
+EBUILD sedlex-3.0.ebuild 746 BLAKE2B 8436628ce2258d953df824bab71311efadf4a45c462a2d25609d78bbab93dbc6086d7d1658387c0b1247c06f43b56978e4e62fd8afd0c87a57f0d18433d5a12a SHA512 36e893b3421ad0201dd048ce1e11324aea179fb60bba08e887ed370faf753967e683ca0dab7ceea77e088b72e0c0c27402ed71c01c36f5541afc57dcd183b4d9
 MISC metadata.xml 704 BLAKE2B f2c21c5c672a96091107097a5c4b27e7b373b56982cd4c196c56917997f52da334768f2b51b14bb2ab553478edd60530bba06e328b92437c470f22be10c1086e SHA512 c3ca46b0fafb0f393d5c79b415f3ce46dee477aae4ec8bb8089204415e9bed5d4a3826e02e82a50c7e5d6d5ae88737018cb064cb335b38b9ed12f2312ad96b6e
diff --git a/dev-ml/sedlex/sedlex-2.5.ebuild b/dev-ml/sedlex/sedlex-2.5-r1.ebuild
index cc4748a81f3b..87cc6542f10d 100644
--- a/dev-ml/sedlex/sedlex-2.5.ebuild
+++ b/dev-ml/sedlex/sedlex-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ocamlopt"
 
 DEPEND="
 	dev-ml/gen:=
-	dev-ml/ppxlib:=
+	<dev-ml/ppxlib-0.26:=
 	dev-ml/uchar:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/sedlex/sedlex-3.0.ebuild b/dev-ml/sedlex/sedlex-3.0.ebuild
new file mode 100644
index 000000000000..7cf89cfc99cc
--- /dev/null
+++ b/dev-ml/sedlex/sedlex-3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/ocaml-community/sedlex"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/gen:=
+	>=dev-ml/ppxlib-0.26:=
+	dev-ml/uchar:=
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	ebegin "Building"
+	dune build @install --display short --profile release \
+		--ignore-promoted-rules
+	eend $? || die
+}
+
+dune_src_test() {
+	ebegin "Testing"
+	dune runtest --display short --profile release \
+		--ignore-promoted-rules
+	eend $? || die
+}
diff --git a/dev-ml/sexp_pretty/Manifest b/dev-ml/sexp_pretty/Manifest
index 099307efe8d9..b282dc11b5ca 100644
--- a/dev-ml/sexp_pretty/Manifest
+++ b/dev-ml/sexp_pretty/Manifest
@@ -1,3 +1,5 @@
 DIST sexp_pretty-0.15.0.tar.gz 22407 BLAKE2B df8d246ebe1164f0d2d3ae78074c8249d2aa255a089e02eb9fcc0c21b808dc172da2da264d3b21b92dcc7bf9e51a2921ea8631eb45b45a46035447ead7abe02d SHA512 bc2a7aecfc3ae379a56e8940b9cc80ece686009c9f67233e7993e25ebbe251d62559601923db718a0f967cf42fc84024597c069659842760bb2ac5ce0eab8df2
-EBUILD sexp_pretty-0.15.0.ebuild 490 BLAKE2B 1e579ee968b3621d64d6ad8f705d0d3ec3a6060da1b3abd87f6a611fe03f7b6aadae0928d2168ff47cf218aa91df734a928989ebe64a0dc2dad15f9fd2c6df2a SHA512 00c76ee6a4b4b62cb0c31c54137871225d41316f1f6e5ec872f9b4559f781d4380ab7e2691f8566d6f78487363d3529c720d4f27bd275405575b2bb78f9c9297
+DIST sexp_pretty-0.15.1.tar.gz 22410 BLAKE2B e3819bce21afb8addcf391aff7a330db7f332c338d11f87cf0264d0e8d45ead7897b881a646a908e6165e2b60b9d49c6f2cb4da26ef7f3402ddbc864ff6b088b SHA512 900accca43727f8e7603f21adb0b2bc5a121b1444112b152ed1bfd6ace553b3cd4b2f80371a8f924b636ea33cfa26e913bdcd0ab42e5af5fd24f21ecbca8e736
+EBUILD sexp_pretty-0.15.0-r1.ebuild 526 BLAKE2B 73891124ce6695ea1ca31026ce783350934b0efb56a0e6961b1c0d429c191dcf27f29c2f6928719357fe6dcc76bfb253fd9f14dfd97523b592e5de4a6f3d56c2 SHA512 46e65aeff23e710f19389faef93129750d82948caa7ad0d0f39aa9b9ce4a919bbffcdac65d98225245ace9f1a3f6477b075abb6cd7632ec5067076b4665e7a19
+EBUILD sexp_pretty-0.15.1.ebuild 526 BLAKE2B 73891124ce6695ea1ca31026ce783350934b0efb56a0e6961b1c0d429c191dcf27f29c2f6928719357fe6dcc76bfb253fd9f14dfd97523b592e5de4a6f3d56c2 SHA512 46e65aeff23e710f19389faef93129750d82948caa7ad0d0f39aa9b9ce4a919bbffcdac65d98225245ace9f1a3f6477b075abb6cd7632ec5067076b4665e7a19
 MISC metadata.xml 320 BLAKE2B eb891c246afc84774ab5d03ec3048547c4bb0ef5058f82e8fe3ef172274e352acd868c21df8da52c99c419159b2b8c84fc1b4899b3e16703e5035f8baaddeac8 SHA512 2d3f66b309fa519afc0c4e4adc5fc38009130e7f8b2210517166e70998d628d1a17c7d869f29284ab6b1d53abfa2b872ca9c4289137fe4cbea35faec7e865d84
diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.15.0.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.15.0-r1.ebuild
index a7320a57b1d9..df25c3ade56d 100644
--- a/dev-ml/sexp_pretty/sexp_pretty-0.15.0.ebuild
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,8 @@ IUSE="+ocamlopt"
 
 DEPEND="
 	dev-ml/ppx_base:${SLOT}
+	dev-ml/ppx_hash:=
+	dev-ml/ppxlib:=
 	dev-ml/sexplib:${SLOT}
 	dev-ml/re:=
 "
diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.15.1.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.15.1.ebuild
new file mode 100644
index 000000000000..df25c3ade56d
--- /dev/null
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="S-expression pretty-printer"
+HOMEPAGE="https://github.com/janestreet/sexp_pretty"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/ppx_base:${SLOT}
+	dev-ml/ppx_hash:=
+	dev-ml/ppxlib:=
+	dev-ml/sexplib:${SLOT}
+	dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 8a109e43e378..83dc556b9d80 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,5 +1,7 @@
 DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
 DIST sexplib-0.15.0.tar.gz 55020 BLAKE2B 250d2d791abab87e18ad363dc2140d436cec90469156c2bd37d3de533dd219891bdc5e518d1a37eb8ee4e34f1ec5e924684f1408487d3080c5cfe4a0f32e2d69 SHA512 c31fed5e5bf48381a9b6a48085e7d8909471e38a8cc7586e3c520fe60c6df7a1eebcca1a0ca93cd4d1cc61c1c3c36211db05572273550f7218eb69dd97d27333
+DIST sexplib-0.15.1.tar.gz 55000 BLAKE2B 8f93590ad1cf5fc8286a3a99711d977d36e875e531ec2149fcfebda5d95aa42f29bd0efb16073a71effd854265f15b303291c9d17f848a9fdd3dcc174baed912 SHA512 05a1cbca244286020af6c5ba1d92b32f5d7940dc409c61a8fc5ff114bec60167c8381ae997b53998ea3c0d5167ee77bf160873958512199b06efec1a2a191a7b
 EBUILD sexplib-0.14.0.ebuild 566 BLAKE2B 3a525f96c1003b7ce00f0dc9e3cd8b64bdab635f6ef906e36df3d2eaf3e6d3bacd152f5cb626302d4d5daf43dc0870456e0b4044a63410f9a0ae66783bcf32cb SHA512 91bc3f706b183a780d0885f3db9e6eb4119fa3fda7d5347eecd86d428e931f1f74590ef2fd103b3dc90c0f98931e026250cf10f9a75ad306d0a2f238cc55689e
 EBUILD sexplib-0.15.0-r2.ebuild 581 BLAKE2B deedbbb3769a8efeec00405da6457e58e2a1460b646e52464cb9edbd835d0d24e463010b5364e83f6ba7df6e568de5785f6cdacad736f3b25aa0f1a179388487 SHA512 68035473a9b50a52c7fb06c4d1826ee653606380e2c6e40a04426854ee87e6d44f3b575c8ec05bf7d3d32047bfaf4d23bc778f66fbef35db122d8c74a2b3bdbf
+EBUILD sexplib-0.15.1.ebuild 581 BLAKE2B 41edc1ce26d733bc64380fba20c7ca7711a577bbf64e786753b9f91fc07acf45e8bc9135c586bd3d056e4f8027bb862b3a3a800ef62275770b3adb2b8370a26a SHA512 d8b7adde982a58e6dea24e31527bddfb11da39da862887af97ddcc8f045c3e69540689af69e70808a580dfb7482485592223c80c7df648ea7c5435bd442e9b77
 MISC metadata.xml 482 BLAKE2B cc8a4f1df9d0f76967f46c4e50af6a3355c99ab0138c3e804b60cc97f456e151431f80da3fbc8ee16d832da7fc529b8d06019f1b0613bf4c4ebaef7200f02d35 SHA512 32f96513ff47e289bb41c5864ff462d60f849c79bfbb796ec59ecb2aa4bfb82e14b32bc7caf1c05d333d963f723d99fd324c12aaeaedaf8f552e1800feac7254
diff --git a/dev-ml/sexplib/sexplib-0.15.1.ebuild b/dev-ml/sexplib/sexplib-0.15.1.ebuild
new file mode 100644
index 000000000000..084936b7b542
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.15.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/parsexp:0/0.15
+	dev-ml/base:0/0.15
+	dev-ml/sexplib0:0/0.15
+	dev-ml/num:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
index a2733c2686f4..95c1022df134 100644
--- a/dev-ml/sexplib0/Manifest
+++ b/dev-ml/sexplib0/Manifest
@@ -1,5 +1,7 @@
 DIST sexplib0-0.14.0.tar.gz 17677 BLAKE2B bf906491cd8c8021b6737fa6a9510ad7421a01c448bd1e136cd7244eaeb27674a4c3e739be601a66b1f23a2f6dd2f19771b66fde88a2f3e75e24111ae5ace3e5 SHA512 cfffb390809a1ed3b99d3326a7c5035e2fedf7af084d94f6c0cff98ba641056b5b2896d56d32b1b27bdde29b199bbd32d174cdee84c2e1541cb7f2e4bf00e4ed
 DIST sexplib0-0.15.0.tar.gz 16706 BLAKE2B 154b8f3cb48dd6f13e7ed9679a8ecde6ae57a7a0d70f50c214f088f377d52b1c00b5d7545f9949fd4d17f21ffb9187981b0d009b063c48d252926fdd7a49307f SHA512 ae44c3724b8f7bf8a19bbb10464a21d74b662c77ba3937bab6ca9709843ee2ae7da44432d6dbf4f744cabc3e369b5d2fc89c16e372c3cb77e55077b5efda3041
+DIST sexplib0-0.15.1.tar.gz 16106 BLAKE2B ab994e151166860c85d646cd759031f668577f2ff97e86b9a949f510220fc84dc80d7c41c91c2ba5e5946c8c4d95d3bb469f2669d919068a05ac5c4fdc4a8f59 SHA512 3f15e011b180cccd96882b6b3d3922c13622151713080261a9646d8df896635a6a85e2df6a5d332784678d0d1cae7eccb190769ac4d9bd68b040bc3b41362056
 EBUILD sexplib0-0.14.0.ebuild 455 BLAKE2B 5760d5f430d84eab8049fc4f0ca7419e70ccbdcd6a7438f41264913b651edfff2b7dd6aee33ed6974ec1d54a9f2bf915e6eab2d9d18c36a5851461f99dc719ce SHA512 97d43640f86a62a6b304c5f36706d831e4ee5d9cdcfbcd402581ee8a7ff130e1bdf73165f82ac95f2bd82f1048d5661b39342911fd4cc084bd67ca660a37f039
 EBUILD sexplib0-0.15.0-r1.ebuild 470 BLAKE2B 1ee868fbb5c38adff7b8a1cc70ef93dea552b3de1da3d1533533525c0c622158d73c0e7c5e30eee604085267b043faa8c6d0aa3f5b4dedf58cfa91090f844a33 SHA512 66ce81b74e654f1a9eb216f4ad2f40279e300beca2d7ef4a4390811fd84bb63d2f5030e96f018e9d6ffc253e67113cf631dea4bf0ffffbea253ee9c63f2715b5
+EBUILD sexplib0-0.15.1.ebuild 470 BLAKE2B 802f7c4cbcf94473c1a314841224bbf04ed9ae11e1aad2c53c5c413fa4c0b58df77deae5b3ed4acea2d2b1ed98e342a9c0f5e8c7a46a7612a73ecc12ab677143 SHA512 7613538e10290f0522dcf5a5a8dba3066ee7477a4a03b84282a3edb85032697fdb8e9b78ec369598e70d2732e1eabae734b591ac3acd3e47e2ec175e087f0485
 MISC metadata.xml 422 BLAKE2B 00ff507c6982a44a6bd1ef0b28f0d0a69db94a6e344c83cff6a765b5fa1a23137cc8497bb5cd9f40fd7cf946849905c4161f883f2075208730f495a8a3fea67f SHA512 2b4f3e191031bff487fc6f984a1b308a5bcb06fead967d7fda290c588ae8d0131c1ff86cbc318b7149b9ffba9e5ca0ad258eef149fffd15d63a9625b88effc80
diff --git a/dev-ml/sexplib0/sexplib0-0.15.1.ebuild b/dev-ml/sexplib0/sexplib0-0.15.1.ebuild
new file mode 100644
index 000000000000..29ab440e5982
--- /dev/null
+++ b/dev-ml/sexplib0/sexplib0-0.15.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib0"
+SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 846ed0cb6583..36c58de408f6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 868059369cbe..1512b02b9876 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,7 @@
 DIST dask-2022.12.1.gh.tar.gz 8233697 BLAKE2B 90caeb7a8a9abc03b035c787ae2f26d5dacbd8da9314b65deb7c38e1990a7d3067b4066c8f2bbb6d8179d03af471374df28e511f000097cb7b031e692e72ccd9 SHA512 1945f5737de55c559aff14c67efeee00afef18ff5dbdc07aa79affd89eb45a0808078bbc7ce24c904168e7c7a74a678a8dc90ed129593777dd25598cb45372b6
 DIST dask-2023.1.0.gh.tar.gz 8234373 BLAKE2B 39f4d6336604a66ac769732a36c718b983d2fc37a59276c4140e35354c5c469b5edbff2333ae0b52f3f1462b85ae5c11fc994a99a79330394fff0d7ead14035f SHA512 99650fd2d3805e557ee91bd578e8e4af7f12cc78bbaf72f406d13ff7805591ca0f307d78bb68fdb320dab82da23def01244708e31a87d1a8b5b18dcec8a048fb
 DIST dask-2023.1.1.gh.tar.gz 8497754 BLAKE2B ff9f9f738a557fa0b6a57e0a006fb0c7a29d37c38d4d6ee8656e2e5519a44d7ac6235f106c09c8d28b402bc32909bd065df1cb3d2f9baf8b0ac86bf5ed858969 SHA512 7638a8c8213bec4870bfc1d649bec6ab50354e20df722c3f715b9e438435838253907ead4c13a73d5f1570f63d745059e579274fd0e85c5cdf64411e9d8a761b
-EBUILD dask-2022.12.1-r1.ebuild 1780 BLAKE2B 08640632cc03a699e1824655b9da4337bcb190c82fb7c38448e717e208d4de0bcba0d841de0e5986e5785c3008ba1cde4b84d6869e84823f949effae67ef8896 SHA512 ab09ab6bd8fd5eef7a0cc6728938fac131ff85a0fd0b5d0702efeeb67f1ec851827f0a5acf9cb3c45d5c22928ec6770824c4fc09ee79b85bfe961fcc2cac680d
-EBUILD dask-2023.1.0.ebuild 1781 BLAKE2B 3376599fb69f99d5e3088632adf6ae3b9ea08546af497850a2ea0eca99e08198163b07ba762d1316e6e5d7d2fbd06319c0b628ded12ff9cbd88b5f6e9049a14c SHA512 227eaf57c69c39abaa64c8ae1a057e8f78b4cd89ea2f1a48cf73e48a378ca16a9a14f23ffa9d90a2a1d51a67e7d050039f10534403ca36161f5c294a4feae2f0
+EBUILD dask-2022.12.1-r2.ebuild 1822 BLAKE2B dd04dacac78c3d17b5dec9ae9c5aa10aafe77f016d779dbccf4c8b7d5005d4fa7d229424d7e2997871f8487d9c046bd00f17de1e2f2b86475bec4fd807248465 SHA512 1db5d979e419c4cbbcc3058d5f86a9201fe08cb3831cbc82ebdf7895527fa92adf2b5e7423fcd366c98c7dd7cc543838aa4448b8a4afbed854b1ad0e4099d52e
+EBUILD dask-2023.1.0-r1.ebuild 1823 BLAKE2B 0bfcf12baedfde3b67336821bb93917cd46b438fdca0be06d1912ba4651a2189b445d91f01b51f2f5f1d2be645252659f6cc2514815e2ae98556e2f8a4522b78 SHA512 f3521facbfb626a0918098a5ca3fb08f9292e354fead7d4f73c403ddb88e8d814531da9065b7b9a1e6e187a56f610c49add6ba20e22fe5454a43585ba53617c6
 EBUILD dask-2023.1.1.ebuild 2003 BLAKE2B b27dfd14c7d788de64d97ff24f3dc5f40f4c8c0a2ce138f9af2edce54530bc451ce94cd976b2095985b8d28567e13ad39d75c3d735c897ad966116131e136fd9 SHA512 d1374fb5c9ee1ad61e3984363451a388d93d5156865ae04124656fe305b179c31eab7ff762def7961aff202a8207e3e7baf900a2f60e121872b7d06228f06c6d
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2022.12.1-r1.ebuild b/dev-python/dask/dask-2022.12.1-r2.ebuild
index 691791ba8d66..e51e92b4be5a 100644
--- a/dev-python/dask/dask-2022.12.1-r1.ebuild
+++ b/dev-python/dask/dask-2022.12.1-r2.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2023.1.0.ebuild b/dev-python/dask/dask-2023.1.0-r1.ebuild
index ebb7eda40220..190dd2df1ce7 100644
--- a/dev-python/dask/dask-2023.1.0.ebuild
+++ b/dev-python/dask/dask-2023.1.0-r1.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index f93f456398b9..c5766debdc9a 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-5.2.0.tar.gz 44132 BLAKE2B 5d9680e43bfff506924b90cdce4fcbf40883a732af6b599c2e36d8549ce2aedbd69540b187152dc8fdc0d2a93b21c5fd2724d6386772f9b4af8632e38414b577 SHA512 65d3dc6b1d72c8b90908cf368cb66ac2eb74bdd32d0b42c8a5288b4448bd7444b21320251262627bc950eaf0d1a1ef0c3014761b690122bea9e5e20f744dd433
-EBUILD django-redis-5.2.0.ebuild 1697 BLAKE2B 30bc9c2cb2a6f07b84288ccadcb4fbdce851b3c0beef0e842dd4896bc5a117abe17677eee2c39b1337ca92dabaa404007eb5bb3d3ec8fc8ac02c6b3d3fdc0092 SHA512 1f1d4ba1377eb165dd9fcfa55017de09f49b9189448abc2ab78e2d18d611b66e9175e4e1f26dfc9099ce9b6d091767562c790759f41f38b70aaac5badd9641b9
+EBUILD django-redis-5.2.0.ebuild 1697 BLAKE2B 738ae40ba8f41d88b8e310a4c83a8f7de20f6305109d4da9332ef17396912da137e945656baa8f721f47cdb59a623c3f6fcf712462bfcb8cb2d7f32bb8c3b85c SHA512 9c7d1ead51dcd2012d69703626f7d845c838dde39b1cd2d989a92da683b7657427586110db6d574e5e2587c390738aac12680897445561f99def64627b150f6a
 MISC metadata.xml 486 BLAKE2B 5bbffdb40a82538635cec1802d748bcf8c628390de12d19450486651f84f0c23ff7471354080aa51ae80790600d76f35a6fd37f720cb61cf410eab92bd15cbed SHA512 45cb2046312b95a3f9c87287e9a01015dc46b767de2dac060e79ee5457fa066f3229e815b313b4692128c88f6e13208f96048532ffe6554533427edc92286a2b
diff --git a/dev-python/django-redis/django-redis-5.2.0.ebuild b/dev-python/django-redis/django-redis-5.2.0.ebuild
index 79831234c990..e030bba9701e 100644
--- a/dev-python/django-redis/django-redis-5.2.0.ebuild
+++ b/dev-python/django-redis/django-redis-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Full featured redis cache backend for Django"
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index fca34249360f..bf96f6b5c1a3 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,5 +1,5 @@
 DIST google-auth-library-python-httplib2-0.1.0.gh.tar.gz 25116 BLAKE2B dbb0393bafb1bbe67b99ac0783e687271c42256c7b283422b884b86d4c8a83222392a5514b812aae683ec7f887afa4bf81307079e676f793f02eb87e52a375e5 SHA512 52b0faf70e185cb89420377a06c77e2c45f6b910b85371fc2c42fdfb06a4ebca28b476201f9d179fbaa4a8bf7b6015703d023ddd95d482113e2cdbf79fd376b5
 DIST google-auth-library-python-httplib2-0.1.0.tar.gz 25116 BLAKE2B dbb0393bafb1bbe67b99ac0783e687271c42256c7b283422b884b86d4c8a83222392a5514b812aae683ec7f887afa4bf81307079e676f793f02eb87e52a375e5 SHA512 52b0faf70e185cb89420377a06c77e2c45f6b910b85371fc2c42fdfb06a4ebca28b476201f9d179fbaa4a8bf7b6015703d023ddd95d482113e2cdbf79fd376b5
 EBUILD google-auth-httplib2-0.1.0-r1.ebuild 899 BLAKE2B 5624f17922901dbd1c4e4404bfd7b6db6d752053a5d12ceb39ca258e42497b35eaf4af0e89b9f9e317786d003897a3e362150b27df3789269f672a80f0bf57c0 SHA512 c921cf0798112f435a8410bf8e8fd6fd0168741e4e52530c0fc37b462bf0c7c7c74b29ebd5d9457678f998916efb513094003382753aed98e7c6475196dddfd5
-EBUILD google-auth-httplib2-0.1.0-r2.ebuild 913 BLAKE2B 39050d32ea17f753728696c56c3c641045459e6176dad0b6dd387a315e43b442152fb42ae8b2f46b889830c32d641a8d688b23eac2133ac3f96ceee5a6263125 SHA512 fb7dc06d2a66d82fcd63334656bc43212bd5866366a2d3f464f3ee2ddc900444d6b0b8e3026edd4ae52d7abe782033ef76f057c30e48f4d8b58a13630b657ddf
+EBUILD google-auth-httplib2-0.1.0-r3.ebuild 947 BLAKE2B 0d640b452864d756627286914abd6a8ce89bea465968ab812ed64fe56d967a3519617254af4d1d17324490ec437c21351b439ee647792f286064637398a4ab26 SHA512 cfad164b181037b6e23db5c59e661963026cc4990385020d98391b123adfd3035088e5161aa7d039bae02e640627d502e330391af589ca8c8b82dc9816f0f700
 MISC metadata.xml 539 BLAKE2B eefbb5db5d696a71dbc67ace7becb705ac048632e0434e516aa2fbc6e963ea86713beb4b1a2109e29e16b9844c2bf62ebbec527379c13f0f390d2cdae23e77e8 SHA512 03b6328fffb6014d3cccac0687e2b652b5522f345c125ec69c62dc020a8a6baaef444dbdfadef6dd8119d1a19449d57893e207ae4f2ac35d5592c23cad931c2c
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r3.ebuild
index 74cd7713007c..2eb00ce7dba0 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r2.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r3.ebuild
@@ -27,6 +27,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RDEPEND="
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/google-auth[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/moddb/Manifest b/dev-python/moddb/Manifest
new file mode 100644
index 000000000000..196ef28e0690
--- /dev/null
+++ b/dev-python/moddb/Manifest
@@ -0,0 +1,3 @@
+DIST moddb-0.8.1.gh.tar.gz 68417 BLAKE2B e013c6a2c315eb3f36ace6f37eadacd50a5854726cb6cbcbc6d16170bc1af06bf973d9874909ecb6e70c5a3cb896ef559eb6e915eed41217069fc3c7f468e57e SHA512 3557881f9bc33c911ba2e3d845a8294116c5ea394de4f24ab05a0d0af07ae000e972db9077fad8a1a30941a66b7f560cfce0616df93f1bae835efb51ee6035e2
+EBUILD moddb-0.8.1.ebuild 1453 BLAKE2B f3381fd4ca75b93cb13b6a7dc9123c8ef20531b4e744b87c2613af8b5d0a822de8a09c0fcc4cb4c006216cdea5a80115015f464b0cf63eac12ec543ad2037ac1 SHA512 8f00473c104ab7c5eb03e8b4477758435051ba63f88e87494f26f5ce873e9d3b705c5a88d9ea69b966d4d9c459e1ebd05d92f3b621d3bbd2f2ab62753d9beb34
+MISC metadata.xml 407 BLAKE2B c1651872c2ae76f7adf6fd307c7b7b3c4ff5c9b7a193d58651648de31c63f9c24e35c178ac4fbed18c2bdd247cf2fd247e1a579a1dea92747f5545f155ef5595 SHA512 e24bb351e9a98d5c86694447a9c4007df28de831f4a570e998316d81688347f038cd802441f89ab9cdcc7b4ab7079096ca3c8ff590ac7bf5453e442186304d5d
diff --git a/dev-python/moddb/metadata.xml b/dev-python/moddb/metadata.xml
new file mode 100644
index 000000000000..7fdd458f8299
--- /dev/null
+++ b/dev-python/moddb/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">moddb</remote-id>
+		<remote-id type="github">ClementJ18/moddb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/moddb/moddb-0.8.1.ebuild b/dev-python/moddb/moddb-0.8.1.ebuild
new file mode 100644
index 000000000000..4d37fb8e9f73
--- /dev/null
+++ b/dev-python/moddb/moddb-0.8.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python scrapper to access ModDB mods, games and more as objects"
+HOMEPAGE="https://github.com/ClementJ18/moddb"
+SRC_URI="https://github.com/ClementJ18/moddb/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Connects to moddb.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	dev-python/pyrate-limiter[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+)"
+
+EPYTEST_DESELECT=(
+	# These tests require valid moddb.com login information
+	"tests/test_base.py::TestLogin::test_login"
+	"tests/test_client.py::TestClient::test_get_watched"
+	"tests/test_client.py::TestClient::test_get_updates"
+	"tests/test_client.py::TestClient::test_posts"
+	"tests/test_client.py::TestClient::test_friends"
+	"tests/test_client.py::TestClient::test_messages"
+)
+
+distutils_enable_sphinx docs/source dev-python/sphinx-autodoc-typehints
+distutils_enable_tests pytest
+
+python_test() {
+	# Dummy moddb.com login information
+	export USERNAME="portage"
+	export SENDER_USERNAME="portage"
+	export PASSWORD="testing"
+	export SENDER_PASSWORD="testing"
+	epytest
+}
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index 269bfbc40664..00d9eafe8802 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,3 +1,3 @@
 DIST partd-1.3.0.tar.gz 36153 BLAKE2B e717d61f44c30cfef487e0849a920f839bcafdba1f39b884d9bb4314547074f876aaae53e8613687f5f71dabcc6fd68c95c37264dc52a52544eed50367e85acc SHA512 0ebcccb5dd25d7328bf76e05523b3e40836a92ea867d26aee31e739b7859ca7848da92c6c20824ed1343c1ced2c759361b25ec30f8405e61bd36308613f866c7
-EBUILD partd-1.3.0.ebuild 720 BLAKE2B a0c9051307beae00626ffe11a703258c79d351aa69cd734599b1760f31593c6ab913778771a8fbc0e446c0e84b9ca1aa854f307108beb70aafcf87424798b4bb SHA512 67f312c74f478860d56baaa4b4e045e246d116095149f317652312a14d62a0941b302c07a1c7f69bb1b6e4696050f69bd33df1b1b773594f77d2560a8de65129
+EBUILD partd-1.3.0-r1.ebuild 759 BLAKE2B 827b6922894d0dc24501c52a5b6391d4aab44a88ab573e35a164228890ac3f21c4ae938d450d79698d8e204c784b46a759320e218ae3130d64651db7e09dc93f SHA512 aefc59b686f6048b40123d77ce90d0a22c90d5f226cd017e3eb2619e0b58ca986958675e8d3eb1a6fbca1d03ba28e3a8ac7578b5ead86e7e95db1c51b9b3d2e6
 MISC metadata.xml 694 BLAKE2B 88b82b21fce3071b0208928c6f19cc319887b09f56d643a534cd74a8e197047255cef8faa9b8dbbc1e776cc155c74c00c5f98f721fb2e95482a105e6e6f44481 SHA512 5dd00f370e902bfb80a4b483a209851f0f4ae7dd3b794a43e4724a366a1c4513147ecee581ce55ddd09b3c8c254e06073cf90a174d8eb87fe5991c1882c5e6b3
diff --git a/dev-python/partd/partd-1.3.0.ebuild b/dev-python/partd/partd-1.3.0-r1.ebuild
index cf8cb0f381f2..aaed1cacf0e1 100644
--- a/dev-python/partd/partd-1.3.0.ebuild
+++ b/dev-python/partd/partd-1.3.0-r1.ebuild
@@ -15,7 +15,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/locket[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/blosc[${PYTHON_USEDEP}]
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 70c95f0d1d00..f794ace9bf93 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,3 +1,3 @@
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
-EBUILD pooch-1.6.0.ebuild 1457 BLAKE2B b6d05b2d853f1fa53b0cdfb02ce6f924e8b765dda6264f31d900f442802758e3ec9311f8f617f7eae82f25b6a34882442ccd5bdd0772fbbe0069a654a4f50685 SHA512 00cce5463c9787c411abe20104606149a4530c8cd99ace48087ff2c978cbfd3b4c075a53e9754d9cc2f504304d352fc34f93f95a1de1b821a9ba9c1c9d29b3b3
+EBUILD pooch-1.6.0.ebuild 1499 BLAKE2B c5836c1540e053689360dea719212202f2d5d9cd081d26a4ec058e99fb62a01c952e3db7eee716818ce3554987ef02d59e260ffa59681e5f29c6a0fe535a9b99 SHA512 382e02a9dc5a4dd2245246189e827f7487b56abbb7957d3437ed47ea396cdb63ec5f69841a3b8cbe89f85f91e70ef299720bc51e2594663f89457029bad5be24
 MISC metadata.xml 684 BLAKE2B b6cd1db5a31f316800c9c5e15e11c858bebc81b7c38ced227e7f54a5a0386462fa9a92bb8f177d9df0d3fea00775dced1e2eebbb1622fededdac87ce40db21e7 SHA512 a96adfa4b8996e2685f7d5ea8ab6936fcc795a3f517da8ec14e885c08b2ae1f6d950ea9314e8aa6a4b2a4b436a23d1e98a6d56b5ae0c633bffc4fbeaca4058a4
diff --git a/dev-python/pooch/pooch-1.6.0.ebuild b/dev-python/pooch/pooch-1.6.0.ebuild
index 07b383a51e2b..6129c117f0e9 100644
--- a/dev-python/pooch/pooch-1.6.0.ebuild
+++ b/dev-python/pooch/pooch-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pypresence/Manifest b/dev-python/pypresence/Manifest
new file mode 100644
index 000000000000..f3122f481511
--- /dev/null
+++ b/dev-python/pypresence/Manifest
@@ -0,0 +1,3 @@
+DIST pypresence-4.2.1.gh.tar.gz 375948 BLAKE2B be3f654bc9666b1fcc2ea4bbb7fc337b1acf41754750407f0f2a6a29bab39e3a5fa1d3c4076fe68dd31994c8713234aab88b085248e05196e3683e0b0c72c5a5 SHA512 b01714fe33bc470aed7ed0ff501ffdb50706e2d9a5610d594e55bb2938c670a55fb42312e67b0126bffa0bc9e04a3c1aeda445769764c2fefc8888945209cb2c
+EBUILD pypresence-4.2.1.ebuild 537 BLAKE2B e34c9dd0a9a428787708e7581dd05d9755654e8bb625be69f3cf3a1e0075aaa20ec630e4cddbe8aa877281de347120753b3d072c226e1c0c95fe74e7b8d656bb SHA512 f4d62a86de66d694281eb151a6c1b19fc5765d07b9ff8ace6293f5d4c1d45e16187da600be8599657b4d8245a517cb77e8fe77e6df7bd20bd975478bb6eac505
+MISC metadata.xml 419 BLAKE2B 94a6c995283b89ca96a57166b3be7540e825d0c64b5916a27a13186d07d4449592f2357001c5943a290f7fa5076d80f8540b26c8c2b3e08e7dc6a8aea72145f7 SHA512 a8e04a1a1d7f298c99b39caba8cafe3fd6c930c86bd0f2fc24c9128c33973758c929dc0d3aa2c4b5c716af8839a0e8629bfd2e76622af9bf6412d8ca1860dc87
diff --git a/dev-python/pypresence/metadata.xml b/dev-python/pypresence/metadata.xml
new file mode 100644
index 000000000000..4c1e79b832b9
--- /dev/null
+++ b/dev-python/pypresence/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pypresence</remote-id>
+		<remote-id type="github">qwertyquerty/pypresence</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypresence/pypresence-4.2.1.ebuild b/dev-python/pypresence/pypresence-4.2.1.ebuild
new file mode 100644
index 000000000000..42e135f8be29
--- /dev/null
+++ b/dev-python/pypresence/pypresence-4.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Complete Discord IPC and Rich Presence wrapper library in Python"
+HOMEPAGE="https://github.com/qwertyquerty/pypresence"
+SRC_URI="https://github.com/qwertyquerty/pypresence/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_sphinx docs/sphinx dev-python/alabaster
diff --git a/dev-python/pyrate-limiter/Manifest b/dev-python/pyrate-limiter/Manifest
new file mode 100644
index 000000000000..ac3a609cf6ce
--- /dev/null
+++ b/dev-python/pyrate-limiter/Manifest
@@ -0,0 +1,3 @@
+DIST pyrate-limiter-2.8.2.gh.tar.gz 51233 BLAKE2B a9a8bbf123596c7c64f60ae2c9d4e23a394dae6d18a8d09c0ec0b289bbbfce9dacee523726b906a30cf17fd7243b3fa1d1f2dc60af1bec67dc242d944535a5fd SHA512 3ff703347a86f6a91cf6b9c8edce3017cf88f2373961ba235c2f521d0112b0116951be7314b95d737ef0bec5cb6bae9908874fafe4060eb773cf0577e2ddbdb3
+EBUILD pyrate-limiter-2.8.2.ebuild 1399 BLAKE2B eb99d1c1469078a31ae39d77af1a50e5e7bdc7346b6105bdf2cc3a9ac8cd839374bba68cf7c218ff288cca6e29e0ed19f87571d3fe42b8bdbc0708bbb5adb96b SHA512 0bce335df58e6ed51eba962a7ef4d44bcd3a3d037deed7fd46495fb8d2e76aec5e7748f64d1d3e201eebe698daedce949d1b4ae338e8e1ad695c7c66ca215041
+MISC metadata.xml 525 BLAKE2B 8daa0c59b247c8ec215a3868315f383614b24bf36a80950f3a94968856a27ee2eb90cedba36784355926c509a26b530f3de44be729beeee0f22595cc0b9467b5 SHA512 429e23f33cd2889a7e989333a03ee374cbec2e264d354bf1c299263f2c9167059eb17f1c975b67cd4af7011843c3478d5296033666566bca97749ca85dfcab44
diff --git a/dev-python/pyrate-limiter/metadata.xml b/dev-python/pyrate-limiter/metadata.xml
new file mode 100644
index 000000000000..90ba4d1a797a
--- /dev/null
+++ b/dev-python/pyrate-limiter/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyrate-limiter</remote-id>
+		<remote-id type="github">vutran1710/PyrateLimiter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild
new file mode 100644
index 000000000000..f04b57aebe33
--- /dev/null
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Rate-Limiter using Leaky-Bucket Algorimth Family"
+HOMEPAGE="https://github.com/vutran1710/PyrateLimiter"
+SRC_URI="https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/PyrateLimiter-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/redis-py[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/django-redis[${PYTHON_USEDEP}]
+	dev-python/fakeredis[${PYTHON_USEDEP}]
+	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+)"
+
+EPYTEST_DESELECT=(
+	# Optional dependency redis-py-cluster not packaged
+	"tests/test_02.py::test_redis_cluster"
+	# Python 3.11 is slightly faster, leading to a non-critical failure here
+	"tests/test_concurrency.py::test_concurrency[ProcessPoolExecutor-SQLiteBucket]"
+)
+
+# TODO: package sphinx-copybutton
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx-autodoc-typehints \
+# 	dev-python/furo \
+# 	dev-python/myst_parser \
+# 	dev-python/sphinxcontrib-apidoc
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
index bfaca10454f5..1eff1ad76923 100644
--- a/dev-python/pytest-localftpserver/Manifest
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -1,3 +1,3 @@
 DIST pytest_localftpserver-1.1.4.tar.gz 44573 BLAKE2B 8c5bd0065d36d7c312944ce41747db141c90b7cbad134b6d3ce387cc9ef3f536882b27d1d0c23c67fb9e75546e62d0b1434faaa577c61f07a9915bf146b6a9e2 SHA512 67f7ca9d212f187f2e91d274523390438e07c52dc048b832e65012ef49d2843002806db1fbf2eba560bef671a0ef541bfb44f6b8226fe5d9d40acd08d53c4f48
-EBUILD pytest-localftpserver-1.1.4.ebuild 821 BLAKE2B d4a0a21fe7614f5a2e32a6f0400bd174b569cff4c775b19260662c20069d5a0c2ec5125224b7766f40502929135e258f8e493f3b7bf87b1c48a2d0188e0e5816 SHA512 8103823d23d3a48cbac272b5fc77bf86f3e23c208f8044eaa628552005c33649fd4c2c31c51beac716168d682c79b6c5ccf1996d8544b0f1acafdb1bd60cf464
+EBUILD pytest-localftpserver-1.1.4.ebuild 846 BLAKE2B 07bb2851add56055e3754890526631d87032d7e33cc991d0b52875a86207b41c284ff99271e2f81678c60761c7db06f233b43c91b792339d3dab2aefc844b76e SHA512 63dd9ffcb6e76e4234db815b2de55aadf691c6397ab35a3e3102c85bdad5458023f09bc4670c6ca38d1b3cf862ad81a35de2da13a92c8b268e946ab8b2db2e7a
 MISC metadata.xml 569 BLAKE2B 5a2afdbd9c95515e83ac146f95c1c1da36e556402c625151fb52bf067e58d4178111e8fb0457113cc292b0f480ccb9b1d4026f9bcb212db57711b4c08e3db658 SHA512 cdcf50653ca1020b258d9c38e524d6a27c9e287cdb286f36d568dd2fc1b07dad241df07d0fcc2466d341d11d3d0ade5ddb033b026eba744500cc2931da44064d
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
index 94119841e486..fa5376406ab8 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index a7d4a44b9786..eeedc8bf8131 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,7 +5,7 @@ DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9
 DIST scipy-html-1.10.0.zip 65656379 BLAKE2B 4a4f1e428bc2355f32be05e35634e5aaccb0938f170ee247931a892cf7ab59b3a9ab952060e98936e153bed752c29c01ed34eba02188b3514de7607285c01d08 SHA512 3bda526f209905355b3f87ba1529b9f45c3580ce7d9b80a63931871dab1542347f243c9f688854cb67d575e9a645ec89105775accdc746fc290113f28978b73b
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
-EBUILD scipy-1.10.0.ebuild 2751 BLAKE2B 0bea0066da8994e8cdf265b37a8284dc0e00ed4917409b282f572ed77ab13a80689d31480c2b5d3afbd01c57d6acdb4bdb60562b5223815ab6676fd7caad2e1b SHA512 b66a85d685f3c18787cebe188d76805f4dafdc2e9915cac678f1fc18f3f58649ac2889566bd0cb3ca9801f30cda738f0f8c52328e2477792b65837d7bc34e385
+EBUILD scipy-1.10.0.ebuild 2793 BLAKE2B bd84ea9e8f7b7a1bd7031e4e269c05c11aac6c6df1c28c0620f4fe7d45474eef777e9839d0ce1eb371ab087c1745cb06954c1a6d76ce9e645b5e54f49d71f914 SHA512 493b11075b6df0b10e6791f904b9f3ce20b0371785efc18367c8609bf0b390944b0f3cbb160b6141dfa82d4be92b5e156c78cbd88c4b70f341a8801627f9836f
 EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B a4eaa4602214ab99912c0c7fd022ec6a28f15e1da3ee726d9b58b5ff9f89f2646778db383e42d3739dee738add3c701968292745146d9ecb92cf69419207abc3 SHA512 5656b4e55bfb9023138673028cad35fccb4c4e1eb6ae8c6547b2995cf3cbda04e5574c20d64d7293b7b2012aa8fb0ea647a112aa2f9058e120fb10c25c815a02
 EBUILD scipy-1.9.3.ebuild 2439 BLAKE2B ee856e2faa6a1089fd2c92c73022131c9449f9732303a3ccf1e7842adb3388caf0921047ed3cf2baa8458c703e5629220b7d5322f035d9e8db4a12af050fbacd SHA512 1d4d6e3d8926fecbbf0edfdd4f3554717c3bd2796906d83367b87cf68f867dba2a3c51acd1d6c672fbf1e3480cf4155568d6c9646dbd6a6ac6a86bb6bb5e16c5
 MISC metadata.xml 1054 BLAKE2B 490b13e1a307b1990f692d43f3bdc2bbe92e8dad809a24c9223358028eeff2e0387043383e7616df3d010d6bf669337c4c7cf57587181c2c77d93e2ef6e3b8e4 SHA512 379160f7146a8e7dbbfb7243e39f76e12399e47cf0eab632fc3e1598f5fa4482151b769d16c6f026192ac16b8fefdd363427b14decf66c7e1f6e1630444abdf7
diff --git a/dev-python/scipy/scipy-1.10.0.ebuild b/dev-python/scipy/scipy-1.10.0.ebuild
index 7cdedde69f9a..7b1d4ea364a6 100644
--- a/dev-python/scipy/scipy-1.10.0.ebuild
+++ b/dev-python/scipy/scipy-1.10.0.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 -hppa"
+		KEYWORDS="~amd64 arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/dev-python/seedir/Manifest b/dev-python/seedir/Manifest
index 17501ebfbca6..0947589f7b94 100644
--- a/dev-python/seedir/Manifest
+++ b/dev-python/seedir/Manifest
@@ -1,3 +1,3 @@
 DIST seedir-0.4.2.gh.tar.gz 3096194 BLAKE2B daabdf1f5bb202ab454bea376c6e14dab2eb9c964a3bf87349c3ac6075bb8ed201b66082518aff01cb4515e89026a02c662da5e9a5f43c5d0ea21556cda07e90 SHA512 8d16ae1ba020268f9587742cacbc55ecc1d218f36955c625f64829940396c908d0498ee6bf50d560f87b10488dc6daa5698681e10e1699d20d958b3cd58f14c4
-EBUILD seedir-0.4.2.ebuild 604 BLAKE2B 671317dee290fc079adf8c8fa1f6df525356bae0562c5654bbfae4b0d781326cea8eba1d8098d16cb65e0cc7942c24589ecd6460fd63e05cbed6daf487932617 SHA512 f0ba5d79d1ceef061925b827735ce392ccca34a29d400627e1677792e505083e89dfae7914d5768c48348a09ff52a90fa0dfa9b806eed07c1e33f429c9179d90
+EBUILD seedir-0.4.2.ebuild 615 BLAKE2B e93f0951a379096acc193bdeb8b800e35b16f1b87b066996e2f16fd2f3ca81589d055d669689337be91a5ffcf97dc2aeac4fc30c2b4a5471bf29961c11e9ea37 SHA512 1b27f977acaba5077770193ed46b6221812786a4ed49b483e8e0a1cd092c04ce25259cb8fce93c01fb5fbe7db6956d5d10d782041a4d661b5757a56db8f0f31c
 MISC metadata.xml 393 BLAKE2B fa479c17b0ecb4807f85e82e871d8f3690c7b0aab9a6c53b3609c84771d3d5a0e8b0769ec35ee51d533764440bffaaa679fda6401a95813ab7c76f81d6f84897 SHA512 913ba255b6ae25b437d99ced1bd8aef70f8dcc17b947be4d1ce10738a88c6ab35cce66dfdc2193d73881011f1e5e976e7b43c1faaedf312a429401e02f0dd9f7
diff --git a/dev-python/seedir/seedir-0.4.2.ebuild b/dev-python/seedir/seedir-0.4.2.ebuild
index 3e06c52ed197..c9587c854b51 100644
--- a/dev-python/seedir/seedir-0.4.2.ebuild
+++ b/dev-python/seedir/seedir-0.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index b656e97611f2..3dd2cfdfce89 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,3 @@
-DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
 DIST sybil-4.0.0.gh.tar.gz 50845 BLAKE2B 5c7144ad1dd131f98c48f18cf6770782529a3c86a3f976461f032c9024ef93dc2de3c8bc327421a55a3f505982608e15cdcfe022f964c4fd871bd9de61205d68 SHA512 6cf0422ba856a85ba5dd105481cb2d06eb2ff196aee263a36e7ab44c7d45185df022bd859afc92b3b42dc418142e441f377adda82c0b5b0d1410697b563db994
-EBUILD sybil-3.0.1.ebuild 466 BLAKE2B a12ef06e65777de3b1720660b1c831c8905af25cf5e61db69ce33f2bbeda56437d6aa5b35a2f25e761b2c4dd9c17a81adc31c4491f64e2fff0d0ff20d712329f SHA512 b2daa82377ef3ab7d6b36c5988dbd3f3519f0eb12ab0b60f2795b690d8c64baa2259936c5bbdeba6e74ec27732506f5b56229527bb3e46092d38aa7b102c8ab2
-EBUILD sybil-4.0.0.ebuild 680 BLAKE2B 6815c77136310c4a887ab296707b967f98c757b92dc2dc9124fb61ac4b7efadf0ab9e0dc656cc701aab5db61033b236c964f7ce66463154a120e47e71ac72a0d SHA512 3af1889abc67662ded5cae3013a289f6df29ea663a83ef9a5f48fd84cb46555910862e8b40c5c78efcf099801795092d071d208b2dea27dc25b45a0e6c4ebf8a
+EBUILD sybil-4.0.0.ebuild 691 BLAKE2B 1e4285d37be3f57ab03c4a7fab109f651101ebef498e4c8be6ae11245237bf7f7dde5988a6c10d4cfa40a1787b631f2dae5f910aef5679de478e5dd4241030e1 SHA512 32753419bc0f8bedb3ccb9d011a4b2d9cecfcd5f2b753a1760e49498076b000cce467845febb877aab4a3b0233644d00538b68f428f35ed666fb1fc54ce9bfa4
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-3.0.1.ebuild b/dev-python/sybil/sybil-3.0.1.ebuild
deleted file mode 100644
index d5d6d0307347..000000000000
--- a/dev-python/sybil/sybil-3.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/simplistix/sybil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-4.0.0.ebuild b/dev-python/sybil/sybil-4.0.0.ebuild
index 547ce4766e3b..6f6dc80a567f 100644
--- a/dev-python/sybil/sybil-4.0.0.ebuild
+++ b/dev-python/sybil/sybil-4.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 44944a8b8940..d5d95b15f416 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index cf984ec3a880..27aa9cff3f3b 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actioncable-5.2.8.1.ebuild 926 BLAKE2B d33be4c8d5fb7bcb529df64f77c61d042bfad9b54f15b3e382176c4f9e1d67f0292e0bdfccae3793f3b2214d56eb5c691b3e0a6be9da9404d4da2a803af872b7 SHA512 37df0a84305dda9c3df04e7480ef3b8eefe6469333847d48965c311a31ebe080fd067a12df5402b973101fe7a7aee079dab05dbbb41cb810e7a5e52c0fa2bc3f
 EBUILD actioncable-6.0.5.1.ebuild 935 BLAKE2B 80d94fcf7588e69360c2bbf9fda9b03f68e60d43e513920638f9995b10d8a404194be843a1a79f61d11ee33b30c80527c71f301a6fbf0156ba218d3241d587f3 SHA512 207ef3b5769761fe5319e8e70a2de0ddc90390c503283b67f5614fefff12c49c2213f3f4b4149001b30e4fb9c1d0d7b8698bacd28735b7f10e82f2bbc61378c1
+EBUILD actioncable-6.0.6.1.ebuild 928 BLAKE2B 24adcb17635a45cb2945465eccfa47d0a573eb62196b303d2be13a2c31cbae74a2d9eea4f0c039dd5064380934b9800c7927527e508215e37d9694153f84f44c SHA512 45a543befcd6e6822d35add12e246d75eb8db702561b1002891acf21a723be62a99d11da0ba2499705d52e423e2a29e51a9db7ecd0b90c88952f7b92b718dec4
 EBUILD actioncable-6.1.6.1.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
 EBUILD actioncable-6.1.7.2.ebuild 975 BLAKE2B 2b9611b19e8ddfb4c271dfa4aebf26471e36799f7e7a844234bee80c348694c1e4f91e87484bebdb77f78996c8ce0c90ee65aef6ad8b3872ab2d084f6611b484 SHA512 7a7725909b9e16ff5512bbf85703037c13260d0097f6d884117b4a66628c88a1ccbb83be8af53a3a75e521d8fcf2f644b7676fea30534aeebbfb1110c46db880
 EBUILD actioncable-6.1.7.ebuild 975 BLAKE2B beb9737ce2bd01dd0bea572125ff6b5b4828fc70d0e52d13364a965d019899aca1eaab33c7e7367ea03fc1e8e07136a72da4da7442c7c992dd594a44b9809f2e SHA512 a248f9dc760580da0af1bf9338aaa1fc641be3b632881ab1dc8d5dfddefa35f15bf463665ead89341b475b42badc241773ef593b9262c5568a43b73bf3fe7c21
diff --git a/dev-ruby/actioncable/actioncable-6.0.6.1.ebuild b/dev-ruby/actioncable/actioncable-6.0.6.1.ebuild
new file mode 100644
index 000000000000..330b6365db98
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.0.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 617b852771bc..75621a29230b 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,10 +1,12 @@
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
 DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionmailbox-6.0.5.1.ebuild 1854 BLAKE2B f2e25c6e6ac862981574ed9c9a6092ec83bd913b0a8b332ed5e62fca81844c29a37e0d4a36a20eb33b3c237e114790e5e4c52e80d63ec9c9aa59b989ad3630f8 SHA512 d826c2749df4de1ebf63110bd980398484c91c5f731457b62a6ac172fb6956ec36f8ec2cfa126fe990217b899cbaed4ddcb7242f657af88328f167f3cf14bebc
+EBUILD actionmailbox-6.0.6.1.ebuild 1900 BLAKE2B 6533a9b8feb1d249ac2d6c349f974d4a3030534a745f6521af59d9ee5982f9916de0124272295dfbcdc0624c5a94cfa0de5f5760e2ecc11ded365cbf8f6ff122 SHA512 0e72526567e3f6f2816658bfcf4672910d85284db1afe0001ca20078cd52d8c83b5a6b0eb7fde4acefd896efd8f364ecc90052668d9b3a16d224cb26ab1304ef
 EBUILD actionmailbox-6.1.6.1.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
 EBUILD actionmailbox-6.1.7.2.ebuild 1937 BLAKE2B 858aff6ca2795abcae97efdf0eca7a26799c4a129dc94a51281cef963bfab21ddeeb86fa3ce80231e094a4559860f2ab4a8bed460d3339ccecb495a8652ec0c3 SHA512 213a069e323c0336f3c8af0355711491ecddf7ed5421c5f4d2026e421a0270d8bc7dfa616a9711b32ec70657909254f4ae6de2fe2d7c3a21d0e544093aa733ed
 EBUILD actionmailbox-6.1.7.ebuild 1885 BLAKE2B 2ed38cb35935b8e43140ccf584643bc5bc38b83e26aa48fd538601e1c4173b4a5b9ddeb992699dadbe928edb3659ee25ae9ca09b28a9b0f2d9b7aeec2fbb41bc SHA512 a88d36732045ad4da4aa4b8cac0fe4d8101d3e45750678885a9ce051678789dd2982df346888963c3fefd9e88113086018be1d7c8ef06a7a4c8098dd7194f8e7
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.6.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.6.1.ebuild
new file mode 100644
index 000000000000..7503a5d4c9d8
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/mail-2.8
+	dev-ruby/mocha
+
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
+		-e '/minitest/ s/5.15/5.16/' \
+		-e '10igem "mail", "< 2.8"' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index ad93abc5b109..6bbc7ddeecd1 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionmailer-5.2.8.1.ebuild 1395 BLAKE2B 4df95c01ee09bda91acee92e1d2848784b48f4d9549b37304de0b42968ac6a67f180252d020a4cba07941cfb9398d3f58c790bc38e0dcba3c9076d6b09f1a3d2 SHA512 b2bd6db7daaeeb6c7c03fccb8993e0ad3ec1c2be4f404e190f66b39824f8372953e38966a793fc8973113fb42094b9cc638f0343470551673d57ddcd39e5225b
 EBUILD actionmailer-6.0.5.1.ebuild 1369 BLAKE2B a2e8d1f875a69560810a3800323d393c7aaa44137e8c50387fcff890ea8209fe56e9dd2c7f88eb51aaf7b693768bfd954bbeecf584f31fac568f7af53c87ca4b SHA512 48763a11f6a8b588e5afb55c1797c622eaa69d7eb6653a4dbab8f6f0c91318d570fbe82ba3beaf4d467f49111465d083912ba4e10458c58614c8cf441a20b246
+EBUILD actionmailer-6.0.6.1.ebuild 1362 BLAKE2B bbd54e3c052c4454aae547e19aa239c075fa2861dc006ce49d1a27e63f702ce58bc9f47730719d66c5e0b437f797f3bd9239c6574f7b593dee44a2067227e9ec SHA512 a4076b82ccf86989928c67fc7507da8b1d618a6ba6360ac0b5823df0a5b542fe7e24be30500d2c1d0389281266aa5f0891565e647644f94c2f4dd0941b3e2ef5
 EBUILD actionmailer-6.1.6.1.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
 EBUILD actionmailer-6.1.7.2.ebuild 1275 BLAKE2B 571f4dcd1a060a0699eef5a6c99b6a72bcc83a668b4fe3c623996868943a6a755c32430882472ba62f7e9c8e072485b2a3feb10a9b1823ebfb329fbbca1a2d2f SHA512 0dc139332b17bcfbe7ec37854fe1f1cb1fa726c02a513573f66e5a4c669954097731cfca139c0e9dae5033c095197564d97d428b671eff50e3a0a5e9c4580a75
 EBUILD actionmailer-6.1.7.ebuild 1275 BLAKE2B d8617ce24d1821381e6a79dd82c0c04f0d71babfd25b5522bcc495b1a3e8672a09472612a892b5799130485e690e4349fd131fcae6dddea9b7f7b686bed730c9 SHA512 5ecaccc9c0eda4da5a242f593143a4f96222e255ba1f56b754304da8346e376712b16479175788c605d368f48a27103e59623ec4ac2f7cab53575cc98c4ed8c1
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.6.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.6.1.ebuild
new file mode 100644
index 000000000000..640e870059e8
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 0fa43f4a3a8b..38d3a06d4caa 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,6 +1,7 @@
 AUX actionpack-7.0.4-rack-test-2.patch 2619 BLAKE2B f31791347de3a683270ed6720a4c33c069d29529ea6eab6b2721cd248029cc1130502d8d6aa9f9fa3433769fa58069502b7c1f9ffc330cb46f5163744967d51b SHA512 ceac0b24692512a03029ce24a1cb86da31669a1e91ab50537981d7dd3fcee861fcece37536cc63b8a3b6f07709dc8b8f64a5c3213a4c7c997208c3d73089cfc9
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -8,6 +9,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionpack-5.2.8.1.ebuild 2262 BLAKE2B 82cba37da0060c73aa21e55ce9b87e462385d3beeca1f50421b8cbadb87c4e40f9045a694f4f0696b213cead836c986068e36558a689d18c2f69655bae4f6d46 SHA512 abaaccbcb2e1e100fb80faa8af7efab186f44fe47fc8551c4b67974bd7d75a029ad5ba4d89a717ef379be71083f8ed442b8e3c0144f1820bc5bd0180b68db831
 EBUILD actionpack-6.0.5.1.ebuild 2085 BLAKE2B 1115265732900203d12276e97d55ffcb6f71ec7f3219625bcc5e2ada64644d9366ec773febf7bddad8777b261082b99bbd66bf250fcd5366d1bd65c0c221a838 SHA512 fa4f5a17f4adffdecf547810d7ef95ff45f206178ef345e7689093210ac39a6d2451e23d451f08066b814ae4dbecc5c54beb61524d7f13a7477fa089fc38a0a7
+EBUILD actionpack-6.0.6.1.ebuild 2323 BLAKE2B 0719f1b59ee4caadd192e83e2ca3e73a738751bfc37df5d8860aca54d53763f3db7070250b0b4f4b2cbca98b078e0efd52ddd9598f22b0e9442ca93bd9c092d1 SHA512 0541b0d3d8145a616a6051af6685192b452768cadc27e24f84938d798d8e90e205337991205c73e3ed142f6bd04f4954d82cf48d7e5e12fcdf13793a513f720e
 EBUILD actionpack-6.1.6.1.ebuild 2142 BLAKE2B 4f1b92b673ada157372a3b3d6832caf4dc074748afab631a52ddd3d2db6a31c306def13079adf3c842173f9ead59e06e141830fe51a865140ecb01350b798f8d SHA512 82efa802a7c4bcf1998966a9ad9297b146d9bd9e7d0f6ee353316cd595514db1eb516eeae40bd895f24e9c9d3462696ae51880b4590b097d8770671b22c37dfb
 EBUILD actionpack-6.1.7.2.ebuild 2386 BLAKE2B 077959ed95a2e36586daf25b359cc48b4e9923f6a38ecb973f10f0b2204bc5965198ca97d83b86dbea0c887228e84aacc2c5aaa08f47acde0f12dd827b647fc3 SHA512 59faf7c8fe5287a8f304c3e665ff7a9f4cf64db5637e2de6c4e8c773dd719769973e94f73817b8e80598ed698b0b0e91a5a0a1cd6ad5719a5cd2db7b28d66815
 EBUILD actionpack-6.1.7.ebuild 2313 BLAKE2B 247883d8bceefbee5fad85fdf6f6ee95fd10f5b3dbba78c6ade03daa7e4dd4a58e3010d57dc77d67866021faa8ad57f086cce64e5ed8000a228337336a1dce89 SHA512 0c2a34522f94016b30d169a99e8a35140f8bd7e3686e4e0a1b6d867c07de09aadc34f82211f19163a03b2c99b6a98a5945ab33e6ac31f6486df2dfa85ab6e9a7
diff --git a/dev-ruby/actionpack/actionpack-6.0.6.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.6.1.ebuild
new file mode 100644
index 000000000000..7f6f3fbba289
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.2
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-3.35.0
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+		<dev-ruby/minitest-5.16:5
+	)"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}/actionpack-7.0.4-rack-test-2.patch"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests that depend on an old dependency
+	rm -f test/dispatch/system_testing/driver_test.rb
+
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+
+	# Avoid tests that fail with a fixed cgi.rb version
+	sed -i -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 53df1ab3eabd..3f76eb751a42 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,10 +1,12 @@
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
 DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actiontext-6.0.5.1.ebuild 1769 BLAKE2B 58e600879c7b45bd8d4061f3dfff6e576ce7e60d8a1ddaec15df28b7154633e8b13a8a3c0289b8d7ed5811c47ca4b41e2ee7c7096da2f4b1d312f8c0b2c53c6b SHA512 edbb947aca857ebfad82e690738ff1a20f6094f483a2e4aceb17cb69cadea5d1ebc6a1d2442d7897cf7d535d177c9f0fb604a55cfe7e593c88df19a5ef9c98d3
+EBUILD actiontext-6.0.6.1.ebuild 1762 BLAKE2B 8776f80d2662396e92750b5ac0f28a3533f09be9f5e1f0d2678ddc8d448b631324cc0eca8eeaa265f8c11555ae22331eefb396fb5fb8a21f65f8b4dae66c9a0f SHA512 71e0e4a1b2409cc9bc7f25c6b9df8c0018371604ef7f024a9003b999df259df78e9dc8eadc3d4ce8b014356e4589dfebe9cd755be87a6c35470759804d0984a9
 EBUILD actiontext-6.1.6.1.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
 EBUILD actiontext-6.1.7.2.ebuild 1792 BLAKE2B 138912b1271f54e86e4c69d031a4f28af012dc31c473480f496b391bb222eb45da881c45cef375e20792cf0336a3cadb29ac8ac345606b6000835d32e477fa19 SHA512 1774282c9f09ad0c356a302acc167fdd93b219089edb66b4b50a8a603e1b0cd609c1f0fe156adb38058b8e5e4988a20544e4802c68b1a87f8e2213e658dfdedb
 EBUILD actiontext-6.1.7.ebuild 1792 BLAKE2B d04a3fa36b734400f76b6fca4040aea0c6e7532aaaa00cbc999b528f21002173c7dc3e71780286f6bbacfc26e1df05d4e482b7f1735ede55dcdff8484158fa74 SHA512 064970502f60c1cd17823f714f8c5ca7afd0f6ba9bfb8f1cccc65f2121ea77875e2b610cca5f1ed63513bb200754f20aed6b22efbf02588b40a653617fca6268
diff --git a/dev-ruby/actiontext/actiontext-6.0.6.1.ebuild b/dev-ruby/actiontext/actiontext-6.0.6.1.ebuild
new file mode 100644
index 000000000000..e8592dd35023
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
+		-e '/minitest/ s/5.15/5.16/' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 23d92add5c4a..88e1d54a8f41 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionview-5.2.8.1.ebuild 1966 BLAKE2B 0d4d8af0e0098210097fc7d5751adb4d1d1b7ef087e908244454c28a4e0164f96b118e1928ba6165b691e329a4e268e5746d24b47ce001185ccab17e06eeec05 SHA512 2a14063ff0999f8a2f797084696fb1748a421394033fb0a771855382c1e6ddc3ee425f33b35363486b0948df6579c131845fd6ab3e605056cbdd6639a4c44a50
 EBUILD actionview-6.0.5.1.ebuild 2299 BLAKE2B 0f6c5c60b9173c3ded259058597fe257004123a80267e1dcb30345d0abb7b8085c5d4d3b7dd757a36b1d4246a33c9273ca90f9da4c4de673f373a97011cbc04e SHA512 d97e0a4dab80a226d64da4ef57a87a359c39eb5e20bcc0f49c707d0d05eaebdf3db8c9d08f62f11f71c84ee44dec34f489692d8710f0edfbcd85ea5128e5b014
+EBUILD actionview-6.0.6.1.ebuild 2293 BLAKE2B a4541cd53cb83b124d4e981392d62f08b59242d685aeb59232ae907d1d40cfcfeda1df8094f3755895f48f118b75dc300287bc1a586faec7aef0f4a14a6f2bf4 SHA512 a026a24c06501e9c0fab1a667ac0ebbbdf16d78f157931ce6ada3a50b020bbd59cc981b8b0b8b83b945d99975785096463d6157f0a6575aaf31eb584ad1863fe
 EBUILD actionview-6.1.6.1.ebuild 2101 BLAKE2B a01c6f37a018c9896f61e891ad82bf86a9c99e08f417f1cbfa08b22491c48f1e70ab97da777d51c1eab9c35f1aed23343cef297dbe902b6d80979e0351e133d2 SHA512 d4ea82778356f9feddf462588bfabc1e54164e4f042861f6c6805d0e5fda65e5470cc1ac5148a9c0f29f9fa36a2fb030acd49faf037db6c8d794bb388f92cdd1
 EBUILD actionview-6.1.7.2.ebuild 2101 BLAKE2B 06c618a95bb7735b9618a2c94f098a5bcf540c737d8e96b381781da47890829956e0036da17044d972c1847aa9ec1e66366e36a8db2113b7d65a50210019a295 SHA512 99aa943f8c493eddb9fd9522a6f20b23b304d0f35cfa6eb06d1a10d72c80cbd6299dbb07eda3bbad477ba90998960112ff75335d208c44c5b65c0cabe01d8173
 EBUILD actionview-6.1.7.ebuild 2101 BLAKE2B ee40d1979831b81c94337a35193f80d0b73bfa6682c7dc16bdd8e6fd27278f4fbc914d2feeddce1d81534264892702ef486dbf65d0450e2387ff71801e0b029a SHA512 91fa99e7bb588df61fa9768d9003ecb2c18e67cdb56a9ee790599f8815c53db3dce4cdbb0af74e7d57b46b9cf6f8f85857e8341b57dd1ae5c1c1f84c45892c9d
diff --git a/dev-ruby/actionview/actionview-6.0.6.1.ebuild b/dev-ruby/actionview/actionview-6.0.6.1.ebuild
new file mode 100644
index 000000000000..106e7d307084
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+		<dev-ruby/minitest-5.16:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 3febec409569..5fdcf9d881ce 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activejob-5.2.8.1.ebuild 1184 BLAKE2B 27f1fefe1b1372b73d643b6bba5cf3f2408180137914b16e6db0d3a60c83fcb4d8d741de4516bb678f38160fd95b08a3cd840fc693ed95d9cfb03b9f84bfc7d7 SHA512 c718d64ff414fcf0723a889e185a98cd79d4f3a6ae79cdb3c39183e1f04bd654c8df1679fa3341e9859be8d6feb6d469bd98c748edb77306c5fda1b9f0898e4e
 EBUILD activejob-6.0.5.1.ebuild 1213 BLAKE2B b904ee16e2944ad44bdb21524f938c906faca07af3c971cde7f9fd7042faa68d843b8dc987fc597e2382eaed2ae985092e23b02f9c8602039da2a3145b308a92 SHA512 ded1b373c90fb875c603b70538ef6456876c8ca5605259a779441bb0ad29cc4b57835a5867abe29318442f0a767bdacfa792938263cd378ce41a35b8ed2a305d
+EBUILD activejob-6.0.6.1.ebuild 1206 BLAKE2B 40e6ffeb1cbb33b5fcd86c27cb070689e1b4e4deb661c04381e288362ceef0289d85c78b6d01c7029ac4226b68246948bca935a2bcb6c114aa6813a32f26d3aa SHA512 49e96282394a6575ba01ccc92cc300d5820da36ca056c6b042f28f79bf3f3761e56b17b88d4e2a1cc4b9fa2d2e39d755601b205143aea86f9af88ff8032d79fc
 EBUILD activejob-6.1.6.1.ebuild 1148 BLAKE2B 1cd19b58ff45a7105e949c07769124d6bea3491b58f1afbd94b0c291acc427a4eb99afb88c55e974f52d17022d24dd202fa809c137b7c8de63987060a8500143 SHA512 3835f9d122b46b1234276186c905dda71fa2b643c973cfd103bdc33848b3d737f1321ccdb34e3285dcf8e9c4e229f97612064977263a09b506d27357fb9c0a9d
 EBUILD activejob-6.1.7.2.ebuild 1155 BLAKE2B adbcff19fbd8d42b161a3f88a929864d2cbcc0ef8fb177ddf0d4829b9ad71a346f1235268ebae1ad43fe30d7c0be4bdc28fc0aaa2d6a3c305307c381bcf53ed2 SHA512 c584d3d48a7b2626d71ac0e6973dfc4584adc3e5b4981f4006c8dd193b56fb85980e9ae6a487f3a837debe6c6974b4ecd6450e17c1c7e663d54ed6f312f5a177
 EBUILD activejob-6.1.7.ebuild 1155 BLAKE2B af67f312316340e9014714f0834af45a093c2a205cd4d9d44affdb0330f25e4776c52a967847af7a1dff1b9cc189ffa1555a3cbaf7c296380dbebc8972fc9986 SHA512 147dc2ef63d7c79d1424186feae541b6d340ae3d26c4fc82729c58d646c9e723802b0cb3558cdcd079dc1d55bdbfbcda4ead04e85ca848b26722760a5a70f91a
diff --git a/dev-ruby/activejob/activejob-6.0.6.1.ebuild b/dev-ruby/activejob/activejob-6.0.6.1.ebuild
new file mode 100644
index 000000000000..80d3057ccb00
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index c588150f3e01..33bb80e78291 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activemodel-5.2.8.1.ebuild 1137 BLAKE2B 3a0cc9e460af74699bce6c2b46105afef177fc695c0cb038e6a656482dcbe2b056b4fc588c2f8bc4808c603656ba0c0709750f7f3f836c3a58776c7a14c2b915 SHA512 af89de3e7168717264d26c0b82539ac32bf29eedaa584ca892ef8058c2cbfba15a3cf96d12da795133bb211bc9b21eae3954acc54fe5e3cfda4a12a31f78af40
 EBUILD activemodel-6.0.5.1.ebuild 1014 BLAKE2B f2866a358065f4f75b8aa6b507ddfe2667a1eb0d60ef7ff1893b28419a4770016785e15515b6409eb4b328414367fdfe3a8ecd672d4a2d277935f0f54bc91599 SHA512 ccca178b67ca58a9c71f5300b225085a49c99e478c20e238e575a339b729185b2482ed42ca988e3b1db5b05218bd38ce44f8e0064ccd32f13f5a625cbb59f995
+EBUILD activemodel-6.0.6.1.ebuild 1008 BLAKE2B 33342f1e9db37502ca83fcf28e18ea6f33e3d679679d36c91ef8bed92565f3bf54f66529b281c571d911fc186fe3041d86e6c9443f910b6b219b690ec8835ec3 SHA512 5e4d893704268abf200a2fef69fd0866aff63c6e1f6b31fd4b4d4aa74656623119f8c2c24203ca4fbf2e3a2891db32c65047db9d3a1ac7dd0c8fb284ae86c99a
 EBUILD activemodel-6.1.6.1.ebuild 1005 BLAKE2B f0a4e3b0705368b255501b977051d2011639c60c18b0cdf01586e06756800281a68e1c580325b32d7b7b2add5f14d40299bec454986f29ba4447b84d66122673 SHA512 522b125447de7befe761a7540b09d57fc51f0c31f82c25826ae98ffdd0b165273eb0160a7bcd974f244b445cb4d66bac4c23902ca8adbb27bb09bacb8f560388
 EBUILD activemodel-6.1.7.2.ebuild 1005 BLAKE2B 7eae973b238b4ce8dc8d72f8108b85e86b1429bb611c29c5883d0e18ff5d5e1d26af24086b67789e865231f63a4ff295499dde2a25c58413eefbc7af8ebaf279 SHA512 4ecc010546040af21824667834a89ac9767f631fb1b2b8f36c5b0047be910c449950e4cce4e4769c8cf21153574d4cf8c3a8bcb8d887afbefd01bca476d30b9f
 EBUILD activemodel-6.1.7.ebuild 1005 BLAKE2B bb71bf9f6a18b3888e9680931f036328f635cc6b7c6081f1fab015a8910f63cd2a66c4f7998a3121554d2fe85692e6d005ac58e608b37767ccb5c002b36c5cb5 SHA512 819c637ad16afd6c6f245987eb4deae630faeab33b125b3803b894572ec7e16b6e7bee63c57ae7f215bd65e568d13a2f0e52c5442e14146b660aadbbb445485f
diff --git a/dev-ruby/activemodel/activemodel-6.0.6.1.ebuild b/dev-ruby/activemodel/activemodel-6.0.6.1.ebuild
new file mode 100644
index 000000000000..89b9c99b344e
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+		<dev-ruby/minitest-5.16:5
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index ba3dd922a57d..e2ad4ad22d74 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activerecord-5.2.8.1.ebuild 3218 BLAKE2B 8319a07ccfbf2d707afe9139db5473e0a9189d807543e8c2fab2d545b8307ab08f3bd55c0a969d409d7d14b1f383da5fd79decdec57adecb235aa015d2d00750 SHA512 e86b995c5b732f4ec884b1ed15456ac54068b3a8618096dcde15008a873dc7f076daf7fc9240108878c3415dbb2b9d3d986f85dcc5d38d1e6832b9d5a82b7c64
 EBUILD activerecord-6.0.5.1.ebuild 3318 BLAKE2B 0798ebd749cbef6ec4d6c64382f7e76b916af1912a9799186bd5e898f0e378ea6881aaca7a198a846ee469a6e8ddef297fce7702de91fe0ade04fc9f160258c9 SHA512 97ee97729019094c9d659421bf391eabb71963d5d4273bc28a1a04041aebfee9f449340bcd9f271e879454f4e2f18585b726291bcd1be63280c840e0dd3f27e8
+EBUILD activerecord-6.0.6.1.ebuild 3312 BLAKE2B 0ad906650a1fef15358b0ebe5a20eab714ad00bc0f98c58c10479ac52793f024b027ce10a4d3c97874d3e3b5c416e54df6a64a177444a3d922a842ce17ef1e47 SHA512 f61b130d97f057bb5378a2be4ced56b1687d2c9edbe0599a189ee15ad3d027347e9800971cdfecd6ba7313f11e19f27c4c9b9b8098b871479859a0086affa765
 EBUILD activerecord-6.1.6.1.ebuild 3409 BLAKE2B e868b31253db8d57cce78ffff8586cc050fde06e1f6c96bacca64b48aaac6d30b7a36a66a7866d421a6ffb9a9f37cd217feabf2c34af33811db8190eb80b91cc SHA512 8cec7b303f2d23f0ef6d83d048b3b3d72ffb44a183f8b66676ba02e4363563d3f7a47a3895d898535a0b2f5274da4e002c99b0ed00e921e9a9ebec4685de0f5f
 EBUILD activerecord-6.1.7.2.ebuild 3409 BLAKE2B 7b0a00cb780745420f5d52d9bd5bbefb4414b67db75233854696c79153fec64c7a3798c22eae98c4d046a29c573c6df0b654d0d36d78c3b8da7c904e056ec521 SHA512 a705acf004ee38ab4e12a70b9223342ae7dbd3f01f0b8ddda7d8a9d1f4395eb0a7912ac14263dd541453b950b9864368a220dfa3bb2533ab8ecf7fa16ceb3b03
 EBUILD activerecord-6.1.7.ebuild 3409 BLAKE2B 322bc88a8496459292748f7e5cc9acaad5a318dbc556fa679874533917380c42b1624f4d89674cdb9a357e9b6a8bb701a9ecb7dc1458f254ced6a18cc49455aa SHA512 6ba855254f90feea10f43b014a61b9c907464a625f656d0880ad8bea7d003ff7834769b7e440dc07ac34b23cfc84fb73b954774fecbaa8c390c750b8ba536b41
diff --git a/dev-ruby/activerecord/activerecord-6.0.6.1.ebuild b/dev-ruby/activerecord/activerecord-6.0.6.1.ebuild
new file mode 100644
index 000000000000..008739fda762
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.6.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( dev-ruby/pg:1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		<dev-ruby/minitest-5.16:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+
+	# Avoid test failing due to sqlite EXPLAIN changes
+	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 4b2fd9c44029..30deddc7420d 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activestorage-5.2.8.1.ebuild 1921 BLAKE2B 8eaa5d630fd84db3f7388dbe998465cf23daded42dd31fbb15fa970ec80304315260736a78cc8ff947a33a218c3f125410307450e43e72bb8350c325aba27ec2 SHA512 486fa7c874480a34b11d8a073e9625dd3d7892b3d82dd4bafd9378171a28af1df7780502abd8c61c31250cb5b1400e8b5921b622f6a41c9e80feef0f5037fcff
 EBUILD activestorage-6.0.5.1.ebuild 2173 BLAKE2B b21ede1afcfcf3973dcecceee7cc2fb7cf7308fd14bcdbab90434b1401ca9c7a56a1b4b2b08650daa88230c4403beda95f2059eed3a6b6bdae6d78ee6ff4104a SHA512 febb37553ac718c845c9e2f071133c2fa6f8fe8467b2ac98143e502ca9bc30c7a3a64a1975a47946fe876f1a980c413aa19cf3592596eed1c782003f617af384
+EBUILD activestorage-6.0.6.1.ebuild 2164 BLAKE2B ec7189875e94cbad819aabee6599f66a5d9f330f53b945c2a5739f274c292dd8b4b48b63d9a3ea7d1e7011e86eeb5ba2e215c1bdf89a19b825cca39fe7b1693b SHA512 535974a277f0f8e57a490f48d4053f9c32dd0653348fd0d14c2852825f9bd25f828e5e5aa5b53a1d788d3283a5df6a596cd3d2feda30cd2197bf9c48f1dcb030
 EBUILD activestorage-6.1.6.1.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
 EBUILD activestorage-6.1.7.2.ebuild 2047 BLAKE2B 793523981ee5659b5b0e041147e6008cf33ea750bb01f574f6a90bcb3720eb584f2b720d5e096bcbe0092f276c6ed1f0f1464e2fbcbd6c5f913f3d71e4eda51f SHA512 48fa06a3c6ab3911476b659e04ecdbbbc5e2ab37c23fb1cc008b32f1909ca535eebae4c7ca7719fd7542732f7a3c41cb8dffb13cf442ab67dd6ba55bacebdd45
 EBUILD activestorage-6.1.7.ebuild 2047 BLAKE2B 0fe7eefccbc225ce2154e4a7bd0e3e289daaf1866d31368be4a588ac80335fd8825e73e4870e7f7912f7907d676a5dde7249105862218b4abf2096fb3ab8ae4b SHA512 62265bc9a3b47828b68ac16da3261dea8739b8d9cb28d2cdabea2b6c6c7eb1442a35cffaf655fbc6851c65aa9690f31fb125f1dcc34909dd8109dac8ed23621f
diff --git a/dev-ruby/activestorage/activestorage-6.0.6.1.ebuild b/dev-ruby/activestorage/activestorage-6.0.6.1.ebuild
new file mode 100644
index 000000000000..cd37f3bbe21b
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	dev-ruby/marcel:1.0
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+		# Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+
+		# Skip test that has already been updated in later versions upstream
+		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 4a885f21fd52..f3dc6ffeab49 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activesupport-5.2.8.1.ebuild 2582 BLAKE2B 0ab916d197d17be5586fba966a2601d6b20a2ecd273d17a0f9a3d093b19065be76493872600dbd7f60f8e0a2214ca60451793d63a6fc2f656931bc319d1f5a68 SHA512 e028a4745d4c7b48b71ae7da6edf2db84da135359b08f41be6861df63fc50b11981102a56672b232862822d1ad6a3c3368eeec5f7e9acd1ed9dbed00dc647856
 EBUILD activesupport-6.0.5.1.ebuild 2627 BLAKE2B 41e6acb1208c70eb0c15ab6f575812f6c30020bdb29fccf8ef8ef1e7789b52ebb3030fa738ca2773dbf20dfa681cf67874337ed808b714347b4ec7be2e408cc8 SHA512 61937e128074d61ea82e8e1f5a05d95f3c583813648786c5d3678148f07b0860723cfca8a627485ecaca2d2c7b9183047c547d57e4c802f6b8a315d95e611f5d
+EBUILD activesupport-6.0.6.1.ebuild 2622 BLAKE2B b2512e35e767b8e0e84fa0b25e441fc4bfafb20ac9004df825c7c8a7e8102b3880d2f31104d75ae30b85311c4c40eadaf4b3943dee846dfb129b4a2906e8e6c4 SHA512 1e751fbc08dba1ff3bff1d2c8b696b5c1bcbdbc24f0fdc65725876d2be2f46988df5a495105df7b9d2707a4b9ad5a1699b7970a20c434be56a6cdeecbda39a8c
 EBUILD activesupport-6.1.6.1.ebuild 2718 BLAKE2B 446df7ba590041a230f89eebc5d4d2171a9ae7c8b62177b27c9ef87b81dfe6d1394d87f85166af824fa1f3020da24e8d9d53cf9f3c2055b8aae66823fd99fc8a SHA512 ed45d5464657af5e1082065d07e45aa4ead1d4cb52b74b6171ac3c48ef6379cdb41ffe39aa43f64fd8265f2c74cbbbef37f1da76017e254d3dbba809b6e28917
 EBUILD activesupport-6.1.7.2.ebuild 2724 BLAKE2B 78926ed6ef74d5a04c57ffb3a637d36876017090ba52627b3a17889c9ad4d1f1d657b9e60e0cdb0e0c8aa647ca125dd704a4f757c409a29e1e3c04b9351070b1 SHA512 f42787e46c2104c263dc4a6cc2cb32933661573ab8107868dae3644881634bd42da9203e5990afc4d51d0717bc87e6dd479f1912c4065d881a9d3ba961a06a08
 EBUILD activesupport-6.1.7.ebuild 2724 BLAKE2B cfad7a5105d623d128a230498ecc05fb4bd4defb3cbed0b5895aaccb75d3ae69c950af42ee86c03f2e198e30750d2c62b7ce816ecac7d8dcb7c0584dd156e5d4 SHA512 d19fc60954dc6a06214d7c4b2fb0a859d592e00e26092eff25ac0db20c8fa53abd9a6f0f5c352ed3ec44811e332f71966d1ec2812c053fc91e52e16ab53d4ad8
diff --git a/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild
new file mode 100644
index 000000000000..469c7ac0a8ce
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.2:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:5
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 2dc1f3398440..9a8796ce7f32 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.gem 6656 BLAKE2B 43b8a7a684023dc3a08439ae35cc343a4024c68dc2d2c248cea703ce006ceee2dba5a98a8530f4173fd0e23116f0ebddfac86c0d5b507218af7fa7064eadb34c SHA512 556ac7f136d963f029253664dc4d4eb417e5892d33bf11d59ede67f7120b83a72c00e2516670fcbcd86ee28c90f5fc75c89a44e1294510b81e527155d8690279
 DIST rails-6.0.5.1.gem 6656 BLAKE2B 42a04f6fcf62a07d3f3727323ffb9ae5884561161e5e3424996e323cf637175f970e6a2f80559113034c6e70a1c718b1c5efe9eca2b880df1a2961a7a5311497 SHA512 881b5f0298fe2bb02ef52ce7f0df6bd0c7821f9a834957534d40ebc1603794b0b591b9ee326be328567f900946b26d46363c711fd3e4744ed351094bd477634b
+DIST rails-6.0.6.1.gem 6656 BLAKE2B 96e80633f3ea9856703cb6798833fb14b45caefa9699ca57954c4e6d72bf8a8bf9adcfe484100dc58ef26cf6ff9de503777edda9a2b6470e4d5244d5bf65d4c2 SHA512 7a656dae2490b9195f88db997f08ef70bec7df579b849acde017e58552f7dd30f71f69cfa5676d703f921a7f0fc5ba31e96586850ace33b5d9e5db9830b6f807
 DIST rails-6.1.6.1.gem 6656 BLAKE2B 10d7bfe4c92b4485de328d9b9806bdb79bd74f9bb23ef09cf9609362927b1474ca3ba35e54da6c8fd9745b0364f4f6a9390b4c1ad641a5ac437c222cadfa25bf SHA512 90ef98bbedd76feb4c1835062069cc5afd5bf5c191cd0858efe03dc5fa80194773ec7b21a3296a24089178faa14f1cd68f8e9d934f362b03ebeef81998a7f18c
 DIST rails-6.1.7.2.gem 6656 BLAKE2B 149fca7e8a48c952608cbbfd9a91e37e350dbc46f96c72e6306d3828e303084ff3e7be7a5495d90375f0ef9a15a86ee0d616301143b23e5e372d4205d593d0c0 SHA512 28ca21666905462d7663aa5fb0ea4e5b2058235b3243408ecf474073e48eb97473e94367323df5476b159912510d96262e92fb5b2791b995180c6a7adf59ea44
 DIST rails-6.1.7.gem 6656 BLAKE2B 269016aec41ab2a5fe334c626286095f83d3fc7c16a52491002624267d89ec7aa499c9a7e04d9f55e67e12a570c0b597c44ef6e07072c3e421e9b9a317da6c0c SHA512 e89151c39c62748983e83b11a4c092874489df30329e377097448802a76851d7c1c340180b19b056d3e3658c8157a076ca9b4e68c8cd6bc3819811509c3e80d5
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.gem 6656 BLAKE2B 583ab77986109dc3b1acd85b7ba6eb08915133968efc
 DIST rails-7.0.4.gem 6656 BLAKE2B 52a5b9445c7ab4b43a9646b02c80c519f22e0f78e24eda4f3c7b7e27829e3edbaa7fa42bb93a2e1917469d54cf75f8c2e9fb50015cf7abe981da43131235a5fa SHA512 2df3363df5f380dc9d0cf8e19985f07f20bb2a5e1c50f776636b2d53e3415333490201ab5600a52bf878391de411344ff8c8d43c93a2aba243dd0be3ee1a3a05
 EBUILD rails-5.2.8.1.ebuild 1032 BLAKE2B 8a3511652bf0c8249a13bd33287bbc246eb0af18930c0430424763de9c38bf405ab95e54c13eaf7d7506f1311580c5f7bca869e887036cef6c47a6f288ccafa5 SHA512 8db82d8ed6ae72e02efb27762c58618ca7bf254488376341bd15dcf5867aca5c30e956a1a466bd8ea7e497ed5fa634ac27703f592d1b11016e025b45f325f244
 EBUILD rails-6.0.5.1.ebuild 860 BLAKE2B e0462dcd8b3816131df57017224384a1e9f6a809cf9bb7cdc5d13246fe684333dca349889d5a4dbed334cdbae017024e1b213243b61ea0c930da4292b779338b SHA512 32c2483e331a626074ac02c8ea71d4c16c902da110ce778dfb51cf5bd6c437084224f123bda1fd254d5882bd97fdb2d30a20d1e89dab2ac5fc1fd607043fb8f6
+EBUILD rails-6.0.6.1.ebuild 853 BLAKE2B daa78b2c9f36158c8d07e1cd203e100c5718bd518515dee69515248c7f0e9820e7a4f6952fbce3c5f5221e46f1816aff1882787eeeb385759dc035f490723991 SHA512 ecc27138d76b274296884b9d21e3508b594fa4b4c67cdfaba24899306e26645718fd0d76dffff55740b71c1bebe6888f38f7eeebb4eab096c4e666b6598687d8
 EBUILD rails-6.1.6.1.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
 EBUILD rails-6.1.7.2.ebuild 863 BLAKE2B 790fb5a7446471dc9638e2d32c8b68fb57636404604ea14d73e612f5a9e09048e470d22fed02fccda9fa78554e46db962db5241c8c9908cc9ad69396c79d96cf SHA512 44897eea393ab0f9208698f7131f34f937332b68e7e536f488f8126ae9f03831d4b71b91a91a477d4ba3137eaaa8d8367e962cccadfe24064fb89ed23f1b0d55
 EBUILD rails-6.1.7.ebuild 863 BLAKE2B 9d0aaf977dd91bf6e05a3fa068f6c7282db987f0934b652c2eac3dfb3f048a6e606998d571d2ef18d0bf72c5c2a9c606b13b1f50196f25e9a3d7d9e9bd2b2da8 SHA512 8aebdb01b464fbc672d27ba5de7459625a1c1fae9fc49b9db878ee6d30732de2ce77b582e3031c070178ace7793863fcdbc073063c7d16f393b76c85ddfab338
diff --git a/dev-ruby/rails/rails-6.0.6.1.ebuild b/dev-ruby/rails/rails-6.0.6.1.ebuild
new file mode 100644
index 000000000000..3106331ae149
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 61f27f7ff10f..d126b1b7a6a2 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,5 +1,6 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
+DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
@@ -7,6 +8,7 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD railties-5.2.8.1.ebuild 1621 BLAKE2B e20d64b61d6b2601799f2391ef0ba71dd78104de5006550b664c1e40c0e986df43ff43b499246b86422ba06f98fe07c0f5c56c47d400a4f525e873742f92ba76 SHA512 714e5d2cb813456b4634bb24e08d33c5afeaab73c538cf05b6c14395db5e6f3d7ba0cd83ab66e5617d19ca3e6ed960017498a405c37e0bd6afab12ea3b474ade
 EBUILD railties-6.0.5.1.ebuild 1624 BLAKE2B a30a65a7d84cb1135a0636b3233bffc378ca19800c3c846f78925e4049eb29ce5ff53166153dfc1585d6a3db215356c32a02088c3a2cd6afc9142a0195a8b151 SHA512 efabbfe5904631537e488d25b5b5413ecaac0f7c3135de088603bffee663d7d7eb88d3caa20e5325e61e7a29e5cf187eaefc9d8090646c4094ac83b02a202ddb
+EBUILD railties-6.0.6.1.ebuild 1618 BLAKE2B d3dbf0084ea96e8502cfed8038e63408efb0e5900a2f8f3195d3782689bd6724daa56579df96f30ad6a1d8453f57b7d7ed5e686741e528532a2f37593b56094d SHA512 0875d03523ae6fb729875a8c60265da548aa0d0b646b6d4ab77712e714484a1032678053211590999d5134374b35f536ec5e22176dbec2bf5da8a9089dd7747a
 EBUILD railties-6.1.6.1.ebuild 1625 BLAKE2B 74e541aca3ac39dc655fea9e25a028908ae523610c6688455f58339d8ca384c58608b80b8d6f8c6ffeee8a84570438776f8504134193066920b3a8fe298528b5 SHA512 aad175c12c025b8d947a637772b4e0f1d89d702c683678b23bb20b40908b727ef4821b553afb4e586bcdfb8b28a9aba92755ee793c7d8667636cf23cf7c0de34
 EBUILD railties-6.1.7.2.ebuild 1625 BLAKE2B 6a5b3cb78bf686f0e8b6397d0aa60e1fd1e8d749ed8b70653cc311288caab014071a615c9184f38debaeab1d456a5f2fbf7f7c5125eb0d31d94a4fcb4d875780 SHA512 c2e3cb02a5b1df7eb335a8fb852fbabe94383d3b7892ab18aea8adca97e586fbd67afc89a5ec66b200a3bc0506ae04ecd23d5f855fd9f10865f49b2581f7d1f0
 EBUILD railties-6.1.7.ebuild 1625 BLAKE2B 206330aeccd482d3bd6f6bb86848cd682b54bbd545535c16cee31fd7ec8d23260f6e41c6fca2f76e9a4ed7be4895142dfab2ea4094d497b428c77c0b58a2ca19 SHA512 051bd726af1da8e6e636bc51be4c22094546f28b1221f8596100cbbdffb7b37929bc560dcb657079cf7d709aaf21bfadb205b0e844a413aae06145e2deafd146
diff --git a/dev-ruby/railties/railties-6.0.6.1.ebuild b/dev-ruby/railties/railties-6.0.6.1.ebuild
new file mode 100644
index 000000000000..859c33db14de
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	dev-ruby/thor:1
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index b8d266a5820a..d77c624d1895 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,3 +1,5 @@
 DIST sanitize-6.0.0.tar.gz 1353309 BLAKE2B 3056b79ee9611797cb8058f37a694f029e7609b4df8d968ccbece4ffe562c30aa55d9fafdbb9abc1ded86aa0c605fbd48546b8fbedef06272f0184c16f7e9dad SHA512 8a3ce765b6bc0ef8418af785e1fea5ae3b2a32eda82cfc21f9ea36df164c293250fd277ad8ac065757db18ea104b826fcebcbd46d5ad2ab059807e377765476d
+DIST sanitize-6.0.1.tar.gz 1352433 BLAKE2B 91614d3a5fe4f3d3741a8cc8d88a98281a43424132e82932600f4140ab857a0a3492d49ed92205a7e9a05f9eb0b350c30b3b0342790baab0b5f37ab6b83357a2 SHA512 2b43b11e211ddc10c1362bb5c78abd2c8844f3daf6dbb44ddd0731af596a44f7d5883e4f45e3d29c9b8f545794b8a1f98301565818982dadd8c86ece7fd9b2a1
 EBUILD sanitize-6.0.0.ebuild 762 BLAKE2B 6fd102013c51839e84dfc1f02666a9dcb0705e55b29a3f9bb56e67451e2a712422fe9263ace737dea1be5e480bcb770187db19171c82f0f0c2cd7746e6c4b9a3 SHA512 741a86deea6df2402f733ec83e929f6a8e0179c67211b7fa20d9411a70ddf6476434fe6e5c7318a567a83e3221b25d33fa3a08e0c05e204b145ff0418ff965d3
+EBUILD sanitize-6.0.1.ebuild 755 BLAKE2B 56ec4dcfe6246cc09ccdba55733ea992b9aa5b52d62b8a9117147708d83205408cbce86cb0b2d87db5e15593503779efaf9ad521b9ec619bec1ec8081c72380c SHA512 4a8778fefc6fd73d654657ca4ee533acadf49eb82a590e33aaea74367237d3e49caec5c13e2c3765a8fa9bf296d8287a9882ab06d95ba4cbc8094321c15dc5ee
 MISC metadata.xml 342 BLAKE2B 56d8c8d3467a7284a795dbe938e591403576e6e3d4fe675471e2b24b6c2f8520bec8cdea8d7e3182fe6fe8187a6dfb2889befbf5272f76b8f87acc4942a36e9d SHA512 e4257fbb18383d391d7962b3869db25b6875721cad7100dd42f7e10ac72254720c67e1028c13e4fe7517fda833677c1a542e12ff81ba0632b878b851a974c00c
diff --git a/dev-ruby/sanitize/sanitize-6.0.1.ebuild b/dev-ruby/sanitize/sanitize-6.0.1.ebuild
new file mode 100644
index 000000000000..9501168de654
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-6.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.12.0
+"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index 6998a03b3836..4f792bb9437b 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -1,6 +1,8 @@
 DIST webrick-1.7.0.tar.gz 114413 BLAKE2B ff0d09a3137edabde37392d4c8a5e1f37d9899c60db8e96e4034ef60626225c0508c6b2797281878bbb7a0c6db16e20bd46a83b61b3de2ed059cb95e80255a38 SHA512 785e8c6af6e2f8ac497bab6d0ad0e9383fa4c4ac8dee6ceee38e20c5e9b631b805ec3c8f5438ebea651ee4113698de1a370ae506927bdc04e512ea6cac433cd1
 DIST webrick-1.8.0.tar.gz 91072 BLAKE2B 9275458772048d68d5275e19e6c1e2c13bbedaf7acd40bf01c59af282b7cff70d57e99ac49327e091d864cd89ce385ecdff5a4b5d235cce7547da457711df3e4 SHA512 37befe53e9db0a94f99ac54f1243d12c09b9148933e1ad00a52e73e9ba792cdecf3132c1b8cd2a633deecc549a5d6903402ef02ebb67edb296dbd1c5e4bffe5f
+DIST webrick-1.8.1.tar.gz 91111 BLAKE2B eff3f2dff64d017fa0ef5370b07d97bfcd39f1df426a3b04ffdd0b5b0ea43cdd5d267420ea64bd0c3e4de3f1ee88df2f09959fd17b2b158b5ce0ddc16995b2bb SHA512 21cb396887025f85cfe04868e7fa7ef039809ca42a3acadfe1decb4dcd02eeeb3c9163e970324b56a9e0eb6202d971370af56e200c69de2d224c1941f866400c
 EBUILD webrick-1.7.0-r1.ebuild 770 BLAKE2B 78488e24187be0bc9ed296eda925e371bc4dc3b7a5b02bc41ecce276828d7f51ffc41d0842a624c79a055906b4fe11419c65369a5de9d502fb7d1a19864d7540 SHA512 bf6fe6372db6e91af513bb5b255dba9fab059798a1d3bfe00442aac7c32bd19a5205ffd4a74e10bbb599a0f009c294cd7fb47da52bc5bbd2072640bdf1e6c187
 EBUILD webrick-1.7.0.ebuild 755 BLAKE2B e0ea0a032e26ee51dea80db46f60df4ad19e82a30d0192e69bea26bd2704a496a89e8fbd9b1e197357c852b1423830a9b6a71ccf5cdbdc74fa1dd9d88cf0be32 SHA512 0ddbc1917d25e88e6b61bb3797269e22a076b1d27e5b2e068d6cb6f921146a8efafd264fafdd92bc637eeee5403453a8b2a14a95ffa013a6e49bffe9bd103815
 EBUILD webrick-1.8.0.ebuild 763 BLAKE2B 7ad3d1e2420871eae3f80ea58287e7e92118dd3eeb00ab5f5da359752964084021b6012555368c98650be0b98ea9ac4c8f0448c7c5ff928568c81c3ec2b8f806 SHA512 f4ea8d3fd29e76b422d274c345f3ed3f63ace84a3e78e31aecf119246a6b31266b01d24b7a987e1bdb80d3422fd8afc6d0e1b1b234d4df320e4f47a4cdfe949f
+EBUILD webrick-1.8.1.ebuild 763 BLAKE2B 7ad3d1e2420871eae3f80ea58287e7e92118dd3eeb00ab5f5da359752964084021b6012555368c98650be0b98ea9ac4c8f0448c7c5ff928568c81c3ec2b8f806 SHA512 f4ea8d3fd29e76b422d274c345f3ed3f63ace84a3e78e31aecf119246a6b31266b01d24b7a987e1bdb80d3422fd8afc6d0e1b1b234d4df320e4f47a4cdfe949f
 MISC metadata.xml 339 BLAKE2B 818ee09423c4ed53677cff830ae592234879035757260fa554871e0180d47780056eb8c301678428928a841638059507ea2b170abd758f8c73546fcabd675b49 SHA512 4abab733deab5e4609430f0d51f7634fda1879be7694720e683b0d9972691f41dbfe7fe9e7d252cddb9ac5a449bdf521b0d3b10acdf510e02c3b3a8bad578b71
diff --git a/dev-ruby/webrick/webrick-1.8.1.ebuild b/dev-ruby/webrick/webrick-1.8.1.ebuild
new file mode 100644
index 000000000000..968dc189a545
--- /dev/null
+++ b/dev-ruby/webrick/webrick-1.8.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="webrick.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An HTTP server toolkit"
+HOMEPAGE="https://github.com/ruby/webrick"
+SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3cc3d2b49d0f..dafa040528f3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index ee23fca2bc09..9bf816705c54 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,9 +1,3 @@
-DIST bats-1.5.0.tar.gz 108052 BLAKE2B 68bba9d263e4206ead7039da2b09c5211c834445efdf429dca6c53acc5409de1052ce7ffa9143e732d3aeaeb6ea6dcaf9b419adc02776e601545557dea776e36 SHA512 e0386fb32214db67ae001a2040c44277988af7fa909a820843237c7d47eedfa4e370238d5b2d06a4667b874cad4b00f2cd14624b1bc45628192e5d693bd5073a
-DIST bats-1.7.0.tar.gz 124590 BLAKE2B eab244f018ec568c280d20540013eaa9e5a8d84ead8e23b9db2f8d18bbd7ebd43c60ab38cee008e0d016a219f16aa6f52733d5f891ffb8733ca8576a5738dd22 SHA512 22ca033e004087cabf645417ea184d2e1a0704575f702a94de5b63b3af6d1fd4caaecad86a5cb49687c606728d875dd13b4d5de66599b83324980fdc71cb92e2
-DIST bats-1.8.0.tar.gz 144262 BLAKE2B 4f12d4c5211535f11a3cbc856233a59e0c3bcd892c6f021055458960b450f908f3b865cee38ad2c2569be41ab81e2fdb973003be85890f70f8894c8a17812b42 SHA512 e51ea85bf2f455881a90220d783b4a261bd91331326a7184eb31ea9adf31c18a79a062fd77af12d082ccef953d992382ec19ca9a27395b2a03c4a9a120bdda76
 DIST bats-1.8.2.tar.gz 143952 BLAKE2B 0c2302f2c77f5ee0446a6559355d24fae8bb2f178b5b17778fea44ec2f069c061c2930814f73e56671bf6f7cea44a74cea9b6436ca80941a1747197ccddcec02 SHA512 7eace32f19789e081112af1ce8ab33ff210d52bd3ea84962bbec226349b3b8d8912b6a495f5524f9cc7cfe692f1d23d684c93c24e182752e2b30731670d6eeea
-EBUILD bats-1.5.0.ebuild 939 BLAKE2B 0750c121bef1d633f9b5eefc3074b091c195ed9e79a2c9c1108dabf67cb1b36b3f9edbb1c051016241ef8323319fb98ac67e899073dae9afd6b1fa6b313224a0 SHA512 a7a9d1f19f587d6164b6bce7f45ecd3c9d72d8ed02e19ec8b41cf1ffb6a931f5c49a083f17ddaea40a39f4eb65d4e23b800e6227cacfa3280b56393d95a77ed9
-EBUILD bats-1.7.0.ebuild 961 BLAKE2B 9784652ae9dd598080e0e6eecadd271f1339d07d578c6cd7002c15ca72d5ca81b2898fee0bf43d1187ccdfaeab7850603ab9aa9e6078b6daec1f73c27e8da305 SHA512 a893f28d5d1734476b2ae7361b28870b30731cc3ad9cf8a4c29d6cdce5789af44a4467840e743df1723aef15f9b1aaa15c60cea237934e34fedf961fbd08c328
-EBUILD bats-1.8.0.ebuild 962 BLAKE2B e564d5e54a8cd1b3761a872a2c9050bee6e8397ed0c3a650ab38116c919094aad9ee1cd7dfbe375afeb06ab1e013dde960102c3198fa37308cf3f66c44b69429 SHA512 ddf8d88853f77f71041467ec3c51b11706755603760da354ab8a941de5209642e919a87f41ba9fe8eda3e9895951584872f64e3423d0dcfcd671054df8dfad73
 EBUILD bats-1.8.2.ebuild 956 BLAKE2B f61beee7859da93e9cf8eea900c639c8f62e53ab8d25ce0d2e529744dc3c7deb05d6c8f988b954fe81bf9ddcf9a52c4c9ea91d6ee450ccdaee4bed42ede3dc0b SHA512 771519c4ea68640aa2ee10a4f01b49adc661d9d2b3aa158f518372fef1fcf81dc15fa4f32f8077e2b6fcaa6c6dbdbda5531d76a27f1b049ca5896013145a698f
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.5.0.ebuild b/dev-util/bats/bats-1.5.0.ebuild
deleted file mode 100644
index 250afc44096b..000000000000
--- a/dev-util/bats/bats-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing optfeature
-
-MY_PN="bats-core"
-DESCRIPTION="Bats-core: Bash Automated Testing System"
-HOMEPAGE="https://github.com/bats-core/bats-core/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-
-DEPEND="app-shells/bash:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_test() {
-	local my_jobs=$(makeopts_jobs)
-	if ! command -v parallel >/dev/null; then
-		my_jobs=1
-	fi
-	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/${MY_PN}
-	doexe libexec/${MY_PN}/*
-	exeinto /usr/lib/${MY_PN}
-	doexe lib/${MY_PN}/*
-	dobin bin/${PN}
-
-	dodoc README.md
-	doman man/${PN}.1 man/${PN}.7
-}
-
-pkg_postinst() {
-	optfeature "Parallel Execution" sys-process/parallel
-}
diff --git a/dev-util/bats/bats-1.7.0.ebuild b/dev-util/bats/bats-1.7.0.ebuild
deleted file mode 100644
index 5115a8c81337..000000000000
--- a/dev-util/bats/bats-1.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing optfeature
-
-MY_PN="bats-core"
-DESCRIPTION="Bats-core: Bash Automated Testing System"
-HOMEPAGE="https://github.com/bats-core/bats-core/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="app-shells/bash:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_test() {
-	local my_jobs=$(makeopts_jobs)
-	if ! command -v parallel >/dev/null; then
-		my_jobs=1
-	fi
-	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/${MY_PN}
-	doexe libexec/${MY_PN}/*
-	exeinto /usr/lib/${MY_PN}
-	doexe lib/${MY_PN}/*
-	dobin bin/${PN}
-
-	dodoc README.md
-	doman man/${PN}.1 man/${PN}.7
-}
-
-pkg_postinst() {
-	optfeature "Parallel Execution" sys-process/parallel
-}
diff --git a/dev-util/bats/bats-1.8.0.ebuild b/dev-util/bats/bats-1.8.0.ebuild
deleted file mode 100644
index d42eecab71cd..000000000000
--- a/dev-util/bats/bats-1.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing optfeature
-
-MY_PN="bats-core"
-DESCRIPTION="Bats-core: Bash Automated Testing System"
-HOMEPAGE="https://github.com/bats-core/bats-core/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="app-shells/bash:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_test() {
-	local my_jobs=$(makeopts_jobs)
-	if ! command -v parallel >/dev/null; then
-		my_jobs=1
-	fi
-	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/${MY_PN}
-	doexe libexec/${MY_PN}/*
-	exeinto /usr/lib/${MY_PN}
-	doexe lib/${MY_PN}/*
-	dobin bin/${PN}
-
-	dodoc README.md
-	doman man/${PN}.1 man/${PN}.7
-}
-
-pkg_postinst() {
-	optfeature "Parallel Execution" sys-process/parallel
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 2554a7f78dfa..91ca18c58610 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -5,6 +5,6 @@ DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805e
 DIST pkgcheck-0.10.20.tar.gz 549746 BLAKE2B 72ed97d93674ffd311978d03ad3738494a752bf1b02bea5eaaaf1b066c48e8c9ec5f82b79baeeabf3e56e618c76614ee6179b7115d1d875364ac6e3fbc3c6028 SHA512 6a8c135ca44ccbfe15548bd396aba9448c29f60147920b18b8be5aa5fcd1200e0b75bc5de50fc7892ad5460ddad1e7d28a7e44025bdc581a518d136eda8b0df2
 EBUILD pkgcheck-0.10.19-r1.ebuild 2304 BLAKE2B 78ddd76b86dc0a9d3b065340829fc1011b8536aa1fe520ceed432cb04ca6ead5c9ba56c26ce0a14c2445a51f15fea9686a102e0150a279b616e042a637bbe29f SHA512 c2e2a88b3cada968782bc1f070d3e6572fe87a3763da08c14de8ae6bfddd3b4e88dccaed733b568395f65d415620b5b4a25cacc261187c4e3d37857005dfcda9
 EBUILD pkgcheck-0.10.19-r2.ebuild 2372 BLAKE2B f655d02fa3cb3a1171d3f8eb81085f9b807c5f72c7f2e8f4fca0206565f123a93bc85e6624580c4a52708f5e74eacbe8de27a952dfdaaaf648ae2cbe019173dc SHA512 d9f1f4e477abd4593d553446c97fc918d20183182f318d2a381cc673851856c463f16ff0f3a7b414caaf3ef2bc62af9acb3a9bfa1dbedcd32b3ab83dd00d6080
-EBUILD pkgcheck-0.10.20.ebuild 2262 BLAKE2B c4f8ad4ab0e05d8f5f6476935fcf34ae7cf5d3ccda0c4895a20ea8395a52ed9613d239e4d7710ede116554cd96f0ae9d8a4a17b7f917cba50a57ba0d009124e1 SHA512 52cab6078b2e32ae17267e880d4fa19aeb951c5d0edbd4fa4bd459e9bd99fdd857ba0d51c13dfa044a9bbdc0b7820947c32b94155fae5ecfbdb1f8ad81849aca
+EBUILD pkgcheck-0.10.20.ebuild 2254 BLAKE2B a78e64a63932339c482ff439bb090ef2659d2ea3eecb6bfdcdbe6380947c283132fe7fce4c624800ac26e63a176df0f26e8858ae7c7e02eee8561ff6726879ac SHA512 184249aedc453e00059455951c62591086faa49e4bbb7e22e8a1498ce4c80832506859162805ea89e8fd21f43afe29a95593b9d57464bfe4a18f82019fc67cd8
 EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
index c3d2532fb01c..ee894bade2d1 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 25ad526404c1..3bb356593e84 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index ec7b0005835b..af309b4245d3 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -7,5 +7,5 @@ DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db
 EBUILD warzone2100-4.2.7.ebuild 2678 BLAKE2B abbd712501c57c331e199ff6d75ecfba88660576549f181e21e8e769f0525d2096b9781434031a10f1a8990313ccad49a609258ba8099836e4d8499726c396a7 SHA512 f30803098c061db711c06b007cb384d31c9a4888044815308ea74cbaf748cba05db41b3b90ba7a400b32a82155379ceb1f5bddfeda628f160aa19b7a4c5377f2
 EBUILD warzone2100-4.3.1.ebuild 2737 BLAKE2B a43686ac02cc569b9a394613c9d84c370ace499da95c11b1f4b24f70094db8cc35acd954d9d08c47055a6815ee64ee9f217d841b05c2f12392568dcdbcbf050a SHA512 f096eb5d1be3eda53ef1514e5c2117314ccdc4475d56180329629c031533edc2f82d92bf6c9437b675f0a32396633218ffcfff4700f9370fc83f61c9c0ca69a7
 EBUILD warzone2100-4.3.3-r2.ebuild 2816 BLAKE2B 8b3df9615983109685193bf4049cd610f4630bf3a8b1037ee6562bfcb5814c712493cb33bc9b80afc7e675555bd5ea5f335dc6120889ee153b7a383b8882ddb4 SHA512 c2de63773766712adf1c5ea5ad847f080818f8065aea6b9c04953411422d77d3461ffcc4a6c5c51e0545e07612cd723e6da5795e85a6ee97be15e4f7c8a26989
-EBUILD warzone2100-4.3.3-r3.ebuild 2796 BLAKE2B 8aee3a3a031eede114b721add666549487a105b03e54b04bad46fe78d4c2bec81891949ff257e093b7d4531a197d8314a3ad5656066168b521a32c6228a9184b SHA512 be94af6386f45ff996b102f269a23dbf0dab0e67fa1a33a926d16a9a0fa8a9d38e54f884f492fc6e9916a27995c2a6deaaa775f8184b114a0e74104379903bd8
+EBUILD warzone2100-4.3.3-r3.ebuild 2801 BLAKE2B 81ee7ebe85766b0f30e80f7c6763fe8d8184be88eb5439fa730fd8466f7c199dc288d10842a8d1b92b70d19cf36ac53a45fa250ff3f3ce2c6cf91906ca9285b7 SHA512 239961ab51889492c083d1adee8c94d5a7080e81b4292afe2e959099530108c785e5d724c6f4968eb5d28fe4259ae0806037c5d5eed3da03d334b174d3e2133b
 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild b/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
index 728e1a377b03..3c5a613b3679 100644
--- a/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 # Upstream requested debug support
 IUSE="debug discord nls videos vulkan"
 
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ff70f332695c..f33af2fe256a 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/basis_universal/Manifest b/games-util/basis_universal/Manifest
index a68a52bf284f..f98dbe9790b5 100644
--- a/games-util/basis_universal/Manifest
+++ b/games-util/basis_universal/Manifest
@@ -1,5 +1,5 @@
 AUX basis_universal-1.16.3-fix-RPATH.patch 332 BLAKE2B 46349fb09343dfd28dfb383a7d21a5abbb64245f4ba85012f3bc97084740bb8dcbbbb2432902f27863c5a80cc04e3f2b3569dc13ee97b498932fd75182c7a6a2 SHA512 0ab6e03146c5e924644112200b6c0b6cce3f9ab5797be4a052994ee553814c128b74a1e91f66f248af21c496a4407267d0b27c46bc6c29bb1554a66581da3f58
 AUX basis_universal-1.16.3-respect-CFLAGS.patch 556 BLAKE2B b9e099ddcca8a5902da78faf293b953f231c2d05c746f6ff105a0db5dcab07009276c76f8a034a22aa42ac063850fbfaba905ce1c5022aff4e0889b9f2546123 SHA512 5eaa8339b853fb14fd5efd2596ae7221c648203fb253678c0791d7b6278e3ea55ab3d275ee28c2c9a704a5d23dc52e7f54e825c2d8de86874f79ecaced37e3be
 DIST basis_universal-1.16.3.tar.gz 29151155 BLAKE2B e3ef3ead6223aa73012bd74e51dae269746cfcf2720c524be8096ce8643777723888f98a140d2e28c881ed60ab54b7ea6fef4205b72757d72e766f85806b4484 SHA512 3dca02ad6c14e74df7a89d3b2a59b970635cf5e268b96eb91b10033e2b8e635c83aca6b8e9b34a1b689ed5ffe7c8348d15b8524385f6d07a51cc34a46246a0b7
-EBUILD basis_universal-1.16.3.ebuild 1049 BLAKE2B b9cc79ffff04195f5c2cb66bbbf70565e4be2537bce3780cdcf2e4ab0d58bf41d29d7c2af8af1927a9cabae3ec29e6e9e927aed9b2a19c977b32ba83ff8c7bd9 SHA512 b80b6cfdab06d9c94d909fdf8a761f480cab07883c7aeb92dbba37e7741666668fcb74d038bf28ca599d8c22d910e84ac475c3eca8f491a2295cf706b26331a5
+EBUILD basis_universal-1.16.3.ebuild 1054 BLAKE2B 01e96f18229d358ceaa35429dd43453d4ea17def4b14836067e9a77416ad384f518c16208b090dad6162996fe21f3276aa3f3567e216559175bc29131b6b8a81 SHA512 17779d73995ceba80ca92c1a71f7ec0e655ad1cc1aed81648bd3a854c2ff13629fd1592fe987038797ed8afe3b07dfa1a08740da2a53c7bebd009de0ddd4a52b
 MISC metadata.xml 412 BLAKE2B 00c914af265ebe97107ee3ed185ae7693348de4902d557beb6590efae0b1ec351baed1fd02facb6605b390fff36ddc40aa49ff1786472ccd5376d16abd522540 SHA512 1a971517dc0b642e254f2acab248d9364b510b16b80fe095c320d552869f6e8909343fd6e62a1896c344d57d7f4624e10f193c3b4f3b7689eb5b669b85517998
diff --git a/games-util/basis_universal/basis_universal-1.16.3.ebuild b/games-util/basis_universal/basis_universal-1.16.3.ebuild
index d89b78821f60..298c8ecdb705 100644
--- a/games-util/basis_universal/basis_universal-1.16.3.ebuild
+++ b/games-util/basis_universal/basis_universal-1.16.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BinomialLLC/basis_universal/archive/refs/tags/${PV}.
 
 LICENSE="Apache-2.0 zstd? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse4_1 opencl zstd"
 
 # zstd is bundled, see https://github.com/BinomialLLC/basis_universal/pull/228
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 501d20e0b17d..3e36d5719909 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,7 @@
+AUX lutris-0.5.13-webkit-gtk-4-1.patch 537 BLAKE2B 17d233876bb859bebd34845845ee0668ebc0f41aaa53c9e1353a9a24f9ed5beb134249cf95e1ddf0dd25ce0114f2ce765959019c00ef4cd822035e215c1d5733 SHA512 e4b4b8cb31b0ba8ad1ed64581ae6194b5f1f5edc677f33d8fb48f63b0702e355ad4a6f782a44c74c4ebd3d20dd9494b520dbd852e98ac35d53331a5e5b59cbe1
 DIST lutris_0.5.11.tar.xz 1337572 BLAKE2B 9baeaa078483812c25754691cde80324155a69fde7edc1aec043df806ceb0cbe05e04c71c73d9ff355d2aaa2f21d9e53871a1752b02022ae8527b69ed31cf47c SHA512 16b06f6a3377bfa8db5c3b1e1b3872cbfbd5e7ff27975b51083142dce9931c90a9827f8da7b2d9ba7b21e65bc4ca1759f6a720c142a01f99532274e152cfde0a
 DIST lutris_0.5.12.tar.xz 2252220 BLAKE2B 511de660e32ab8961d951d5777ef21a343ab46736cc74f2202721f3280cfab39cac0a8a7003db4eaa48265f4af2d598c1011ce45988815624accda18663a2f00 SHA512 032f9b628bc829bfde347c8137cad80a28cad16651baf461a344045d23c0f19d860627a042225de16046d14d45e03e5ebf7a3a82010128c114e2a0f429a02bf9
 EBUILD lutris-0.5.11.ebuild 2210 BLAKE2B 42c05470a8f8942f9501312298db1d1df30215e9026e7df5216f9f2cf2546975257d56d224f731c9c5303f86f96235a174cd4eb0f6eba69bf7b7986f64fc3c75 SHA512 f1e1b5517ff5f33f139ed26992175b1db9e7a61214df9640aec47ebeb69d1951a3d570d9e3796ee8edc013a2462bce2886f37d10409716db127cad278ff2443b
 EBUILD lutris-0.5.12.ebuild 2173 BLAKE2B c3a091535f2f8c7b53a652f25e22ed1ca592c9aef0a200828f1e4a77d085a1d66112018a12195a69d4417e27519ec1703ad471b099e77816e8c90d5204fb185b SHA512 7354be6e5bd7ce057518498e77b807019a5c6bd6fb6865cf8d32363dbfbafc2e1a5310dc16b8e62cfc5cc50134c160ceb63d38d1c629d7779581733cea123640
-EBUILD lutris-9999.ebuild 2134 BLAKE2B 1bd15b681d00c718cf8d0b9c8b1797c4b10613e7c322a9650d53469ef7d3266df1820c044f95fd45110ddd9dc83b6b5eb519a6d823929534fac586a1e3b18626 SHA512 fc5eeaac06a3495391fb4b711bb4c224a2b8666c699a63b678802cc9a8e9d0f9b674bc49f179fdae614f0d092c87fc45a00b42e7f02ce99a2f897047cde6d8d9
+EBUILD lutris-9999.ebuild 2352 BLAKE2B 62b012bd649b4d976abcfe9f04993098a760d9e2f9c94774941f2603c19612b959ec81b30fac2b7be66aea7c049174e056ed3f030be70b5a1ff1c3bd74b3cca8 SHA512 1e85b4a8390600e059ec3890a5b3735e1051bed62fe4605a91c7c2abc5b7727a50b0f595ad19c4f9e11348a804f6d82ba2ad523f9a85172ed3236b72a827db9c
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
new file mode 100644
index 000000000000..9685a826878b
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
@@ -0,0 +1,17 @@
+diff --git a/lutris/gui/dialogs/webconnect_dialog.py b/lutris/gui/dialogs/webconnect_dialog.py
+index 12fbbdc..a6cd838 100644
+--- a/lutris/gui/dialogs/webconnect_dialog.py
++++ b/lutris/gui/dialogs/webconnect_dialog.py
+@@ -3,7 +3,11 @@ import os
+ from gettext import gettext as _
+ 
+ import gi
+-gi.require_version("WebKit2", "4.0")
++try:
++    gi.require_version("WebKit2", "4.1")
++except (ImportError, ValueError):
++    gi.require_version("WebKit2", "4.0")
++
+ from gi.repository import WebKit2
+ 
+ from lutris.gui.dialogs import ModalDialog
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index e1ea8bd1147a..0b268cfd6c78 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature virtualx xdg
 
@@ -34,18 +35,23 @@ RDEPEND="
 	app-arch/p7zip
 	app-arch/unzip
 	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pypresence[${PYTHON_USEDEP}]
 		dev-python/python-evdev[${PYTHON_USEDEP}]
-		dev-python/python-magic[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/moddb[${PYTHON_USEDEP}]
 	')
 	media-sound/fluid-soundfont
-	net-libs/webkit-gtk:4.1[introspection]
+	|| (
+		net-libs/webkit-gtk:4[introspection]
+		net-libs/webkit-gtk:4.1[introspection]
+	)
 	x11-apps/mesa-progs
 	x11-apps/xgamma
 	x11-apps/xrandr
@@ -57,6 +63,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.13-webkit-gtk-4-1.patch"
+)
+
 python_test() {
 	virtx epytest
 }
@@ -69,7 +79,7 @@ python_install_all() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	optfeature "running windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
+	optfeature "running MS Windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
 
 	# Quote README.rst
 	elog ""
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 796a1e64b285..ac079c93b11e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index ae214fd74dc6..997c1537f49b 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -7,8 +7,8 @@ DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5dd
 DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 30d1725c2679e8a0b44edd6c30b15f28633c0a017935980d1412dabffdfb1f33e1c36bee3506e90af54410db222b64422155be821ba18f5e315ed411d477ed63 SHA512 83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b
 DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
 EBUILD claws-mail-3.19.0-r1.ebuild 5624 BLAKE2B 6954f91b60edbeea184b9b913a21a37475da2fe8d500c92af5a52417b969bce61e4e57a6f9494a7e7de6a1196f0a67b7202be6ff36f91e1fc1e5e69a31873464 SHA512 2a28ddba0e6949046972e3c4f33e73e74fd8232f125c214f639a18c2ea4c7ec04aea5082cbc55ce3fc812bfe12b92ba895593f2d11d3887969ca763449d8c69e
-EBUILD claws-mail-3.19.0-r2.ebuild 5672 BLAKE2B 3fa5f64e551626918901db2dee4622bf3a941635a62a8cd0f8c7500beb76085926921dc0510d3d12769eb58ad3bb1126a119c66915e71c2f2eade94f996cabd4 SHA512 2011ce47d1c4513e901b49d2c5c388339128aa00d847d20ec3e7da3e87f4797dc1964a5f58c9d055f8d3807e155c686ef9466ff81a174d08da44fc33e52c78cc
+EBUILD claws-mail-3.19.0-r2.ebuild 5671 BLAKE2B 5f508a5842abb4a8888bdbe7c0231a53135fcb569f03bb4d19fae7007fe4f2e255c148bb5b6f2cb164da649d0da41e514c25a48f31fbdd35982422900c600442 SHA512 f329414919bca9b94205aee917c55b9879184aec70b1aff67501e12b0fcf6895974ab4060a1b9f098037e3f79fe075c550a77cc85c43656e26465fedc8d90a30
 EBUILD claws-mail-4.1.0-r1.ebuild 5797 BLAKE2B 71ee869074c952f08dae67c031fd303befca46cfdfd9ed3ddb5ab41d5c195d91c7a0c6e3acea034c676831813f20df2cdafe69c7b3970725828fcc19460c344c SHA512 978ee5c6121bbb009cbbb28bda8fabffb662ef1f428ca239f243a944cbf17484d2e7526b611f3f4de3f2dfe5382d42c0a16b53096df964f36d1a5b190825835f
-EBUILD claws-mail-4.1.1-r1.ebuild 5703 BLAKE2B 815f6113c9d1304f11a190bc613eefb8bf8044c47dca3d99fb177e82a81c841cc12f709f63df29a4c3a5d443816806df57a45b6576d3716f9af4f0772567e2d1 SHA512 bba1ab8ecb33476996fa08daa04629c14f7411017d6c4182819f021e763adfc63fc1fa8b725a494f561f324a14a563ddbb663ee6da2ac2671bfb7576d1861518
+EBUILD claws-mail-4.1.1-r1.ebuild 5702 BLAKE2B 5391aa30f88eb39f1829f094a9f77eca5fbab25bc35c4d3fbb74f10575ca6db96f71b68aff071453feee4fc07564a9e80a53eff600a9a197297105b894f690c1 SHA512 0160665cb487bf297b6468abef0d02be817c4073b4c91fd977df810ca89f3bff2b953eb5d54b73fbe9f1c2916bb6b424df614a5511e012178563703ce9f77c97
 EBUILD claws-mail-9999.ebuild 5745 BLAKE2B d1ed79ccfa73a87fda195dabeddb4e8853bf4cb7cbdb369496f4400bce739c2e77bf7e860ae5f38d3cffec359f2fec6ef1e6d3e0fc7a66c37b4c0e70c03ada88 SHA512 3150eb268c02478ac5dd12101699c2b38330485d8c9625929fb0a164050cd68497b13b1c9169cd87789c8b1d74053dbb46f3b79a748c86380ae7f7250f18a0bd
 MISC metadata.xml 1445 BLAKE2B 2c20d83b5af1f03c791c733c9cdaa970ea070fe9ee63cfe4d8f4b2c5284bb791579fa0629f1b70c336440b8a8dae7c70d460b906fc34e7e314b074b67ae00523 SHA512 a956df8043597fb5be434fec8747c49088fdd82ea8c7d2a32d8b9a3d88d058cf4bf8cb3a8cc77463ebb8484729f155c258f58dd581b96eb0703de1464ead73b9
diff --git a/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
index a459e97ffd2b..f319eea382d8 100644
--- a/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
index 23a6fa0aa40d..413a3219729a 100644
--- a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 SLOT="0"
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index ec077543296c..c09e39664112 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index d368f1d6c8de..59465c2b4511 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,3 +1,4 @@
 DIST mate-indicator-applet-1.26.0.tar.xz 383936 BLAKE2B 4435c8e2c4acf5cd033a9f85b39a2f577d9861124fa47e22bdba970fb61c9ce5fe8bf31bc87a47a8a8f82640905c50b316f35f572a2a4a83830c8f8d110b80fd SHA512 677586b4090edd22871eb034b923795a01030a5270e633a11ed711171e49f487047fbf75daf1d69d491660bdf63421b900e06fd806eeef93df101058c0130c06
-EBUILD mate-indicator-applet-1.26.0.ebuild 528 BLAKE2B aec0668f17b41e0f3bea9725539bda2cc0d4d3d17b8135e6c145516973fc1ce9b63de24b7a735357594dca70eeadeb86d93c52b7ffa2bc3efe4f2199b95c2348 SHA512 2068365ea85a0e0f8443e6e64612d20cf8e72e1fabcfcba0cbdae826f8817c48abf3b860439cd17f2f4d7dfc6e5a0862740104652c3dadf74b050bd32dcc6023
+EBUILD mate-indicator-applet-1.26.0-r1.ebuild 603 BLAKE2B fbb7878b316737a6c792b709e738197f34e45ce7d58d4a8b6806f473e2771891943fb0c012856a384686b3de33ad03d89bdd5d2c2ca919182b405df148911eb9 SHA512 c70c6430c6b30ad68b689c034b94a5340d91cb3254c54e925010865b50ff429cdd2bcb0473d3b0e9edc7aef1ed116296b69293c9112cbf715af9d3c46ef8fb9a
+EBUILD mate-indicator-applet-1.26.0.ebuild 598 BLAKE2B 9259bc8c3075e17a05375c90f824c9c8c5c3e57a17cc0b360620271e804f8fc9be738d9f506f1e06886b643fdc9e0ab9c562b375660977955d2457ded1a5f19a SHA512 4e89730425d342f61c683f7e276407dbbe4868e077016730479f01f15ddb15b5bfc51e57ab675d3fa529589abab87f76a6edb12112367f41b57a8fcb2400e024
 MISC metadata.xml 351 BLAKE2B e48e460d9a4129eb19a7edb5659e7ca8b3bdb62fe6b00e3366be15716c6283ade2707b5a1d03fa9be44cc95ee506a15ff267c7b3e764f71e9f67ba3ca1f4c98a SHA512 2538efec96a0fe9ffb744536b92ccaf5da779efc46a0731849ccbf11348a590d2ecfbf3abc55ba9063ffb96eeca7ecb379927e192371cae681d56dee170a9870
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..95ffd6971d79
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE indicator applet"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/libayatana-indicator:3
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--with-ayatana-indicators
+}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild
index 9313f05140f6..bdcf9fbb50de 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,3 +29,8 @@ BDEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+
+src_configure() {
+	mate_src_configure \
+		--with-ubuntu-indicators
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d2010b53591d..b24d1bc8e509 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 0a7344cb3d5a..66b7125ba34c 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,4 @@
 AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-EBUILD avidemux-core-2.7.8.ebuild 2543 BLAKE2B f3cd069695b889965b17e49a4b27558ad4ab2192d93ecdb1389fd6ce817eefd85e66b1ea52179a6c99e9e0c71e5d88625220a25ddec7d0a38b38649dc090e8c3 SHA512 9d134fd799e3d725bc0c5e24350513ca44df1b6662ed4075169e5e6f3a8eb2dda695970e232d26f1f7762a08f2872a13cf6786214d81b1f759f28b41b6c475de
 EBUILD avidemux-core-2.8.1-r1.ebuild 2645 BLAKE2B b655685a9f40e0c20548a9a6ed469fbc8ccbd486351c119ed39d5dfea918d7773aa58439b5b138c0346c8aece9a290a2f6be6f13758c59d8d390f6bf72cd6bb4 SHA512 61555c094b8aa32ad1e45988f9ddeb74c88779ac40b36bf3b420b67b857b2d985f97e0378e0d2804bf207c3a2a5168f17a41c2a760a6812e631ec36fc0112858
 MISC metadata.xml 445 BLAKE2B e50f517d52c143a715503c3f235371a7e03de54e6eba1da6eac8101cdf28392247ed4fd80c2abc51639394c5883b9c123810597ac9499bba0760ed34ebb0013a SHA512 414df3edeaa635e37cbab1a7de5edb214f258e16f89bb32f5d820474017e54f2f3eab48929e505ea9fa8b6aca1f7e608cc558ca6147e605272c2fe644798597b
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
deleted file mode 100644
index 062fa0231f9c..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
-	dev-db/sqlite:3
-	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( media-libs/libva:0= )
-	vdpau? ( x11-libs/libvdpau:0 )
-	xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="
-	${DEPEND}
-	!<media-libs/avidemux-core-${PV}
-	!<media-video/avidemux-${PV}
-	nls? ( virtual/libintl:0 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because
-		# it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove bundled ffmpeg."
-
-		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' -i avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -e 's/include(admFFmpegBuild)//g' -i avidemux_core/CMakeLists.txt || die "${error}"
-	else
-		local ffmpeg_args=(
-			--cc=$(tc-getCC)
-			--cxx=$(tc-getCXX)
-			--ar=$(tc-getAR)
-			--nm=$(tc-getNM)
-			--ranlib=$(tc-getRANLIB)
-			"--optflags='${CFLAGS}'"
-		)
-
-		sed -i -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" cmake/ffmpeg_configure.sh.cmake || die
-	fi
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-	# Bug 768210
-	append-cxxflags -std=gnu++14
-
-	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DGETTEXT="$(usex nls)"
-		-DNVENC=no
-		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index b067d006f8a5..c4b138756750 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,7 +1,4 @@
-AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 AUX avidemux-plugins-2.8.1-optional-pulse.patch 701 BLAKE2B f94196fa42fef5b343ba73e7d61bd34b0e0afcfc07b22fc5396796d009b955f99b09aabf84eb6e1e8cefdda805c77fd7854362e2485690f053bd270388f77902 SHA512 63a18c57242e5fcf91c99ea66a4879348a465f33f00d635a2ba18f176615173aaf9d93eb7748b336395dff87a2c69c46d867dd076951bdd3193486a7beb019e9
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-EBUILD avidemux-plugins-2.7.8.ebuild 4280 BLAKE2B 99e36cfe603fbac420c0e3a247498b3b0bbd02f846ed00cca24f5c278dc7f0f3686e97c2428035407628afd7f140aebbaccf6db9d14ac9525e1d24f9463fa959 SHA512 ac228458a47ddb823d829d4689d081e86977251c649122969fd8e4eab24def1203d199736cc14b0d0dcf1fb1410cd3ce9942e82ec3eeec0bcf4c8d3b8f3577e1
 EBUILD avidemux-plugins-2.8.1-r1.ebuild 4391 BLAKE2B 5f95efa763bc5fc9d723591b64561c50c5576926d70e57b3c16cda1973b26b6f01b54945668aa04b84834fe39d055c364b1dec26e1bf8b032e2b28ec58b58284 SHA512 f2ea4a97c9161293466d4d8a3c7e33ffb397bf5989301f3d45041ff6176511fea80c10114853e42bda7832d36b01aaacdaa2bf5079e4b82b09a2d2d1fd3c24d9
 MISC metadata.xml 1247 BLAKE2B 111170a1b044ca6e0aa8fbdc83b38978ef426a3051362f5c7b80f0831dae10a7ebb90bff81b5ccaa6648aa562f098602d81d8a39510b4cc55d6c84b9846b5a66 SHA512 36a42668b022e5d3d0d8639d2b41eea103721b47e3e9cc1366a594a623b04a393d30dc212147ef744bce11d4a38af06bd4a2c3d23fe7455bd506aba760a0a1b1
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
deleted file mode 100644
index 78b9cd9f9345..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# dev-lang/spidermonkey is not required anymore
-# see https://github.com/mean00/avidemux2/blob/master/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
-	dev-libs/libxml2:2
-	media-libs/a52dec
-	media-libs/libass:0=
-	media-libs/libmad
-	media-libs/libmp4v2
-	media-libs/libpng:0=
-	virtual/libiconv
-	aac? (
-		media-libs/faac
-		media-libs/faad2
-	)
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dcaenc? ( media-sound/dcaenc )
-	dts? ( media-libs/libdca )
-	fdk? ( media-libs/fdk-aac:0= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi )
-	jack? (
-		virtual/jack
-		libsamplerate? ( media-libs/libsamplerate )
-	)
-	lame? ( media-sound/lame )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx:0= )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-	)
-	xvid? ( media-libs/xvid )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	oss? ( virtual/os-headers )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	!<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.6.20-optional-pulse.patch" )
-
-src_prepare() {
-	default
-
-	# Don't reapply PATCHES during cmake_src_prepare
-	unset PATCHES
-
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
-	done
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-
-		local mycmakeargs=(
-			-DAVIDEMUX_SOURCE_DIR='${S}'
-			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			-DFAAC="$(usex aac)"
-			-DFAAD="$(usex aac)"
-			-DALSA="$(usex alsa)"
-			-DAFTEN="$(usex aften)"
-			-DDCAENC="$(usex dcaenc)"
-			-DFDK_AAC="$(usex fdk)"
-			-DOPENCORE_AMRWB="$(usex amr)"
-			-DOPENCORE_AMRNB="$(usex amr)"
-			-DLIBDCA="$(usex dts)"
-			-DFONTCONFIG="$(usex fontconfig)"
-			-DJACK="$(usex jack)"
-			-DLAME="$(usex lame)"
-			-DNVENC=no
-			-DOPENGL="$(usex opengl)"
-			-DOPUS="$(usex opus)"
-			-DOSS="$(usex oss)"
-			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
-			-DQT4=OFF
-			-DFREETYPE2="$(usex truetype)"
-			-DTWOLAME="$(usex twolame)"
-			-DX264="$(usex x264)"
-			-DX265="$(usex x265)"
-			-DXVIDEO="$(usex xv)"
-			-DXVID="$(usex xvid)"
-			-DVDPAU="$(usex vdpau)"
-			-DVORBIS="$(usex vorbis)"
-			-DLIBVORBIS="$(usex vorbis)"
-			-DVPXDEC="$(usex vpx)"
-			-DUSE_EXTERNAL_LIBA52=yes
-			-DUSE_EXTERNAL_LIBASS=yes
-			-DUSE_EXTERNAL_LIBMAD=yes
-			-DUSE_EXTERNAL_LIBMP4V2=yes
-		)
-
-		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
-		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_compile
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_install
-	done
-}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
deleted file mode 100644
index a75f12952353..000000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/admCheckAudioDeviceLibs.cmake
-+++ b/cmake/admCheckAudioDeviceLibs.cmake
-@@ -158,6 +158,7 @@
- 
- 	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
- 	MESSAGE(STATUS "*****************************")
-+	IF (PULSEAUDIOSIMPLE)
-         IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
-         # in cache already
-          SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
-@@ -191,6 +192,9 @@
-         MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
- 
- 		APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
-+	ELSE (PULSEAUDIOSIMPLE)
-+		MESSAGE("${MSG_DISABLE_OPTION}")
-+	ENDIF (PULSEAUDIOSIMPLE)
- ELSE (UNIX AND NOT APPLE)
- 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
- ENDIF (UNIX AND NOT APPLE)
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index a5f26d9e4882..2813df9bb880 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,11 +1,4 @@
-AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 AUX ctl-1.5.2-fix-installation-directories.patch 1815 BLAKE2B 245a002e30d705c992f610e3543e8a1a1f34c67e3dbdacec3f9592c9b5be23f050dcc288bb16336b35591c6d218933d5ef98a77e5919f4bb498dc91276903062 SHA512 f7347e89a37e017ac8d238df7a8f7fbc7ec1c1439da6dd9a9a4a5c71ad92ea5546d5fa665762170399280c42a858f15416a39f45695b829c8ab01b74f4df22f2
-AUX ctl-1.5.2-fix-to-build-with-gcc-11.patch 599 BLAKE2B a6251fcaf30b7e716968612cfcfe2efec308f77cd49b34940526e9de1ed2faa81551ed6464835836cffa3df5ec6b51dcf70a35ab6f76e3b6e0527cdcd5010a1d SHA512 3e8dbc56ba1db7d6c0bd880cabcc02e2ea44592e1099dd33f51fa22a8220643cc9ef08b83a75b22a3ff3df65e9d51bbb9989323de1cf2bc33e5266d828433e76
-AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c3781eeb728a674edf930f4e2e3e3bfc0747a5dfe2cc33891698ce86b23839fc3a472ed2f5d2ffc323e06ff08f777a989 SHA512 e5d994fac97da2e94ba5f9ef2542546e880d2d2ec1c61624f85249f6e75e3f4d19dcfa91158166c77d6d0c1aaec90832ff55bf88264bd987bb6fa851d6d05cd8
-AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec
-AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
-DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 DIST ctl-1.5.2_p20221224.tar.gz 1418659 BLAKE2B 6798439b270b785974cfd45381f927f2005884b6a00878fa845cc1c36cd912eb6f3acb913f896389a67bff52103d3d52032e3f1f9f53e1a3d98b545428c1580b SHA512 9cc132100d3ea622d954e783fbab43c07cfa72e1930f4b9c55cb01709e88f09f956ac02e973a09bfc2842e769060e6f50f082d5491be03c1499a58e79b0f1ca3
-EBUILD ctl-1.5.2-r4.ebuild 898 BLAKE2B 0ebae767ba5149aabfe1338459de2b8557865a3e9e0c49a84c331382d023ed47a15b561060176036994f303f70a3a41bc967af94ea148eb4b0883fec31621bb6 SHA512 348985af0ad004e661838cb9c253713b55231d0c7a7c413f08a86ea07de4751c9949976b7bc2be702dc04b351d99dfced20383c64e32012ec12368af9b4e32f9
-EBUILD ctl-1.5.2_p20221224.ebuild 883 BLAKE2B a2f9265105aff276107cfe2b5af7d46273b94416a5bb823990086dafb107c83811e7152a3d55a9fc2f7e72e490193cb36e889c42e9345580d3cc3d8a8359fa30 SHA512 52e7ff1af1aa3dc56b74fd166d9b88ccd58f0155f8a738100e36d8b76a458111227bbc993e854fc90f2325dfb016632f6c4b8507d32ac51244cb54a30d8177d2
+EBUILD ctl-1.5.2_p20221224.ebuild 881 BLAKE2B 599d53afc4bda83d791ba35c2844b113bd4135d06f55ca064b1a6a60c01459b5a1576e017bfe45e51349a7f328dca7a835d698403a18fdf88e4cec7c4fd3e37f SHA512 52bc65e267d7e48d6df386252933ab98c536a94a352a08bc6670173bf2e195d39afd7b4dbcac12c4677fd92c0ab39c98f5045c8fa4ea9995e524337a0e7d33f9
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2-r4.ebuild b/media-libs/ctl/ctl-1.5.2-r4.ebuild
deleted file mode 100644
index 0276777c0657..000000000000
--- a/media-libs/ctl/ctl-1.5.2-r4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="AMPAS' Color Transformation Language"
-HOMEPAGE="https://github.com/ampas/CTL"
-SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
-S="${WORKDIR}/CTL-ctl-${PV}"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/ilmbase:=
-	media-libs/openexr:=
-	media-libs/tiff:=
-	!media-libs/openexr_ctl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
-	"${FILESDIR}/${P}-openexr-2.3.patch"
-	"${FILESDIR}/${P}-fix-to-build-with-gcc-11.patch"
-	"${FILESDIR}/${P}-install-dpx-library.patch"
-	"${FILESDIR}/${P}-fix-unit-tests.patch"
-)
-
-src_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	eninja check
-	popd >/dev/null || die
-}
diff --git a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild
index 472fe1e2845f..fe8ff0e39185 100644
--- a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild
+++ b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/CTL-${MY_COMMIT}"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch
deleted file mode 100644
index e4fadf1aa05c..000000000000
--- a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Mon, 25 Sep 2017 17:41:26 +0100
-Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files
-
-* GNUInstallDirs are variables set by each distro and OS, so we
-  don't need to define them manually. They can also be set manually
-  during the configure phase. The code to define custom directories can
-  be removed and replaced with the equivalent GNUInstallDirs variable.
-* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully
-  utilized everywhere. This makes Pkg-Config a hard dependency so that
-  the libraries and directories can be found easily. This will use the
-  correct libraries no matter how they are named, so this is compatible
-  with both pre-2.0 and post 2.0 naming schemes.
-* The Pkg-Config files had several errors that are now fixed.
-
-Upstream PR: https://github.com/ampas/CTL/pull/67
----
- CMakeLists.txt                         | 36 ++++++++---------------------
- OpenEXR_CTL/CMakeLists.txt             |  2 +-
- OpenEXR_CTL/CtlModules/CMakeLists.txt  |  2 +-
- OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |  4 ++--
- OpenEXR_CTL/exrdpx/CMakeLists.txt      |  4 ++--
- config/CTL.pc.in                       |  8 +++----
- config/OpenEXR_CTL.pc.in               | 15 ++++++-------
- configure.cmake                        | 41 ++++++++++++++++------------------
- ctlrender/CMakeLists.txt               | 20 ++++++++---------
- doc/CMakeLists.txt                     |  2 +-
- lib/IlmCtl/CMakeLists.txt              |  4 ++--
- lib/IlmCtlMath/CMakeLists.txt          |  4 ++--
- lib/IlmCtlSimd/CMakeLists.txt          |  6 ++---
- lib/IlmImfCtl/CMakeLists.txt           |  6 ++---
- lib/dpx/CMakeLists.txt                 |  1 +
- 15 files changed, 66 insertions(+), 89 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01f622c..35e9a48 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,22 +1,14 @@
- cmake_minimum_required(VERSION 2.8)
- project( CTL )
- 
-+INCLUDE ( GNUInstallDirs )
-+
- set( CTL_MAJOR_VERSION 1 )
- set( CTL_MINOR_VERSION 5 )
--set( CTL_PATCH_VERSION 0 )
-+set( CTL_PATCH_VERSION 2 )
- set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} )
- 
--## Make install directories overrideable
--set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
--set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" )
--set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" )
--set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" )
--if( WIN32 AND NOT CYGWIN )
--  set(DEF_INSTALL_CMAKE_DIR CMake)
--else()
--  set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL)
--endif()
--set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
-+set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/CTL CACHE PATH "Install directory for project CMake files" )
- 
- # use, i.e. don't skip the full RPATH for the build tree
- SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- # which point to directories outside the build tree to the install RPATH
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- # the RPATH to be used when installing, but only if it's not a system directory
--LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir)
- IF("${isSystemDir}" STREQUAL "-1")
--  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- ENDIF("${isSystemDir}" STREQUAL "-1")
- 
--
--## convert install paths to absolute
--foreach( p LIB BIN INCLUDE CMAKE DOC)
--  set( var INSTALL_${p}_DIR )
--  if( NOT IS_ABSOLUTE "${${var}}" )
--    set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" )
--  endif()
--endforeach()
--
- option(ENABLE_SHARED "Enable Shared Libraries" ON)
- 
- if ( ENABLE_SHARED )
-@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr
- export(PACKAGE CTL)
-  
- # Create a CTLBuildTreeSettings.cmake file for the use from the build tree
--file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}")
-+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
- configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY)
- configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY)
- configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY)
- 
- if ( PKG_CONFIG_FOUND )
- configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY)
--install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev )
-+install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
- endif()
- 
- install( FILES
-   "${PROJECT_BINARY_DIR}/CTLConfig.cmake"
-   "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake"
-+  "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake"
-   DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
--install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION
--  "${INSTALL_CMAKE_DIR}" COMPONENT dev)
- 
-diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt
-index c1ca53e..3f19dd4 100644
---- a/OpenEXR_CTL/CMakeLists.txt
-+++ b/OpenEXR_CTL/CMakeLists.txt
-@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr )
- 
- if ( PKG_CONFIG_FOUND )
- configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY)
--install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev )
-+install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
- endif()
- 
- # TODO CMake config
-diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt
-index c63c22e..9c9e5b8 100644
---- a/OpenEXR_CTL/CtlModules/CMakeLists.txt
-+++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt
-@@ -2,6 +2,6 @@ install(
-     FILES
-         utilities.ctl
-     DESTINATION 
--        ${INSTALL_LIB_DIR}/CTL
-+        ${CMAKE_INSTALL_LIBDIR}/CTL
- )
- 
-diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
-index e396ec5..1f0eea0 100644
---- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
-+++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
-@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl )
- target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
- target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )
- 
--install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} )
-+install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
--install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
-+install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL )
-diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt
-index 50bd116..d9eadd8 100644
---- a/OpenEXR_CTL/exrdpx/CMakeLists.txt
-+++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt
-@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl )
- target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
- target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )
- 
--install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} )
-+install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
--install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
-+install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL )
- 
- 
-diff --git a/config/CTL.pc.in b/config/CTL.pc.in
-index 6d6e732..9b212a4 100644
---- a/config/CTL.pc.in
-+++ b/config/CTL.pc.in
-@@ -1,8 +1,6 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@INSTALL_BIN_DIR@
--libdir=@INSTALL_LIB_DIR@
--includedir=@INSTALL_INCLUDE_DIR@
--CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL
- 
- Name: CTL
- Description: CTL interpreter library
-diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in
-index 4cef5c6..39a1a3f 100644
---- a/config/OpenEXR_CTL.pc.in
-+++ b/config/OpenEXR_CTL.pc.in
-@@ -1,11 +1,10 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR
- 
- Name: OpenEXR_CTL
- Description: Simplified OpenEXR interface to CTL
--Version: @OPENEXR_CTL_VERSION@
--Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@
--Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
-+Version: @CTL_VERSION@
-+Libs: -L${libdir} -lIlmImfCtl
-+Cflags: -I${OpenEXR_includedir}
-+Requires: CTL,OpenEXR
-diff --git a/configure.cmake b/configure.cmake
-index 1817071..eb7e14e 100644
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -1,10 +1,7 @@
--# Until we get some of these modules into the upstream packages, put them here
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
-+# Make Pkg-Config required.
-+find_package( PkgConfig )
- 
--find_package( PkgConfig QUIET )
--
--find_package( IlmBase QUIET )
-+PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase )
- if(IlmBase_FOUND)
-   message( STATUS "found IlmBase, version ${IlmBase_VERSION}" )
-   ###
-@@ -13,11 +10,11 @@ if(IlmBase_FOUND)
-   ###
-   include_directories( ${IlmBase_INCLUDE_DIRS} )
-   link_directories( ${IlmBase_LIBRARY_DIRS} )
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" )
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" )
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
--  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
--  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" )
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" )
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
-+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
-+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
- else()
-   message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" )
- endif()
-@@ -39,20 +36,20 @@ else()
-   endif()
- endif()
- 
--find_package( OpenEXR QUIET )
-+PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR )
- if (OpenEXR_FOUND)
-   message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" )
- else()
-   message( WARNING "Unable to find OpenEXR libraries, disabling" )
- endif()
- 
--find_package( AcesContainer )
--if (AcesContainer_FOUND)
--  message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" )
--else()
--  if ( PKG_CONFIG_FOUND )
--    pkg_check_modules( AcesContainer AcesContainer )
--  else()
--    message( WARNING "Unable to find AcesContainer libraries, disabling" )
--  endif()
--endif()
-+find_package( AcesContainer )		
-+ if (AcesContainer_FOUND)		
-+   message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" )		
-+ else()		
-+   if ( PKG_CONFIG_FOUND )		
-+     pkg_check_modules( AcesContainer AcesContainer )		
-+   else()		
-+     message( WARNING "Unable to find AcesContainer libraries, disabling" )		
-+   endif()		
-+ endif()
-diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt
-index 9fced14..d97093d 100644
---- a/ctlrender/CMakeLists.txt
-+++ b/ctlrender/CMakeLists.txt
-@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} )
- link_directories( ${OpenEXR_LIBRARY_DIRS} )
- endif()
- 
--if ( AcesContainer_FOUND )
--add_definitions( -DHAVE_ACESFILE=1 )
--include_directories( ${AcesContainer_INCLUDE_DIRS} )
--link_directories( ${AcesContainer_LIBRARY_DIRS} )
--endif()
--
-+if ( AcesContainer_FOUND )		
-+add_definitions( -DHAVE_ACESFILE=1 )		
-+include_directories( ${AcesContainer_INCLUDE_DIRS} )		
-+link_directories( ${AcesContainer_LIBRARY_DIRS} )		
-+endif()		
-+ 
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" )
- 
- add_executable( ctlrender
-@@ -41,9 +41,9 @@ if (OpenEXR_FOUND)
- target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} )
- target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} )
- endif()
--if (AcesContainer_FOUND)
--target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} )
--target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} )
-+if (AcesContainer_FOUND)		
-+target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} )		
-+target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} )		
- endif()
- 
--install( TARGETS ctlrender DESTINATION bin )
-+install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} )
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 0b123d0..9776205 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1 +1 @@
--install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL )
-+install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} )
-diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt
-index 3672a43..ef301bd 100644
---- a/lib/IlmCtl/CMakeLists.txt
-+++ b/lib/IlmCtl/CMakeLists.txt
-@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED}
- )
- 
- target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} )
--target_link_libraries( IlmCtl Iex IlmThread Half )
-+target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} )
- 
- set_target_properties( IlmCtl PROPERTIES
-   VERSION ${CTL_VERSION}
-@@ -50,4 +50,4 @@ install( FILES
- 	CtlVersion.h
-  DESTINATION include/CTL )
- 
--install( TARGETS IlmCtl DESTINATION lib )
-+install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt
-index 96738cf..6997c74 100644
---- a/lib/IlmCtlMath/CMakeLists.txt
-+++ b/lib/IlmCtlMath/CMakeLists.txt
-@@ -18,8 +18,8 @@ install( FILES
-   CtlLookupTable.h
-   CtlRbfInterpolator.h
-   CtlSparseMatrix.h
-- DESTINATION include/CTL )
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL )
- 
--install( TARGETS IlmCtlMath DESTINATION lib )
-+install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} )
- 
- # TODO Add Imath and Iex libadd dependency and version info
-diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt
-index 2ba792a..5eaf87d 100644
---- a/lib/IlmCtlSimd/CMakeLists.txt
-+++ b/lib/IlmCtlSimd/CMakeLists.txt
-@@ -1,7 +1,7 @@
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" )
- 
- add_executable( halfExpLogTable halfExpLogTable.cpp )
--target_link_libraries( halfExpLogTable Half )
-+target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} )
- 
- add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h"
-                     COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h"
-@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES
-   SOVERSION ${CTL_VERSION}
- )
- 
--install( FILES CtlSimdInterpreter.h DESTINATION include/CTL )
-+install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL )
- 
--install( TARGETS IlmCtlSimd DESTINATION lib )
-+install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt
-index 47563df..784e27f 100644
---- a/lib/IlmImfCtl/CMakeLists.txt
-+++ b/lib/IlmImfCtl/CMakeLists.txt
-@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED}
-   ImfCtlCopyFunctionArg.cpp
- )
- 
--target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
-+target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} )
- 
--install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR )
-+install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR )
- 
- export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" )
- 
--install( TARGETS IlmImfCtl DESTINATION lib )
-+install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt
-index c8be26e..918890e 100644
---- a/lib/dpx/CMakeLists.txt
-+++ b/lib/dpx/CMakeLists.txt
-@@ -11,3 +11,4 @@ add_library( ctldpx
-  dpx_rw.cc
- )
- 
-+target_link_libraries( ctldpx ${IlmBase_LIBRARIES} )
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch
deleted file mode 100644
index 47b4cb538676..000000000000
--- a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 30 Jul 2021 17:33:47 +0200
-Subject: [PATCH] fix to build with gcc-11
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- lib/dpx/dpx.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/dpx/dpx.hh b/lib/dpx/dpx.hh
-index 02ae833..5639aaa 100644
---- a/lib/dpx/dpx.hh
-+++ b/lib/dpx/dpx.hh
-@@ -297,7 +297,7 @@ struct dpx {
- 		compliance_e current_compliance;
- 		endian_mode_e current_endian_mode;
- 
--		std::istream::streampos header_start;
-+		std::streampos header_start;
- 
- 	public:
- 		virtual ~dpx();
--- 
-2.32.0
-
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch
deleted file mode 100644
index 56fa35de7a2a..000000000000
--- a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 30 Jul 2021 18:40:27 +0200
-Subject: [PATCH] fix unit tests
-
-Add cstring #include where necessary and drop segfaulting test
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- unittest/CMakeLists.txt               | 1 -
- unittest/IlmCtl/testExamples.cpp      | 1 +
- unittest/IlmCtl/testVarying.cpp       | 1 +
- unittest/IlmCtl/testVaryingReturn.cpp | 1 +
- 4 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
-index 553b553..1cfbc9b 100644
---- a/unittest/CMakeLists.txt
-+++ b/unittest/CMakeLists.txt
-@@ -3,7 +3,6 @@ enable_testing()
- 
- add_custom_target( check COMMAND ${CMAKE_CTEST_COMMAND} )
- 
--add_subdirectory( IlmCtl )
- add_subdirectory( IlmCtlMath )
- add_subdirectory( IlmImfCtl )
- add_subdirectory( ctlrender )
-diff --git a/unittest/IlmCtl/testExamples.cpp b/unittest/IlmCtl/testExamples.cpp
-index ccd2183..180b7d3 100644
---- a/unittest/IlmCtl/testExamples.cpp
-+++ b/unittest/IlmCtl/testExamples.cpp
-@@ -56,6 +56,7 @@
- #include <CtlFunctionCall.h>
- #include <CtlType.h>
- #include <assert.h>
-+#include <cstring>
- 
- 
- using namespace Ctl;
-diff --git a/unittest/IlmCtl/testVarying.cpp b/unittest/IlmCtl/testVarying.cpp
-index 90ab05d..4079ca6 100755
---- a/unittest/IlmCtl/testVarying.cpp
-+++ b/unittest/IlmCtl/testVarying.cpp
-@@ -62,6 +62,7 @@
- #include <assert.h>
- #include <sstream>
- #include <limits>
-+#include <cstring>
- #include <half.h>
- #include <testVarying.h>
- 
-diff --git a/unittest/IlmCtl/testVaryingReturn.cpp b/unittest/IlmCtl/testVaryingReturn.cpp
-index eb91d31..d7ab083 100644
---- a/unittest/IlmCtl/testVaryingReturn.cpp
-+++ b/unittest/IlmCtl/testVaryingReturn.cpp
-@@ -62,6 +62,7 @@
- #include <assert.h>
- #include <sstream>
- #include <limits>
-+#include <cstring>
- #include <half.h>
- #include <testVarying.h>
- 
--- 
-2.32.0
-
diff --git a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch
deleted file mode 100644
index 96e8b268f49b..000000000000
--- a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 30 Jul 2021 17:54:15 +0200
-Subject: [PATCH] install dpx library
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- lib/dpx/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt
-index 918890e..2ed69d1 100644
---- a/lib/dpx/CMakeLists.txt
-+++ b/lib/dpx/CMakeLists.txt
-@@ -12,3 +12,4 @@ add_library( ctldpx
- )
- 
- target_link_libraries( ctldpx ${IlmBase_LIBRARIES} )
-+install( TARGETS ctldpx DESTINATION ${CMAKE_INSTALL_LIBDIR} )
--- 
-2.32.0
-
diff --git a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch
deleted file mode 100644
index ac4ceb3e5487..000000000000
--- a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp
-===================================================================
---- CTL-ctl-1.5.2.orig/lib/IlmCtlSimd/CtlSimdInst.cpp
-+++ CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp
-@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas
- 	    REPLACE_EXC
- 		(e, "\n" <<
- 		 xcontext.fileName() << ":" <<
--		 inst->lineNumber() << ": " << e);
-+		 inst->lineNumber() << ": " << e.what());
- 
- 	    throw e;
- 	}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 31e7b9a59462..46b1500e71f4 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,11 +1,7 @@
-AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
-AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
 AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167
 AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187 BLAKE2B 2e415fce94cf501b3780f6aff6bdc076db6395b53334d98484a8ac2d7b1e9ec0a5b85bc2199e7861cfb6870f81b843621ffb9a90c493cfb544b219f353362d87 SHA512 19431be0f2d8733265840ae9d428a9ddae823e37017e23d798a12a3390c879b1d8bcffd4b7d12bca8f7f929fe307fd4bff9f421830ca7b5607a188364f02bb8f
 AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce
 AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a57499e3b466f018840b0e358048283acea7519eca5f2a4140b9d553ad6cdca9bd449e8fc3d42fd84dae11a34f5c4264c3786b38a59ab4125 SHA512 f8cdab71c97953984ada16cf2a26fea0fce5ebfcfa465992a80080ad1882a3eecd925fc94bacdd60e1463a7c8a1678e93c89d9c7a9ec5e27726bcc98465f909f
-DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
-EBUILD openexr-2.5.8.ebuild 2037 BLAKE2B 0a934e0f8cf659d3a9209f1c289fcfefca2c08603950d940e24c445a16d056549e4a36bab8bcbbab0f2cea015908e9ecc56b471f73e0d9785b8a6cd9b46597ec SHA512 ca402e055f8ef05a96dc89245af3d675c66c3ac58ade050db66cb8be0132545d467f7d8930529fdbf47d215e53c0b45166b65a9e77fdccccc4b44deffca871e8
 EBUILD openexr-3.1.5-r1.ebuild 2098 BLAKE2B f28d62eb996fa17516d9e88bd982e55fbb35bf37e9bb25cfb80e89876e755fba59e52cd41b1c1964abb53135256c69b0a98b7d82aa6d17e4819cc45501807f64 SHA512 9c72ea6eb157433805e019e3cb8de40634e78eaf7905a168012cee37b6f866b20eae8a3e63cc8066754813a846c91faa2aaa3f2db679543b8a00f32838605deb
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
deleted file mode 100644
index a77705cb5a7d..000000000000
--- a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 3 Jul 2020 15:34:47 +0200
-Subject: [PATCH] IlmImfTest/main.cpp: disable tests
-
-Disable testOptimizedInterleavePatterns and testDwaLookup, which
-are not working on x86.
-For testOptimizedInterleavePatterns, see
-https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- IlmImfTest/main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
-index 3245fc4..4ab45b1 100644
---- a/IlmImfTest/main.cpp
-+++ b/IlmImfTest/main.cpp
-@@ -228,7 +228,7 @@ main (int argc, char *argv[])
-     TEST (testExistingStreams, "core");
-     TEST (testStandardAttributes, "core");
-     TEST (testOptimized, "basic");
--    TEST (testOptimizedInterleavePatterns, "basic");
-+//    TEST (testOptimizedInterleavePatterns, "basic");
-     TEST (testYca, "basic");
-     TEST (testTiledYa, "basic");
-     TEST (testNativeFormat, "basic");
-@@ -255,7 +255,7 @@ main (int argc, char *argv[])
-     TEST (testDwaCompressorSimd, "basic");
-     TEST (testRle, "core");
-     TEST (testB44ExpLogTable, "core");
--    TEST (testDwaLookups, "core");
-+//    TEST (testDwaLookups, "core");
-     
- 
-     //#ifdef ENABLE_IMFHUGETEST
--- 
-2.27.0
-
diff --git a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
deleted file mode 100644
index ef71bc0e6871..000000000000
--- a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This consists of A LOT of individual tests and on some hardware
-(e.g. the RISC-V board BeagleV Starlight) the default test time-out
-of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf
-takes almost 4800 s even on an otherwise idle system so let's add a bit
-of margin and set the time-out of this test to 1.5 hours.
-
---- a/IlmImfTest/CMakeLists.txt	2021-06-15 00:15:14.000000000 +0000
-+++ b/IlmImfTest/CMakeLists.txt	2021-07-16 16:51:20.600435829 +0000
-@@ -73,3 +73,4 @@
-   target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL)
- endif()
- add_test(NAME OpenEXR.IlmImf COMMAND $<TARGET_FILE:IlmImfTest>)
-+set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400)
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
deleted file mode 100644
index fbe8a897d4ff..000000000000
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/OpenEXR"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	# disable failing tests on various arches
-	if use test; then
-		if use abi_x86_32; then
-			eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-		fi
-
-		# Technically this doesn't disable anything, it just gives this test time to complete.
-		# Could probably be applied unconditionally but will leave this to the maintainers.
-		if use riscv; then
-			eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
-		fi
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index e743398a4536..d7b8029cc0c3 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -2,5 +2,5 @@ AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d49638
 DIST zita-alsa-pcmi-0.5.1.tar.bz2 21728 BLAKE2B 7ea5980939ebdcb25b88cc15ff10037adbb328128174d6d6ee243dae1be6305d5967c8c53b15ac37739abb168b2fd24ec2349eba82c9452cc178c39e8a204c59 SHA512 afa0751ef4e510bdc2603d52bdb921cbf8b0a8372bdcae77dd9ba5b4790c08a0a510b9a9e2240bd9ee7ce23163125bd44556621bbb9312c8ab5f82780b648c22
 DIST zita-alsa-pcmi-0.6.1.tar.bz2 21767 BLAKE2B 15c089131cd859f4686e06383abab5296bacfc88f10fcd323eca99b46455d3387a3505ae6e6ed2bc8cafab0f3612966ad45e796b1eb0ffa211f06876ed1909b7 SHA512 f4f8f4f834f566a2b81fc9f23c49714815b68e4c6c0b840830592a2d80171e6d4538aacfeb2d3f835bd28fec1a5e1f232c97c4dce254f797ce262e5414062cbc
 EBUILD zita-alsa-pcmi-0.5.1.ebuild 914 BLAKE2B 6528b89f990ec6911b5df9dd194199c451b7151199bbc929e0a5832f7cb264671015cbf473634f71e2d2007b760f035edba19c978da49b3e085de387866ecfda SHA512 b37b85bc756cc94f795dfa0580425e7f004d042bd4184469e119e697f458a9cb67fa4f66e76c67e567fc3b551c5433ffe16d6319a441ff90a10d5bbfbd358e73
-EBUILD zita-alsa-pcmi-0.6.1.ebuild 921 BLAKE2B f38a619aeb14a28542108462cb5794d9f01a857c7aa455bc5282e1b156931a31d1ec3b59f5cf6039cef2c502e3265bd41dc41846fb72dfdcfa83d7e12eb53ac2 SHA512 0134bf9d0f546793a626abe1c0172087d7a72997bcf65d35414e17241e6128195ec3d66c1f23ae742dc390da35182785ef6fffd8c82d20d78e4a2e471f54ab24
+EBUILD zita-alsa-pcmi-0.6.1.ebuild 915 BLAKE2B 264dbf704b382a74dafe68b5ca35ff30d3019089d0dcb27fbdb8fb374b98db1882ade65370ab288ebc412ed4bef155f03868d5d7853f1f265d9d197775d34c2b SHA512 a2c1a36f7522f9f17891f52558573c081e7429aaca6d4ecb13ab8e8d0fa301e3137ce1481bff1b3dd845c5b8a516222ef2ada65e12a196f449784ba33de9ca74
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild
index ce677e65f72a..a078c955bbef 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 CDEPEND="media-libs/alsa-lib"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 49779eb3e2ef..dc18deba9d06 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index a8af63a59c16..8f65892875ba 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,4 +1,6 @@
 AUX pithos-1.5.0-tests.patch 730 BLAKE2B fbd1613c2c3e38a6acefd215e35babd9a6f41aac6fdb492b51e0d1285eac3b2441f3323206282acd8c72bb33dcd9b80c5a8d0fd53e478df9445f6d42ae4392ae SHA512 a50e0929f9a19cca0e2d7e888d5ac228ba820ff58c7d71e08b57f92394e7913bf9bf02e5ae2de736df4b69621c913b07bf6baf14ecc9aaee3e5df921965d70ea
 DIST pithos-1.5.1.tar.gz 123504 BLAKE2B fc7cd51fd773989b5734d7bfcea674c622b3c9e5072d8ae65ed724476a025802f08916c533ea6c338e748aaf5fcce595ff352b0bae6c72dc074de2afaddbb737 SHA512 43841194d0a3c3df9dd98b819c8a1e30862ebd49aad8ba4f92e91cc7e680fba97159b70748f4042737d5e399bda64cd16d6e9f6d0e29136350c78be57474442e
+DIST pithos-1.6.0.tar.gz 122025 BLAKE2B c621fe58998790f0eb0159d29c40ac4abf2feff2be790c12008be86387bf628b170e3256c2f3ac83e9b2be254d96d4aa7e3e56ac780b0d59a446d0e158d96d15 SHA512 9e7b1d1456a769882a58639bf93194ec0228d21b7b7d1404224346016532620bb862e7d79a2c741d8ef44238c22741e4fd67bc22eadc8d207818a0ece33411ab
 EBUILD pithos-1.5.1-r1.ebuild 1639 BLAKE2B 9e4a9615f878b09e1f094bf521578f94405178b2094768a88c43ad93366bbb2aa7b8dae204aa90fcaafcf76b17e86c97025455bcc2a879471b7ff65c6c3a353e SHA512 8e261723904948dd312ff28ddb8a428ac9dc56bae72c0b2a4cfd2e2b33694d3b2e611f5559069bac52c2f088aba314e6181406d50f62b00b4d874edf0c824a2b
+EBUILD pithos-1.6.0.ebuild 1545 BLAKE2B f883241547087ea7383bbc12e44c2e34ee86b1656db7fde1d3151bc9e91ed6e45dc4f05f44be3415cc20980eede48d0e0400cb9d2feedc02ad156355a5b184e9 SHA512 16240602fb4f0fadfc51ffdf7be44f0ea30cc1314a56ba356db999147f155b287dda55792d34e4757c092965ff79bad57732d860647102762eeddd189977d468
 MISC metadata.xml 419 BLAKE2B 9e01f2ec478f85435261e38e84ee433d9712c7d595979c916af2d2c01a5954ec0f721b0170fb32109d6a98dbef358d8f63e00a1908c6c5f38b183eb6a0e0882a SHA512 3bf8a538a46181b7ba52f20832237a119a87aaa588a7a75a0a1d881a64110805427f27a25d4f8277ec249b40218b21d291cdb21c98616a57396d0ae20b6345c9
diff --git a/media-sound/pithos/pithos-1.6.0.ebuild b/media-sound/pithos/pithos-1.6.0.ebuild
new file mode 100644
index 000000000000..2472235faa25
--- /dev/null
+++ b/media-sound/pithos/pithos-1.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+inherit xdg meson gnome2-utils virtualx python-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="appindicator +keybinder libnotify test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	app-crypt/libsecret[introspection]
+	dev-libs/appstream-glib[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pylast[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	appindicator? ( dev-libs/libdbusmenu[gtk3,introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-libs/glib:2
+		dev-util/desktop-file-utils
+	)
+"
+
+src_configure() {
+	python_foreach_impl meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	virtx python_foreach_impl meson_src_test
+}
+
+src_install() {
+	python_foreach_impl meson_src_install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e7c8e79ea9d7..d941643552da 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 0299a6a5fbb1..363da96ce747 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,8 +1,5 @@
 AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
 DIST avidemux-i18n-2.8.1.tar.gz 2765272 BLAKE2B ecca8a3d6f278e02e37059c1c1dce4d8164661548f29d5e51273d76e46434bc349d93701209fd6a009364244540d75cae09ce456e968d1761ca5540acc4ba678 SHA512 aa93add0d72170abf009e5bd86eeb5198907ee8961e366ad396d85315b9908f8f94bf920ba2a0cf9c351dd9c50f7ef883480d88e7475f48d085648bfbfa1f4d4
-EBUILD avidemux-2.7.8.ebuild 3819 BLAKE2B 91023ef353dfcd3461659a5508767f17e1ae3144df2d59ecd2647693e04d1b5ad73efbeaf0d6b4ab73368179be8e00d9552ee47678a98917b5197c9b3781db3e SHA512 3ac0fce20d50ddbc2f80902e300e870c35de05047078b44162049bbc996367b53519670e10bd26a6d6b119dbef4f192fefad6bd0e772243db4e19beef3d159cc
 EBUILD avidemux-2.8.1.ebuild 3865 BLAKE2B 9e7f2e39764d932ad1ed0ca3c7aa608ed0cf75b30c5c291d520b535bda96216623ef99090fc20808fefd515e50193e4ad5a2f4619b42a1c4759e04a28f20ade1 SHA512 aa4b58cf408d312a81602f8c7b2868534d7bc70cd44f22edf07b55b94768aebe3b272c04c58152ed2d743796292a14068499843564046bd14c33ed1c0eca5915
 MISC metadata.xml 406 BLAKE2B d6a426301f7ec43489c8b5d8f97f8a00c887088d84ac3dcf0483ab6441bc786e40bce11ec49a5633d3a558f338a82b811cfe47031316103a89ae372ff6295ae2 SHA512 e6710b75d927435f098819d97c004e2ae879d3d1756030d38122c73e2f9465154f83cf2f34c68756931745a1515f0dbeb8a36922c70fd72fb0c3d4eb060acaab
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
deleted file mode 100644
index e4407a08f6d6..000000000000
--- a/media-video/avidemux/avidemux-2.7.8.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake desktop flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="
-	https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz
-"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls opengl qt5 sdl vaapi vdpau xv"
-
-BDEPEND="
-	dev-lang/yasm
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?]
-	opengl? ( virtual/opengl:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	vaapi? ( media-libs/libva:0= )
-"
-RDEPEND="
-	${DEPEND}
-	nls? ( virtual/libintl:0 )
-	!<media-video/avidemux-${PV}
-"
-
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_unpack() {
-	default
-	mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch"
-
-	processes="buildCli:avidemux/cli"
-	use qt5 && processes+=" buildQt4:avidemux/qt4"
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
-	done
-
-	if use qt5; then
-		# Fix icon name -> avidemux-2.7
-		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/"${PN}".desktop || die "Icon name fix failed."
-
-		# The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
-		sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/"${PN}".desktop || die "Desktop file fix failed."
-
-		# QA warnings: missing trailing ';' and 'Application' is deprecated.
-		sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/"${PN}".desktop || die "Desktop file fix failed."
-
-		# Now rename the desktop file to not collide with 2.6.
-		mv appImage/"${PN}".desktop "${PN}-${SLOT}".desktop || die "Collision rename failed."
-	fi
-
-	# Remove "Build Option" dialog because it doesn't reflect
-	# what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	# The build relies on an avidemux-core header that uses 'nullptr'
-	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DGETTEXT="$(usex nls)"
-		-DSDL="$(usex sdl)"
-		-DLibVA="$(usex vaapi)"
-		-DOPENGL="$(usex opengl)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	use qt5 && mycmakeargs+=(
-			-DENABLE_QT5="$(usex qt5)"
-			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-	)
-
-	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_compile
-	done
-}
-
-src_test() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_test
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_install
-	done
-
-	if use qt5; then
-		cd "${S}" || die "Can't enter source folder"
-		newicon "${PN}"_icon.png "${PN}-${SLOT}".png
-		domenu "${PN}-${SLOT}".desktop
-	fi
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 417509835568..16992b489691 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,6 +2,7 @@ AUX 0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch 2802 BLAKE2B a7
 AUX 0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch 790 BLAKE2B d4ec77a8aa37d090a153d05adbdab2a9664827d554cf325dabfa3ebad18028f02e0645b8a3c7795d9b57604cd31b1d9f847bf798a5c36b99cafeaf7793feea64 SHA512 14b60490c33764fbf9ba63e19325d5441a4604de967fad88210354544f683bdf31e5371af4aef3ef41cf40386a09d69ab3513f10ef012cfa70b0ce1fbe8a3d1f
 AUX 0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch 2026 BLAKE2B 1320fda269952cccf85490d52b3b1e88d1d118297f9369e1bd4eb3f81ba6d2b0c3db01e2fb4d9b39f422427805ef01b752b4503633883d6c50a81617c6ee9119 SHA512 4e825e7977e5d272b23078f6c2ebc25ee83ff14afae10e70ecf1a7476528f6759047790fc346fd2ee9669a205cdf75a79b07881dc8c2f159110b7b7a92200a3a
 AUX 0.3.65/0001-modules-also-install-module-combine-stream.patch 765 BLAKE2B 6bff3215436405743b53aa7bf1c65ff31d01df2df32262bf168f052b0c77978c1da1158c3c9f4365521f8e277172de1277562d4c61f83ae6a83cc31af8ab67b5 SHA512 5097dae990b8eedcc6f33eb729151d48c377316f1488a09bfcfdc3a4e1416af5e9d825a5bcb42831d2d8830cdcdd911732561f9c593908e8509084e97a135b27
+AUX 0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch 1039 BLAKE2B 9b4cb2901379e8761826d60f1fc0dd4d23c952c3ec96326d45e7d4a6a65010396f17aea49733c394e9d5530fd2bdb2ac5eea8155c368a683cab00f941d5ea617 SHA512 18d7c78862166afec039823076190e2cff0977defba52ef54b8cfb49d3caaee5cd66429d9f6aa132d86059adfb5d43bc410084ab0dc11456c48f3f1d362fcb1e
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
@@ -17,6 +18,6 @@ DIST pipewire-0.3.65.tar.bz2 1522095 BLAKE2B d991820e8780773ccf1cd68baa3156428eb
 EBUILD pipewire-0.3.63-r3.ebuild 16537 BLAKE2B 2fecbd30359107e2c6d82420c3199ddaf1a535a5c7b811db45f8d021ee350f73e92ef3fc3ce56323d5f26954d81d07bd6f970ee04bd91e6c8d4b3bef103fd170 SHA512 e160f3d01d068d093c890a716f4098879b2b6d068d0afcd1e2f08ddc0b845f20f4722a451fc94cc4b07747fa21c9057ae21405c6a3ce76e3d5feb354c6aac52e
 EBUILD pipewire-0.3.64-r2.ebuild 16375 BLAKE2B 776c12e939de524b096165c5b794637e8caee90b437068da593c8bd186128a2948db44d91ac1a20ce981f27a0729078a5a0abb4521c12e77abaf8be6b9682c7c SHA512 40cda83b4df6885887d4bf841a97c6682919ea9d91bc2cbcc7517858b1d04e0ae74b6a79a81270e02d349697f6b39b6bf5f642dcd85e65975f855606bbd9c9fb
 EBUILD pipewire-0.3.64.ebuild 16187 BLAKE2B f9036abc280611f3e9a82733e6f8ecdf9ec123d491f86c46734346ea3e890b19e72e0806fd532f31dbefb9fca964fb8a15a94386d85b7364cb2a30834f005459 SHA512 2311b635e07226a064c5e0ea55ea12fbe58c163dbf8813d343cadfc67f859fb32b6649bcf2134e52f5e34c6e84eaf7b3fb6e138df91442bd7ce0b4777dde6820
-EBUILD pipewire-0.3.65-r2.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
+EBUILD pipewire-0.3.65-r3.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
 EBUILD pipewire-9999.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
new file mode 100644
index 000000000000..2763236693d7
--- /dev/null
+++ b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
@@ -0,0 +1,28 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1511
+
+From 18fa7a555cc43c7219a53d836d9561faec6d6310 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 28 Jan 2023 11:04:48 +0000
+Subject: [PATCH] spa: bluez5: fix dependency on glib in bluez5_deps
+
+In de595a78ff958b8314d853f6266d5832529d9729, we started to require glib
+for building bluez and introduced dependencies for the needed gio* bits,
+but we only ever check for glib itself for gstreamer or flatpak.
+
+Drop glib from the dep list to match the summary() & subsequent bluez_deps_found
+logic in spa/meson.build.
+
+Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2999
+--- a/spa/plugins/bluez5/meson.build
++++ b/spa/plugins/bluez5/meson.build
+@@ -1,6 +1,6 @@
+ gnome = import('gnome')
+ 
+-bluez5_deps = [ mathlib, dbus_dep, glib2_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
++bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
+ foreach dep: bluez5_deps
+   if not dep.found()
+     subdir_done()
+-- 
+2.39.1
+
diff --git a/media-video/pipewire/pipewire-0.3.65-r2.ebuild b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
index 7e07410dfab4..7e07410dfab4 100644
--- a/media-video/pipewire/pipewire-0.3.65-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f71b4865fff7..66937e34b1a8 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index af2c6531c747..0f049a083826 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 08:09:56 +0000
+Sat, 28 Jan 2023 14:09:55 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a4dfd293bc36..e08608fbecb3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-28T08:09:59Z
+TIMESTAMP 2023-01-28T14:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPU2FdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPVLLZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDT9RAAluGM3FtyC/AX0OUJIyuzGzVuxkgu7wlc/dltijjFmnTdVaqA9e1WJgH1
-lbOgBtulzBd5WHCCUQC/eM9d189fxDyYWVsKZJ+eajVtCduRR5ZeLvSjRGz8+Cut
-TrwmWu/vhtTj3r68Wxl6/T8nIXXw0+C08163DhoEBPpqdVdinEIKIrRVFz1xlxXK
-bSvW6vbEX0SkCoWewxVeRSnffFn66+sPjPeu/cj5w8xVGPj7o4nnhcFldpT/U0hV
-+Y0jgitdEqXWo7OuJu2TZETOCQoq3K6HdzJevKSDCfjYKp2g5GRBrkaSTpeI5WUc
-zlVV5BMSyYRpRBu7YlVlhFPvD3jUf0qsXesYIxs2ASuQV2nldLbIPdCAJP7jfJO/
-N6J1NXiIrI0cvFF0JykOt+SMNAplFSwBnPaEcHASqSm0xXU75rTFuvTtlFogzw8d
-RdXQcSsW649TGyAZeJC3ltS5NPBR/dwHbDnr4h7TAs6LbC3gD+d0g5qEWgUaUOZ4
-Qjck5t6qUIEMl3f6r5W1/TL1PHKXCyEJN4EhYXDbpqUemZiksy8Su5c8iMgRXMXx
-ZjHVz+8EcszsXCjhes4ESLOe7d7x5OOe//4H+cPcFOsCdHcTW2vkM4cGy6AwFf0f
-f0WIKDlF1TWZuVTJ8OGNhOTTfuYy1F/R9lpJvGjB/9fQ6bmXtM0=
-=1KhA
+klBklw//br36dSQKO0Hs3AX9TP9Eo5UHQwUG68nAvDgi7Y+G9/IocRlKCZmGaQyP
+DB7G589pT7vs8tUL3Sby+lWfB3y+Q6nD/7h8b52PSz3DnL3ki2v1yuNFBCl5ODxL
+1zk+9YBYdqyRZUAkaJhi2lqB1ie3Y67eXSI9iXGWOaRP5tQwy3p6KIiiOfvIpmOm
+o5WBBN9YYIzBeIfPok+zDKNBJdknnWKBwckfdPkxuz0TZCi3k++lf29xcsmeu48m
+HOXM9bCE+BYGBT1TlNHbA1EA2AsXOR+EzYJ2ne5aMzjOGCtNY4JGB9rRI4lq0ynv
+rygkI/icS3UQPYkv637jYR78WAePlDjE4hcWva2WTb+qHomQQZAhpeQoIztu6KLA
+zgaYbo9wH7XBTFHWCau3PcLSWpVVRhuraCvdk/SQyip5k4k2Ym+lsxMLLC0vSgS2
+Y40yaS4G4m6AT78oYnTBHwoXZluFtEjc29w9ajYhvo/WM0Et89YM8jHbvYO5TtLU
+Xg/z5is4zSVLoPwOV1P4vy9bFlIOCf/DXQ00xQiKpdwhURxtZRNBEZsYDisviPhe
+f77SJr21pEvMpUr+ZkvAChnrPWDl0VITLh09PW5UjWRudz9yu6CKXr/LV5vpWvy4
+cJxz5SPqhMKA1WgPPskllKQQ2AaLIqPuFDPhShINen8+K7T8H1Y=
+=qxZG
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index af2c6531c747..81ed63809c54 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 08:09:56 +0000
+Sat, 28 Jan 2023 14:09:56 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 481b8beb5c67..2f120bd43d43 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 15122eedb111..bddea2aa085b 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/retext-7.2.2 b/metadata/md5-cache/app-editors/retext-7.2.2
deleted file mode 100644
index 7c4b95339a37..000000000000
--- a/metadata/md5-cache/app-editors/retext-7.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/PyQt5[testlib,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Simple editor for Markdown and reStructuredText
-EAPI=7
-HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
-INHERIT=distutils-r1 optfeature virtualx xdg-utils
-IUSE=python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/R/ReText/ReText-7.2.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=44033e4ec3a78447afa62385885f03df
diff --git a/metadata/md5-cache/app-editors/retext-8.0.0 b/metadata/md5-cache/app-editors/retext-8.0.0
new file mode 100644
index 000000000000..c71da8cbd005
--- /dev/null
+++ b/metadata/md5-cache/app-editors/retext-8.0.0
@@ -0,0 +1,18 @@
+BDEPEND=dev-qt/linguist-tools test? ( dev-python/PyQt6[testlib,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=8
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 optfeature qmake-utils virtualx xdg
+IUSE=test python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/R/ReText/ReText-8.0.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=81dd7406b6dd8cd7993fc29bb56c03f5
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index e5e3006429e5..a4c096a591f2 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -1,6 +1,6 @@
-BDEPEND=dev-qt/linguist-tools test? ( dev-python/PyQt5[testlib,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools test? ( dev-python/PyQt6[testlib,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Simple editor for Markdown and reStructuredText
 EAPI=8
 HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
@@ -9,9 +9,9 @@ INHERIT=distutils-r1 optfeature qmake-utils virtualx xdg git-r3
 IUSE=test python_targets_python3_9 python_targets_python3_10 test
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markups-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=be0e4ae071a12b37926269bf22f4bcea
+_md5_=181f82fec82165cdb16960824e648249
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index c4fe7e30d466..3eb28015df98 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
deleted file mode 100644
index 08f5a9f47399..000000000000
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-editors/emacs-26:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libvterm
-DESCRIPTION=Fully-featured terminal emulator based on libvterm
-EAPI=7
-HOMEPAGE=https://github.com/akermu/emacs-libvterm
-INHERIT=cmake elisp
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
-SLOT=0
-SRC_URI=https://github.com/akermu/emacs-libvterm/archive/f41849c2c9c1899f22d1c3d4f871ec47c82627ce.tar.gz -> vterm-0.0.1_pre20200713.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=51f2968bbc9fe9ef9255ec396acb05e8
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 203d52ef89f6..1b1ab717d4fa 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.12.1-r2 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0
index 8f7f9e33a997..99766ead90bb 100644
--- a/metadata/md5-cache/app-i18n/man-pages-l10n-4.12.1-r2
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=A somewhat comprehensive collection of man page translations
 EAPI=7
 HOMEPAGE=https://manpages-l10n-team.pages.debian.net/manpages-l10n/
-IUSE=l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+IUSE=l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
-RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man-pages-fr ) l10n_it? ( !app-i18n/man-pages-it ) l10n_nl? ( !app-i18n/man-pages-nl ) l10n_pl? ( !app-i18n/man-pages-pl )
-REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv )
+RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man-pages-fr ) l10n_it? ( !app-i18n/man-pages-it ) l10n_nl? ( !app-i18n/man-pages-nl ) l10n_pl? ( !app-i18n/man-pages-pl ) l10n_ru? ( !app-i18n/man-pages-ru )
+REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi )
 SLOT=0
-SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v4.12.1/manpages-l10n-v4.12.1.tar.bz2
-_md5_=19975feef9a86ae82976fc304484d969
+SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/4.17.0/manpages-l10n-4.17.0.tar.bz2
+_md5_=29a7c9a2a3c305b3984736f92c84b616
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index f1ed7b8f24ab..edab63940885 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20210305 b/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20210305
deleted file mode 100644
index 71c1b3fecd51..000000000000
--- a/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20210305
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/catch )
-DESCRIPTION=Navigation mesh construction toolset for games
-EAPI=7
-HOMEPAGE=https://github.com/recastnavigation/recastnavigation
-INHERIT=cmake flag-o-matic
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=ZLIB
-RESTRICT=!test? ( test )
-SLOT=0/1.5.1
-SRC_URI=https://github.com/recastnavigation/recastnavigation/archive/c5cbd53024c8a9d8d097a4371215e3342d2fdc87.tar.gz -> recastnavigation-1.5.1_p20210305.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ba5a85594f0ea26a105d45c2c1f9ed15
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 84443f9bd039..e5e9a9510619 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5-r1 b/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
new file mode 100644
index 000000000000..11668d962e84
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-cli:1 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Java Dependency checker
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=java-pkg-2 java-pkg-simple
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=8f0145075fda168338e0666f71030b4f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b0cfee277a5c..494dbbe5b2fe 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1 b/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1
deleted file mode 100644
index 4cb6dc80d46b..000000000000
--- a/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration instructions
-EAPI=7
-HOMEPAGE=https://github.com/google/crc32c
-INHERIT=cmake
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/google/crc32c/archive/1.0.6.tar.gz -> crc32c-1.0.6.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b3b9ab22378968f27da1718476a1043b
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.1.1 b/metadata/md5-cache/dev-libs/crc32c-1.1.1
deleted file mode 100644
index 625b1f3d7434..000000000000
--- a/metadata/md5-cache/dev-libs/crc32c-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration instructions
-EAPI=7
-HOMEPAGE=https://github.com/google/crc32c
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/crc32c/archive/1.1.1.tar.gz -> crc32c-1.1.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=701d568b4fe45c29b62e16026620cc10
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.42 b/metadata/md5-cache/dev-libs/libpcre2-10.42
index 764f2f937bb6..364185c200da 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.42
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.42
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.pcre.org/
 INHERIT=libtool multilib-minimal usr-ldscript verify-sig
 IUSE=bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0/3
 SRC_URI=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.42.tar.bz2 verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=fb6f85333f3919954c566eda5fb41dba
+_md5_=ccd064863a7e9d1e0d4a1ac18019288b
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3 b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3
new file mode 100644
index 000000000000..007ca7f344b2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3
@@ -0,0 +1,16 @@
+BDEPEND=python? ( >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=agrep? ( !app-text/agrep !dev-ruby/amatch !app-misc/glimpse ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) nls? ( sys-devel/gettext )
+DESCRIPTION=Lightweight, robust, and efficient POSIX compliant regexp matching library
+EAPI=8
+HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre
+INHERIT=autotools distutils-r1
+IUSE=+agrep +alloca +approx debug nls profile python python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=agrep? ( !app-text/agrep !dev-ruby/amatch !app-misc/glimpse ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
+REQUIRED_USE=agrep? ( approx ) python? ( || ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0
+SRC_URI=https://github.com/laurikari/tre/archive/6092368aabdd0dbb0fbceb2766a37b98e0ff6911.tar.gz -> tre-0.8.0_p20210321.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	dcd5f48510105eb95e550ab968147365	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=76d75bdf4c7dc02dfa7fea2e9923905b
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 1b5b724ab733..e968b932c4b2 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/ppx_expect-0.15.1 b/metadata/md5-cache/dev-ml/ppx_expect-0.15.1
new file mode 100644
index 000000000000..63ca32fb4972
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.15.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_inline_test:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Cram like framework for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/ppx_expect
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/ppx_inline_test:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.15.1.tar.gz -> ppx_expect-0.15.1.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=39661aa502b75c5f809c5fc911e0dfaa
diff --git a/metadata/md5-cache/dev-ml/ppx_import-1.10.0 b/metadata/md5-cache/dev-ml/ppx_import-1.10.0
new file mode 100644
index 000000000000..3344752cff7c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_import-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ml/ounit2 dev-ml/ppx_deriving dev-ml/ppx_sexp_conv ) dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/ppxlib-0.26:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=A syntax extension for importing declarations from interface files
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-ppx/ppx_import/
+INHERIT=dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/ppxlib-0.26:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/1.10.0
+SRC_URI=https://github.com/ocaml-ppx/ppx_import/archive/1.10.0.tar.gz -> ppx_import-1.10.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=7c86c4652d5bc2cbb5e2ae2085d967aa
diff --git a/metadata/md5-cache/dev-ml/ppx_import-1.9.1 b/metadata/md5-cache/dev-ml/ppx_import-1.9.1-r1
index e76f2c7f78ca..374f9d909965 100644
--- a/metadata/md5-cache/dev-ml/ppx_import-1.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_import-1.9.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=test? ( dev-ml/ounit2 dev-ml/ppx_deriving dev-ml/ppx_sexp_conv ) dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/ppxlib-0.24:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/ppxlib-0.24:= <dev-ml/ppxlib-0.26 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=A syntax extension for importing declarations from interface files
 EAPI=8
 HOMEPAGE=https://github.com/ocaml-ppx/ppx_import/
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/ppxlib-0.24:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/ppxlib-0.24:= <dev-ml/ppxlib-0.26 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.9.1
 SRC_URI=https://github.com/ocaml-ppx/ppx_import/archive/1.9.1.tar.gz -> ppx_import-1.9.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=64203e3eefe4388f80de040d767e07bc
+_md5_=73dbe22518451913923b61b2a277bb6a
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.0-r2 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.0-r2
new file mode 100644
index 000000000000..e4a6aa34948e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.23:= <dev-ml/ppxlib-0.26 >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Support Library for type-driven code generators
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.23:= <dev-ml/ppxlib-0.26 >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.15.0.tar.gz -> ppx_sexp_conv-0.15.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=036429ede7f8c1ea0e9a9b0ec735a5c9
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.0-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.1
index f5862a08459c..232826c8672c 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.15.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.23:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.26:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Support Library for type-driven code generators
 EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.23:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.26:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
-SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.15.0.tar.gz -> ppx_sexp_conv-0.15.0.tar.gz
+SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.15.1.tar.gz -> ppx_sexp_conv-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e0090a28855a591de523a55c60135882
+_md5_=39371d945b8359b69638953b626a91ad
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.6 b/metadata/md5-cache/dev-ml/ppx_tools-6.6
new file mode 100644
index 000000000000..f337e49a7075
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/cppo dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Tools for authors of ppx rewriters
+EAPI=8
+HOMEPAGE=https://github.com/alainfrisch/ppx_tools
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/6.6
+SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.6.tar.gz -> ppx_tools-6.6.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=e79b669e26d2f760965bb1e9fd985359
diff --git a/metadata/md5-cache/dev-ml/qcheck-0.20 b/metadata/md5-cache/dev-ml/qcheck-0.20
new file mode 100644
index 000000000000..a2f47d6ece0e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/qcheck-0.20
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/alcotest:= dev-ml/ounit2:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=QuickCheck inspired property-based testing for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/c-cube/qcheck
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-ml/alcotest:= dev-ml/ounit2:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/0.20
+SRC_URI=https://github.com/c-cube/qcheck/archive/v0.20.tar.gz -> qcheck-0.20.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=2033f4bc33fd74fd05d5a795ea7cdbf9
diff --git a/metadata/md5-cache/dev-ml/sedlex-2.5 b/metadata/md5-cache/dev-ml/sedlex-2.5-r1
index a17b3c8b4811..728d57526745 100644
--- a/metadata/md5-cache/dev-ml/sedlex-2.5
+++ b/metadata/md5-cache/dev-ml/sedlex-2.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/gen:= dev-ml/ppxlib:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/gen:= <dev-ml/ppxlib-0.26:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=An OCaml lexer generator for Unicode
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-community/sedlex
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-ml/gen:= dev-ml/ppxlib:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/gen:= <dev-ml/ppxlib-0.26:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.5
 SRC_URI=https://github.com/ocaml-community/sedlex/archive/v2.5.tar.gz -> sedlex-2.5.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=95a6d71678d1d0dec2ed4304172a808c
+_md5_=2c270091fb3a33fb84082ae0fe8f6c71
diff --git a/metadata/md5-cache/dev-ml/sedlex-3.0 b/metadata/md5-cache/dev-ml/sedlex-3.0
new file mode 100644
index 000000000000..c63b803debbf
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sedlex-3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/gen:= >=dev-ml/ppxlib-0.26:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=An OCaml lexer generator for Unicode
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/sedlex
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/gen:= >=dev-ml/ppxlib-0.26:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/3.0
+SRC_URI=https://github.com/ocaml-community/sedlex/archive/v3.0.tar.gz -> sedlex-3.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=114de39a28eebce2285c0b45c6cb68da
diff --git a/metadata/md5-cache/dev-ml/sexp_pretty-0.15.0 b/metadata/md5-cache/dev-ml/sexp_pretty-0.15.0-r1
index 3032d6dc718a..42fcf296c681 100644
--- a/metadata/md5-cache/dev-ml/sexp_pretty-0.15.0
+++ b/metadata/md5-cache/dev-ml/sexp_pretty-0.15.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ppx_base:0/0.15 dev-ml/sexplib:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/ppx_base:0/0.15 dev-ml/ppx_hash:= dev-ml/ppxlib:= dev-ml/sexplib:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=S-expression pretty-printer
 EAPI=8
 HOMEPAGE=https://github.com/janestreet/sexp_pretty
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-ml/ppx_base:0/0.15 dev-ml/sexplib:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/ppx_base:0/0.15 dev-ml/ppx_hash:= dev-ml/ppxlib:= dev-ml/sexplib:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/sexp_pretty/archive/refs/tags/v0.15.0.tar.gz -> sexp_pretty-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7cfd1b4e73734f77dcc0481366c01f02
+_md5_=4ebfcc2dd112f13350bd8b5dd6d77bca
diff --git a/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1 b/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1
new file mode 100644
index 000000000000..3ab7fd69a00a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_base:0/0.15 dev-ml/ppx_hash:= dev-ml/ppxlib:= dev-ml/sexplib:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=S-expression pretty-printer
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/sexp_pretty
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/ppx_base:0/0.15 dev-ml/ppx_hash:= dev-ml/ppxlib:= dev-ml/sexplib:0/0.15 dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/sexp_pretty/archive/refs/tags/v0.15.1.tar.gz -> sexp_pretty-0.15.1.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=4ebfcc2dd112f13350bd8b5dd6d77bca
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.15.1 b/metadata/md5-cache/dev-ml/sexplib-0.15.1
new file mode 100644
index 000000000000..5815d6ac780a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexplib-0.15.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/parsexp:0/0.15 dev-ml/base:0/0.15 dev-ml/sexplib0:0/0.15 dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/sexplib
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/parsexp:0/0.15 dev-ml/base:0/0.15 dev-ml/sexplib0:0/0.15 dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/sexplib/archive/v0.15.1.tar.gz -> sexplib-0.15.1.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=310032045e58ff217739a757bf77ad3c
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.15.1 b/metadata/md5-cache/dev-ml/sexplib0-0.15.1
new file mode 100644
index 000000000000..f89dc991a8a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.15.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/sexplib0
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.15.1.tar.gz -> sexplib0-0.15.1.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=f51ab2ac9913bee2ad7686d32adf7490
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b52f15c63029..c89a0a0f69fa 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/dask-2022.12.1-r1 b/metadata/md5-cache/dev-python/dask-2022.12.1-r1
deleted file mode 100644
index 087fe454cde8..000000000000
--- a/metadata/md5-cache/dev-python/dask-2022.12.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=8
-HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dask/dask/archive/2022.12.1.tar.gz -> dask-2022.12.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=51e6af5aeb8c2950fc96ffb8df0ca8d2
diff --git a/metadata/md5-cache/dev-python/dask-2022.12.1-r2 b/metadata/md5-cache/dev-python/dask-2022.12.1-r2
new file mode 100644
index 000000000000..9809c263c792
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2022.12.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dask/dask/archive/2022.12.1.tar.gz -> dask-2022.12.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=4fc86e37a1d5ae9de956ba5e50800be1
diff --git a/metadata/md5-cache/dev-python/dask-2023.1.0 b/metadata/md5-cache/dev-python/dask-2023.1.0
deleted file mode 100644
index 907d6569adf7..000000000000
--- a/metadata/md5-cache/dev-python/dask-2023.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=8
-HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dask/dask/archive/2023.1.0.tar.gz -> dask-2023.1.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9e68522f8e54d0545b1f07298365ac51
diff --git a/metadata/md5-cache/dev-python/dask-2023.1.0-r1 b/metadata/md5-cache/dev-python/dask-2023.1.0-r1
new file mode 100644
index 000000000000..4377427b0d57
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2023.1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dask/dask/archive/2023.1.0.tar.gz -> dask-2023.1.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=c73b479776f96b69dff1637afc262d12
diff --git a/metadata/md5-cache/dev-python/django-redis-5.2.0 b/metadata/md5-cache/dev-python/django-redis-5.2.0
index 3c7cdfec57c2..21ac3f464bdb 100644
--- a/metadata/md5-cache/dev-python/django-redis-5.2.0
+++ b/metadata/md5-cache/dev-python/django-redis-5.2.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-db/redis dev-python/lz4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-db/redis dev-python/lz4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Full featured redis cache backend for Django
 EAPI=8
 HOMEPAGE=https://github.com/jazzband/django-redis/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-redis/django-redis-5.2.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7997903611d42c2325a110dbf39dd481
+_md5_=331946d2353e6e016e1a30664ca98a18
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r2 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r3
index 01fdd0da4df2..f6ad964447a0 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r2
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-auth[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-auth[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=httplib2 Transport for Google Auth
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-auth[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+RDEPEND=dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-auth[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-auth-library-python-httplib2/archive/v0.1.0.tar.gz -> google-auth-library-python-httplib2-0.1.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6928a3c6ccaa2b5f1f75f668968e6f72
+_md5_=c55cb0c151461d5967f7ea11f79b886c
diff --git a/metadata/md5-cache/dev-python/moddb-0.8.1 b/metadata/md5-cache/dev-python/moddb-0.8.1
new file mode 100644
index 000000000000..9e0156b75023
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moddb-0.8.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ) ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrate-limiter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python scrapper to access ModDB mods, games and more as objects
+EAPI=8
+HOMEPAGE=https://github.com/ClementJ18/moddb
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrate-limiter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ClementJ18/moddb/archive/refs/tags/v0.8.1.tar.gz -> moddb-0.8.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=70f527ebe85175a784e57d42cbb0e9c6
diff --git a/metadata/md5-cache/dev-python/partd-1.3.0 b/metadata/md5-cache/dev-python/partd-1.3.0-r1
index 8d712b379f9f..260f510a474e 100644
--- a/metadata/md5-cache/dev-python/partd-1.3.0
+++ b/metadata/md5-cache/dev-python/partd-1.3.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/blosc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/locket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/blosc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/locket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Appendable key-value storage
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/locket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+RDEPEND=dev-python/locket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/partd/partd-1.3.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4e0f612666d1b246af56598ac5c9effc
+_md5_=8390a72e5ded36db852ae0970772e729
diff --git a/metadata/md5-cache/dev-python/pooch-1.6.0 b/metadata/md5-cache/dev-python/pooch-1.6.0
index d2ab08abd2c6..db1998fdd1c1 100644
--- a/metadata/md5-cache/dev-python/pooch-1.6.0
+++ b/metadata/md5-cache/dev-python/pooch-1.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fatiando/pooch
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pooch/pooch-1.6.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=91ba873809f7a5e5c3877881debf3611
+_md5_=8440d93d101e20102d9168c3e9c834b9
diff --git a/metadata/md5-cache/dev-python/pypresence-4.2.1 b/metadata/md5-cache/dev-python/pypresence-4.2.1
new file mode 100644
index 000000000000..8a5093680fb9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypresence-4.2.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Complete Discord IPC and Rich Presence wrapper library in Python
+EAPI=8
+HOMEPAGE=https://github.com/qwertyquerty/pypresence
+INHERIT=distutils-r1
+IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/qwertyquerty/pypresence/archive/refs/tags/4.2.1.tar.gz -> pypresence-4.2.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=c8d389c06a65a2c79c0d1d2557d90875
diff --git a/metadata/md5-cache/dev-python/pyrate-limiter-2.8.2 b/metadata/md5-cache/dev-python/pyrate-limiter-2.8.2
new file mode 100644
index 000000000000..6aa917eefdc2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyrate-limiter-2.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django-redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis-py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Rate-Limiter using Leaky-Bucket Algorimth Family
+EAPI=8
+HOMEPAGE=https://github.com/vutran1710/PyrateLimiter
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis-py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v2.8.2.tar.gz -> pyrate-limiter-2.8.2.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=f72e775bfe14cffe5727a872671c0b16
diff --git a/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.4 b/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.4
index ceba0f1a4957..e8d58eb3a2d1 100644
--- a/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.4
+++ b/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-localserver/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pyftpdlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localftpserver/pytest_localftpserver-1.1.4.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a42519b3afb7b48f04804f4f8556d5fb
+_md5_=2587a38adfbaffbbba7b74b772a56ea7
diff --git a/metadata/md5-cache/dev-python/scipy-1.10.0 b/metadata/md5-cache/dev-python/scipy-1.10.0
index 73627cbca3db..ad6b141a2dfd 100644
--- a/metadata/md5-cache/dev-python/scipy-1.10.0
+++ b/metadata/md5-cache/dev-python/scipy-1.10.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing
 IUSE=doc +fortran test-rust test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 -hppa
+KEYWORDS=~amd64 arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.19.5[lapack,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] fortran? ( virtual/fortran ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.10.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.10.0/scipy-html-1.10.0.zip )
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c8ec656fa2346ace29e60776f8251f87
+_md5_=d1330fa2b8bd1781bd8bb202950d9648
diff --git a/metadata/md5-cache/dev-python/seedir-0.4.2 b/metadata/md5-cache/dev-python/seedir-0.4.2
index 0f5eb546a6bc..94ba97c8fbf2 100644
--- a/metadata/md5-cache/dev-python/seedir-0.4.2
+++ b/metadata/md5-cache/dev-python/seedir-0.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/earnestt1234/seedir/ https://pypi.org/project/seedir/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/natsort[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/earnestt1234/seedir/archive/v0.4.2.tar.gz -> seedir-0.4.2.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0a8b3b6a49daeb9e1fe20f1b394a5782
+_md5_=8b6eb5c69f7574489fc39bc82815bfa8
diff --git a/metadata/md5-cache/dev-python/sybil-3.0.1 b/metadata/md5-cache/dev-python/sybil-3.0.1
deleted file mode 100644
index d9e015af3a5d..000000000000
--- a/metadata/md5-cache/dev-python/sybil-3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automated testing for the examples in your documentation
-EAPI=8
-HOMEPAGE=https://github.com/simplistix/sybil
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sybil/sybil-3.0.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a523de2ff325da6f368afd97de370020
diff --git a/metadata/md5-cache/dev-python/sybil-4.0.0 b/metadata/md5-cache/dev-python/sybil-4.0.0
index 99c890b3883d..ed583d01a039 100644
--- a/metadata/md5-cache/dev-python/sybil-4.0.0
+++ b/metadata/md5-cache/dev-python/sybil-4.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simplistix/sybil/ https://pypi.org/project/sybil/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/simplistix/sybil/archive/4.0.0.tar.gz -> sybil-4.0.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=cb8f33edad1afee7f0872eb0eaae1fc0
+_md5_=7ce942940907d949bbb50d6e093168c2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 590ad157e8f1..6845040bc636 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1 b/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
new file mode 100644
index 000000000000..4dbf73118f21
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Integrated WebSockets for Rails
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=test !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=e1a703defa9d2188dfe643566bfb76c1
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
new file mode 100644
index 000000000000..180efbac3db9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] <dev-ruby/mail-2.8[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] <dev-ruby/mail-2.8[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=561db1a4a773764d766f7ec2c09979e0
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
new file mode 100644
index 000000000000..36ac9d1b91a8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=e71ebdabca890dca10c6706de4abaa97
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
new file mode 100644
index 000000000000..3bab2a356b96
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Eases web-request routing, handling, and response
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=f16a78c751bf983bf06c20812c53df05
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1 b/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
new file mode 100644
index 000000000000..66609af2ff44
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Edit and display rich text in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=92cf1c38ecba64d4e370364c677b5595
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
new file mode 100644
index 000000000000..3502f09d87e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=ac329389e3dac5c8a837a91551d92fed
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.6.1 b/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
new file mode 100644
index 000000000000..f06174b562a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Job framework with pluggable queues
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6ae0b697603404ae3fe213a46480577b
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1 b/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
new file mode 100644
index 000000000000..0c6d44532507
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=c61724c38b280141e190e4b294b9ae69
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1 b/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
new file mode 100644
index 000000000000..1746ffe348ef
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails/
+INHERIT=ruby-fakegem
+IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b3b4586eab45039fb3dd9a060a5e4b6f
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1 b/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
new file mode 100644
index 000000000000..c185d4596b4e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Attach cloud and local files in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=10c620d31b899ff60f6249b6d69824e2
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
new file mode 100644
index 000000000000..07fd1957108b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=28fa4c364da4ba21f6188c2b317532b5
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.6.1 b/metadata/md5-cache/dev-ruby/rails-6.0.6.1
new file mode 100644
index 000000000000..4a25de43d39c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=7
+HOMEPAGE=https://rubyonrails.org
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://rubygems.org/gems/rails-6.0.6.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=5e4e59905abd2ae6a27dc8ee5459812e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.6.1 b/metadata/md5-cache/dev-ruby/railties-6.0.6.1
new file mode 100644
index 000000000000..b9800d2731f5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Tools for creating, working with, and running Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=test !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=ceccc29a612e3f1424836f8522ddb252
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.0.1 b/metadata/md5-cache/dev-ruby/sanitize-6.0.1
new file mode 100644
index 000000000000..91018db9442e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.0.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
+EAPI=8
+HOMEPAGE=https://github.com/rgrove/sanitize
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://github.com/rgrove/sanitize/archive/v6.0.1.tar.gz -> sanitize-6.0.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=5879fd2d0028af5069d07cd0900be7d3
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.8.1 b/metadata/md5-cache/dev-ruby/webrick-1.8.1
new file mode 100644
index 000000000000..9a39e4d526da
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webrick-1.8.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An HTTP server toolkit
+EAPI=8
+HOMEPAGE=https://github.com/ruby/webrick
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/webrick/archive/v1.8.1.tar.gz -> webrick-1.8.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6ed5868f39a3e09a708b402511f46f6e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 726dcd6e0d2b..a9d07e0ff6f1 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/bats-1.5.0 b/metadata/md5-cache/dev-util/bats-1.5.0
deleted file mode 100644
index 8e712d970b85..000000000000
--- a/metadata/md5-cache/dev-util/bats-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst test
-DEPEND=app-shells/bash:*
-DESCRIPTION=Bats-core: Bash Automated Testing System
-EAPI=8
-HOMEPAGE=https://github.com/bats-core/bats-core/
-INHERIT=multiprocessing optfeature
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=app-shells/bash:*
-SLOT=0
-SRC_URI=https://github.com/bats-core/bats-core/archive/v1.5.0.tar.gz -> bats-1.5.0.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=19449a4dcd1cb1e2ca0a802017a6b3b4
diff --git a/metadata/md5-cache/dev-util/bats-1.7.0 b/metadata/md5-cache/dev-util/bats-1.7.0
deleted file mode 100644
index 5f1c22181ec3..000000000000
--- a/metadata/md5-cache/dev-util/bats-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst test
-DEPEND=app-shells/bash:*
-DESCRIPTION=Bats-core: Bash Automated Testing System
-EAPI=8
-HOMEPAGE=https://github.com/bats-core/bats-core/
-INHERIT=multiprocessing optfeature
-KEYWORDS=~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=app-shells/bash:*
-SLOT=0
-SRC_URI=https://github.com/bats-core/bats-core/archive/v1.7.0.tar.gz -> bats-1.7.0.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=33a7b918307399df03a4c7734eb4ea38
diff --git a/metadata/md5-cache/dev-util/bats-1.8.0 b/metadata/md5-cache/dev-util/bats-1.8.0
deleted file mode 100644
index 0d02bf426631..000000000000
--- a/metadata/md5-cache/dev-util/bats-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst test
-DEPEND=app-shells/bash:*
-DESCRIPTION=Bats-core: Bash Automated Testing System
-EAPI=8
-HOMEPAGE=https://github.com/bats-core/bats-core/
-INHERIT=multiprocessing optfeature
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=app-shells/bash:*
-SLOT=0
-SRC_URI=https://github.com/bats-core/bats-core/archive/v1.8.0.tar.gz -> bats-1.8.0.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=54c50f2af04515d25c00b46ad47b8679
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.20 b/metadata/md5-cache/dev-util/pkgcheck-0.10.20
index 1c38fba6303a..2377be454432 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.20
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.20
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 INHERIT=elisp-common distutils-r1 optfeature
 IUSE=emacs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.20.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3eeccbabf0b99bd63cb79fca50c1df13
+_md5_=835b8025e1f6cb0087287af4774cd7de
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 3ad8e0944df1..da3519caf082 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3 b/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3
index 5dd4c1da68c6..a469e66eee9f 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3
+++ b/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3
@@ -7,10 +7,10 @@ HOMEPAGE=https://wz2100.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake plocale xdg
 IUSE=debug discord nls videos vulkan
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )
 RDEPEND=dev-libs/fribidi >=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/opus net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) media-fonts/dejavu
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/releases/4.3.3/warzone2100_src.tar.xz -> warzone2100-4.3.3.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e1a9aea873e1c35f50fa2ba4e62b5d40
+_md5_=873a3bb1cc758272d0bfce680350769b
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index a4fe7f6490ff..178fa940ccfc 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/basis_universal-1.16.3 b/metadata/md5-cache/games-util/basis_universal-1.16.3
index 70ba4a418fc7..50991b4f8db5 100644
--- a/metadata/md5-cache/games-util/basis_universal-1.16.3
+++ b/metadata/md5-cache/games-util/basis_universal-1.16.3
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://github.com/BinomialLLC/basis_universal
 INHERIT=cmake toolchain-funcs
 IUSE=cpu_flags_x86_sse4_1 opencl zstd
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 zstd? ( BSD )
 SLOT=0
 SRC_URI=https://github.com/BinomialLLC/basis_universal/archive/refs/tags/1.16.3.tar.gz -> basis_universal-1.16.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2f65c5a412f697af774d3f8cde676708
+_md5_=6dd4e0644f376cfb8f8de6697f50c707
diff --git a/metadata/md5-cache/games-util/lutris-9999 b/metadata/md5-cache/games-util/lutris-9999
index 52cfd3b461aa..9041c1532287 100644
--- a/metadata/md5-cache/games-util/lutris-9999
+++ b/metadata/md5-cache/games-util/lutris-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-magic[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) media-sound/fluid-soundfont net-libs/webkit-gtk:4.1[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_9? ( dev-python/certifi[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pypresence[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/moddb[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/certifi[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pypresence[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/moddb[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/certifi[python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pypresence[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/moddb[python_targets_python3_11(-)] ) media-sound/fluid-soundfont || ( net-libs/webkit-gtk:4[introspection] net-libs/webkit-gtk:4.1[introspection] ) x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DESCRIPTION=An open source gaming platform for GNU/Linux
 EAPI=8
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 optfeature virtualx xdg git-r3
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
 LICENSE=GPL-3+ CC0-1.0
 PROPERTIES=live
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-magic[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) media-sound/fluid-soundfont net-libs/webkit-gtk:4.1[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite,threads(+)] )
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_9? ( dev-python/certifi[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pypresence[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/moddb[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/certifi[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pypresence[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/moddb[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/certifi[python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pypresence[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/moddb[python_targets_python3_11(-)] ) media-sound/fluid-soundfont || ( net-libs/webkit-gtk:4[introspection] net-libs/webkit-gtk:4.1[introspection] ) x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite,threads(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0e47bc088ccfb57f7199602fddd20927
+_md5_=29da4fe41c4d95b6abfbf2c060eb59fe
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 6f13a3d08937..c80c5971ec19 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.19.0-r2 b/metadata/md5-cache/mail-client/claws-mail-3.19.0-r2
index b50596a4a785..9aabd0c91b13 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.19.0-r2
+++ b/metadata/md5-cache/mail-client/claws-mail-3.19.0-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.claws-mail.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools desktop python-any-r1 xdg
 IUSE=+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7:= ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk2] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0:= ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0:= ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) rss? ( dev-libs/libxml2 net-misc/curl )
 REQUIRED_USE=appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.19.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=86bdebaabc975abf780d2ec4536655e0
+_md5_=d2b312017de59a13b0f8a39e0371bb03
diff --git a/metadata/md5-cache/mail-client/claws-mail-4.1.1-r1 b/metadata/md5-cache/mail-client/claws-mail-4.1.1-r1
index 4680f3c29922..4fb3950c2ead 100644
--- a/metadata/md5-cache/mail-client/claws-mail-4.1.1-r1
+++ b/metadata/md5-cache/mail-client/claws-mail-4.1.1-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.claws-mail.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools desktop python-any-r1 xdg
 IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( dev-lang/perl:= >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7:= ) litehtml? ( >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( libcanberra? ( media-libs/libcanberra[gtk3] ) libnotify? ( x11-libs/libnotify ) ) perl? ( dev-lang/perl:= ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0:= ) rss? ( dev-libs/libxml2 net-misc/curl ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0:= ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) webkit? ( net-libs/webkit-gtk:4 ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl )
 REQUIRED_USE=libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) oauth? ( gnutls ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-4.1.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b936a70a295c7b65302860414a68d648
+_md5_=4247a37a9db972610cf14ac7476f9f4a
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 89cdddff3e3e..2afe5e201c8a 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0
index 3d3a31274fb7..b26a80909e62 100644
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0
+++ b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/g
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.26/mate-indicator-applet-1.26.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	bd950bf2bbeed028fe4898c655edb4ca	mate-desktop.org	e151c24352371540f44e3b71fcc0d6b1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1b634d1603c3cb215d60b383d650befe
+_md5_=34949f4ab9c1735646c181b31211b388
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0-r1 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0-r1
new file mode 100644
index 000000000000..da3c8873b305
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libayatana-indicator:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=MATE indicator applet
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=GPL-3 GPL-3+ LGPL-2+ LGPL-3+
+RDEPEND=dev-libs/libayatana-indicator:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/mate-indicator-applet-1.26.0.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	bd950bf2bbeed028fe4898c655edb4ca	mate-desktop.org	e151c24352371540f44e3b71fcc0d6b1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d7a725243f2214523cac6a9c93647d48
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e550ca5cd39a..511bc87c5f42 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/avidemux-core-2.7.8 b/metadata/md5-cache/media-libs/avidemux-core-2.7.8
deleted file mode 100644
index 3b55f0665a1e..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-core-2.7.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) !system-ffmpeg? ( dev-lang/yasm[nls=] ) sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( media-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 )
-DESCRIPTION=Core libraries for simple video cutting, filtering and encoding tasks
-EAPI=7
-HOMEPAGE=http://fixounet.free.fr/avidemux
-INHERIT=cmake flag-o-matic toolchain-funcs
-IUSE=debug nls sdl system-ffmpeg vaapi vdpau xv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( media-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-2.7.8 !<media-video/avidemux-2.7.8 nls? ( virtual/libintl:0 )
-SLOT=2.7
-SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.8.tar.gz -> avidemux-2.7.8.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0bee0dfd856c8c76c42ea624321e020
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.8 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.8
deleted file mode 100644
index c9956c806a6e..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ~media-libs/avidemux-core-2.7.8:2.7[vdpau?] ~media-video/avidemux-2.7.8:2.7[opengl?,qt5?] dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( virtual/jack libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) oss? ( virtual/os-headers )
-DESCRIPTION=Plugins for the video editor media-video/avidemux
-EAPI=7
-HOMEPAGE=http://fixounet.free.fr/avidemux
-INHERIT=cmake flag-o-matic python-single-r1
-IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ~media-libs/avidemux-core-2.7.8:2.7[vdpau?] ~media-video/avidemux-2.7.8:2.7[opengl?,qt5?] dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( virtual/jack libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) !<media-libs/avidemux-plugins-2.7.8
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=2.7
-SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.8.tar.gz -> avidemux-2.7.8.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3020864791af5db2121c54cee7f600bb
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2-r4 b/metadata/md5-cache/media-libs/ctl-1.5.2-r4
deleted file mode 100644
index 41708f13b9dd..000000000000
--- a/metadata/md5-cache/media-libs/ctl-1.5.2-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl virtual/pkgconfig
-DESCRIPTION=AMPAS' Color Transformation Language
-EAPI=7
-HOMEPAGE=https://github.com/ampas/CTL
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc64 x86
-LICENSE=AMPAS
-RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7b69deb67e9a14376920a2380057d9e5
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224 b/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224
index 7e865570b588..e380dd67517d 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ampas/CTL
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc64 x86
 LICENSE=AMPAS
 RDEPEND=dev-libs/imath:= >=media-libs/openexr-3:=[threads] media-libs/tiff:= !media-libs/openexr_ctl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/3fc4ae7a8af35d380654e573d895216fd5ba407e.tar.gz -> ctl-1.5.2_p20221224.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5401e951cf8ed8ccffce449550398abf
+_md5_=ff05a87f578daa58059bacb1b83f7c94
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.8 b/metadata/md5-cache/media-libs/openexr-2.5.8
deleted file mode 100644
index ea3a0e6d8139..000000000000
--- a/metadata/md5-cache/media-libs/openexr-2.5.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~media-libs/ilmbase-2.5.8:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
-EAPI=8
-HOMEPAGE=https://www.openexr.com/
-INHERIT=cmake-multilib
-IUSE=cpu_flags_x86_avx doc examples static-libs utils 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=amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=~media-libs/ilmbase-2.5.8:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/25
-SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.8.tar.gz -> openexr-2.5.8.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7591303b4e2cf4aad0f716b326b3f89c
diff --git a/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.6.1 b/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.6.1
index c8cf472236b8..c1a77cff9e04 100644
--- a/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.6.1
+++ b/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Provides easy access to ALSA PCM devices
 EAPI=8
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.6.1.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5175974ae02e5d9f7dd5b84e1caa6e15
+_md5_=ec13274f40c5bc4532196ad492a80382
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f4b0e770940e..3739237b96e6 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/pithos-1.6.0 b/metadata/md5-cache/media-sound/pithos-1.6.0
new file mode 100644
index 000000000000..4088d1535257
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pithos-1.6.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-crypt/libsecret[introspection] dev-libs/appstream-glib[introspection] dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pylast[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/gnome-icon-theme-symbolic appindicator? ( dev-libs/libdbusmenu[gtk3,introspection] ) keybinder? ( dev-libs/keybinder:3[introspection] ) libnotify? ( x11-libs/libnotify[introspection] ) dev-libs/glib:2 dev-util/desktop-file-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DESCRIPTION=Pandora.com client for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://pithos.github.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=xdg meson gnome2-utils virtualx python-r1
+IUSE=appindicator +keybinder libnotify test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-crypt/libsecret[introspection] dev-libs/appstream-glib[introspection] dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pylast[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/gnome-icon-theme-symbolic appindicator? ( dev-libs/libdbusmenu[gtk3,introspection] ) keybinder? ( dev-libs/keybinder:3[introspection] ) libnotify? ( x11-libs/libnotify[introspection] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pithos/pithos/archive/1.6.0.tar.gz -> pithos-1.6.0.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9b2a2b55be840213a0cb209f556c7fc1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 998161a5a4e7..537ae3bb21ac 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/avidemux-2.7.8 b/metadata/md5-cache/media-video/avidemux-2.7.8
deleted file mode 100644
index 553b2a91d61a..000000000000
--- a/metadata/md5-cache/media-video/avidemux-2.7.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/yasm qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=~media-libs/avidemux-core-2.7.8:2.7[nls?,sdl?,vaapi?,vdpau?,xv?] opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( media-libs/libva:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
-EAPI=7
-HOMEPAGE=http://fixounet.free.fr/avidemux
-INHERIT=cmake desktop flag-o-matic qmake-utils xdg
-IUSE=debug nls opengl qt5 sdl vaapi vdpau xv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-PDEPEND=~media-libs/avidemux-plugins-2.7.8:2.7[opengl?,qt5?]
-RDEPEND=~media-libs/avidemux-core-2.7.8:2.7[nls?,sdl?,vaapi?,vdpau?,xv?] opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( media-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-2.7.8
-SLOT=2.7
-SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.8.tar.gz -> avidemux-2.7.8.tar.gz https://github.com/mean00/avidemux2_i18n/archive/2.7.8.tar.gz -> avidemux-i18n-2.7.8.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bed0fa3c4172583b4a96894ecb5d8b0c
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.65-r2 b/metadata/md5-cache/media-video/pipewire-0.3.65-r3
index fdac42632d23..fdac42632d23 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.65-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.65-r3
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 26bc8e6fc16a..b4a79e105eab 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.2-r1 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.2-r1
index 89167fe279e5..8af4c08a3f1b 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.2-r1
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.monitoring-plugins.org/
 INHERIT=flag-o-matic
 IUSE=curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) acct-group/nagios acct-user/nagios !net-analyzer/nagios-plugins
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.2.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f304b786c3348a3816484bb4e90b63db
+_md5_=e3eb8aa142ef5ee9f5adea57d39cbe36
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r2
index d1d3d0867ac5..c9ab7d736abd 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Official plugins for Nagios
 EAPI=8
 HOMEPAGE=https://nagios-plugins.org/
 IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nagios-plugins/nagios-plugins/releases/download/release-2.4.2/nagios-plugins-2.4.2.tar.gz
-_md5_=af321c42f31eeb8732c647be7a4f926b
+_md5_=ec0778aa6a53986e5d7451d211b9205f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 956d85c3ca31..828b08300966 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.16.37 b/metadata/md5-cache/net-dns/bind-9.16.37
new file mode 100644
index 000000000000..e3d788a71c24
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.37
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-util/cmocka dev-util/kyua ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=8
+HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
+INHERIT=python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
+IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.37/bind-9.16.37.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=249707438b2f3c4ac317795da1e56aa9
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.37 b/metadata/md5-cache/net-dns/bind-tools-9.16.37
new file mode 100644
index 000000000000..f19cdeb03127
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.37
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-util/cmocka dev-util/kyua ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libuv:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=8
+HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
+INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
+IUSE=+caps doc gssapi idn libedit readline test xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=dev-libs/libuv:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.37/bind-9.16.37.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=78f1773a808db9385d516693676f3f10
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 81bff7b73ca6..12477dc0fdb1 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.10-r1 b/metadata/md5-cache/net-im/pidgin-2.14.10-r1
index ad2a67ec1b90..6d62bea17db1 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.10-r1
+++ b/metadata/md5-cache/net-im/pidgin-2.14.10-r1
@@ -13,6 +13,6 @@ RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 dbus? ( >=dev-libs/dbus-g
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) v4l? ( gstreamer )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.10.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.10.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=426ddab328b38165e52efdce2b98bf12
+_md5_=74360613376bd44ed6ef038b29b91a72
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.12 b/metadata/md5-cache/net-im/pidgin-2.14.12
new file mode 100644
index 000000000000..286cdb28a1b5
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.14.12
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) test? ( >=dev-libs/check-0.9.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) idn? ( net-dns/libidn:= ) meanwhile? ( net-libs/meanwhile ) ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ) networkmanager? ( net-misc/networkmanager ) perl? ( >=dev-lang/perl-5.16:= ) sasl? ( dev-libs/cyrus-sasl:2 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) v4l? ( media-plugins/gst-plugins-v4l2 ) zeroconf? ( net-dns/avahi[dbus] ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
+DESCRIPTION=GTK Instant Messenger client
+EAPI=8
+HOMEPAGE=https://pidgin.im/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
+IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl test tk v4l +xscreensaver zephyr zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) idn? ( net-dns/libidn:= ) meanwhile? ( net-libs/meanwhile ) ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ) networkmanager? ( net-misc/networkmanager ) perl? ( >=dev-lang/perl-5.16:= ) sasl? ( dev-libs/cyrus-sasl:2 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) v4l? ( media-plugins/gst-plugins-v4l2 ) zeroconf? ( net-dns/avahi[dbus] )
+REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) v4l? ( gstreamer )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.12.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4a7e4d59ae01ada04e1298a39fc4498f
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0e753b9ea5ad..cec21e140325 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/qxmpp-1.2.0 b/metadata/md5-cache/net-libs/qxmpp-1.2.0
deleted file mode 100644
index 6f3ca0e9af8c..000000000000
--- a/metadata/md5-cache/net-libs/qxmpp-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework
-EAPI=7
-HOMEPAGE=https://github.com/qxmpp-project/qxmpp/
-INHERIT=cmake
-IUSE=debug doc opus +speex test theora vpx
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v1.2.0.tar.gz -> qxmpp-1.2.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dcb7637a5418b28991d6a9d24f20b1e2
diff --git a/metadata/md5-cache/net-libs/usrsctp-0.9.3.0_p20201102 b/metadata/md5-cache/net-libs/usrsctp-0.9.3.0_p20201102
deleted file mode 100644
index ef1ce3fe952d..000000000000
--- a/metadata/md5-cache/net-libs/usrsctp-0.9.3.0_p20201102
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A cross-platform userland SCTP stack
-EAPI=7
-HOMEPAGE=https://github.com/sctplab/usrsctp
-INHERIT=cmake
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/sctplab/usrsctp/archive/a3e76b281ff5e3469e1c216d47533a73b3b03fab.tar.gz -> usrsctp-0.9.3.0_p20201102.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=77519441226147d2c4ea761669d70783
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a4792ad06074..3f7fa052a9f2 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.29-r1 b/metadata/md5-cache/net-misc/remmina-1.4.29-r1
new file mode 100644
index 000000000000..444d9581fd84
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.4.29-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
+EAPI=7
+HOMEPAGE=https://remmina.org/
+INHERIT=cmake optfeature python-single-r1 xdg
+IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.29/Remmina-v1.4.29.tar.bz2
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3e0b488b4e8a3b6d97bd94d0a5a7d46b
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index be190f3a7a0e..b198b1de24e1 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gnome-chemistry-utils-0.14.17_p6-r1 b/metadata/md5-cache/sci-chemistry/gnome-chemistry-utils-0.14.17_p6-r2
index 1faed0cbca6f..f7f1b0b6c9f2 100644
--- a/metadata/md5-cache/sci-chemistry/gnome-chemistry-utils-0.14.17_p6-r1
+++ b/metadata/md5-cache/sci-chemistry/gnome-chemistry-utils-0.14.17_p6-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-doc/doxygen app-text/yelp-tools virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.4.16:2 >=gnome-extra/libgsf-1.14.9 >=sci-chemistry/bodr-5 >=sci-chemistry/chemical-mime-data-0.1.94 >=sci-chemistry/openbabel-2.3.0:0= >=x11-libs/cairo-1.6.0 >=x11-libs/gdk-pixbuf-2.22.0 >=x11-libs/goffice-0.10.12 x11-libs/gtk+:3 >=x11-libs/libX11-1.0.0 virtual/glu gnumeric? ( >=app-office/gnumeric-1.12.42:= )
+DEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.4.16:2 >=gnome-extra/libgsf-1.14.9 >=sci-chemistry/bodr-5 >=sci-chemistry/chemical-mime-data-0.1.94 >=sci-chemistry/openbabel-2.3.0:0= >=x11-libs/cairo-1.6.0 >=x11-libs/gdk-pixbuf-2.22.0 >=x11-libs/goffice-0.10.12 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.0.0 virtual/glu gnumeric? ( >=app-office/gnumeric-1.12.42:= )
 DESCRIPTION=Programs and library containing GTK widgets and C++ classes related to chemistry
 EAPI=8
 HOMEPAGE=http://gchemutils.nongnu.org/
@@ -9,8 +9,8 @@ INHERIT=autotools flag-o-matic xdg
 IUSE=gnumeric
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.4.16:2 >=gnome-extra/libgsf-1.14.9 >=sci-chemistry/bodr-5 >=sci-chemistry/chemical-mime-data-0.1.94 >=sci-chemistry/openbabel-2.3.0:0= >=x11-libs/cairo-1.6.0 >=x11-libs/gdk-pixbuf-2.22.0 >=x11-libs/goffice-0.10.12 x11-libs/gtk+:3 >=x11-libs/libX11-1.0.0 virtual/glu gnumeric? ( >=app-office/gnumeric-1.12.42:= )
+RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.4.16:2 >=gnome-extra/libgsf-1.14.9 >=sci-chemistry/bodr-5 >=sci-chemistry/chemical-mime-data-0.1.94 >=sci-chemistry/openbabel-2.3.0:0= >=x11-libs/cairo-1.6.0 >=x11-libs/gdk-pixbuf-2.22.0 >=x11-libs/goffice-0.10.12 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.0.0 virtual/glu gnumeric? ( >=app-office/gnumeric-1.12.42:= )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/gchemutils/0.14/gnome-chemistry-utils-0.14.17.tar.xz mirror://debian/pool/main/g/gnome-chemistry-utils/gnome-chemistry-utils_0.14.17-6.debian.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=770de380949ddaa796a1987950af22ea
+_md5_=25cbfd313caddda40b9210a79b2d402f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3ada09e1a1eb..7064743ebe82 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.01 b/metadata/md5-cache/sys-apps/man-pages-6.01
index 4639a266f125..1caea4e92b82 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.01
+++ b/metadata/md5-cache/sys-apps/man-pages-6.01
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
-PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
+PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.01.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.01.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=7d0358cd04601514e3b346f2fcdcbd6b
+_md5_=035cd1d95a09fdf210e250443fdf060f
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.02 b/metadata/md5-cache/sys-apps/man-pages-6.02
deleted file mode 100644
index 1fef762ef986..000000000000
--- a/metadata/md5-cache/sys-apps/man-pages-6.02
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bc
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=A somewhat comprehensive collection of Linux man pages
-EAPI=8
-HOMEPAGE=https://www.kernel.org/doc/man-pages/
-IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=man-pages GPL-2+ BSD
-PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
-RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.02.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.02.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=33ff993cc5f65826e0e64f771161de2a
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.02-r1 b/metadata/md5-cache/sys-apps/man-pages-6.02-r1
new file mode 100644
index 000000000000..5831ae6b3026
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-pages-6.02-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bc
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=A somewhat comprehensive collection of Linux man pages
+EAPI=8
+HOMEPAGE=https://www.kernel.org/doc/man-pages/
+IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=man-pages GPL-2+ BSD
+PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.02.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.02.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=5fe40347764fb3d2c20d43fa386a2208
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 35bb1627b53c..71b09a0f6fb1 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.18 b/metadata/md5-cache/sys-fs/lvm2-2.03.18
new file mode 100644
index 000000000000..739b3832223d
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.18
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) static? ( lvm? ( dev-libs/libaio[static-libs] sys-apps/util-linux[static-libs] readline? ( sys-libs/readline[static-libs] ) ) selinux? ( sys-libs/libselinux[static-libs] ) )
+DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
+EAPI=8
+HOMEPAGE=https://sourceware.org/lvm2/
+INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
+IUSE=lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles lvm2create-initrd? ( sys-apps/makedev ) thin? ( sys-block/thin-provisioning-tools ) )
+REQUIRED_USE=static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev ) thin? ( lvm )
+SLOT=0
+SRC_URI=https://sourceware.org/ftp/lvm2/LVM2.2.03.18.tgz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=1c5c695d0290283224f9e85e8b4af427
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 624f2971144a..ee2defb879d9 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/pf-sources-6.1_p4 b/metadata/md5-cache/sys-kernel/pf-sources-6.1_p4
new file mode 100644
index 000000000000..58ec9eb97c8f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-6.1_p4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=8
+HOMEPAGE=https://pfkernel.natalenko.name/ https://dev.gentoo.org/~mpagano/genpatches/
+INHERIT=kernel-2 optfeature
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+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.1_p4
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v6.1-pf4.tar.gz -> linux-6.1-pf4.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.1-10.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.1-10.extras.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=ebc3f6b7b1f1c5d8f9c5e9404948f83a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 86268089c7bf..180fe913f99a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-28T08:09:59Z
+TIMESTAMP 2023-01-28T14:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPU2FdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPVLLZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBVrxAAk7OZmo6+FERJSbOoY1M1PMWy7Zqz/QZGOw/EIb1S6fNkKpMqAEibAAMv
-YAeHWSVGm7DU04XSJb6DAGdHY3MZYjMiMIz15jGh+l2b0gTTlYn5JyhLbnbnr9Z5
-JJt1AJXa2giWJDuYaKpxUpYx8hfnqRHBpMNTIEShtbLCZfsxFYcfm7E7VsZbwewE
-ej6NkPNkXreMZQlhHO9BJvoUfoDxNDLVC8n4zCYMNMzw/tc3rgc/DO1cgV3BtD6P
-4C3R6dg6c3JuQ0KuhoPyem0s++fAoNwPbZtkwu7IU/doMz4aGzL+izrh5MmtZ1Hr
-aI0EQOKncCQloPmLtTWqp6rkLG0wLTIehPAfyHY9K8EU+7dy6E/e9zejQJe8CuF7
-9vCGgSZL7oGgUxff/1LBvp4onKbCOS+Kh/HRQKu4eUwaS1exfyytEPOgpc1Jylg0
-IOddApsljjJKExx1Q+ZigV1qGQTpNLLRyhPUoNCc8q1B0edTnZlXKSUJHOizTsas
-nRtVINqhlFYJlonQYFv91pWU3Aqq8CXey0M1gIoxO9RZmo/W3n0x1sNa42ByKOCz
-HXaHCAw6EJwT4IDAK+31Ddmfa7cn4uDb3mNya1LBB8cfVwZPosWOXKpTwyNQyx0M
-7S8Pc+/NoLBNTnbkT2oTostxYr+M7jTl3ExKjkHxa7Dl/LXH2C8=
-=KlTp
+klDjRBAAkz2vF1Kc2Ti1117ONrWeITuYEYW663xFn/QLBMg2mvfh+3+ufXbrcI0s
+kIWEHvbrUURJamUZn6RNVLjrZw5V0cOE6jLHuMHYex2WAmq+0ze1q3qalT4ifVmF
+TbjyZ9QWLkH3S6bGRgcE1fwv/xMYR12Ty75vuZO1c/cz0+vG/nRDNnIynM/tkNMm
+eANhCKyV6bInvG2AiUkKw0s8eODg2MRgNbUOLojh8jDyiLiufbwo3S6HNMSkmI87
+T2t+hcbLTL6XF+yZm9Z3HoXoaF7QmO7J4j1Qu//kdy7LAj1kWL0WBvcn4fVXwYSU
+ibeNWcBIZ4DKjXOXFuBPr/LNw0sq2OnpVAay8MiKtbmpsFE+IQktjki+EHv27Eui
+3lFdv7Md1DGa62m+gwPrUnQstF+OavvZG2XumwiJxk5f/iB8fhNffKCQO3Zy+EYW
+107FT2QuYaTX+zwkH/XxJHgIGMJYLpEq3poFfltCrWDB/Iutj3EJEehPiNGYSmd8
+wHuq/AM/vWCJVlV6p1Xkju7k+9y4jVSpeznpJ8WK4jN1eIx5DuLFtjZrUN30rUaH
+lJ64uA/lwJmkEbOL46trJ/ayZet0/Pdv1DC7kRIYhF6haRWinosboRfLK25lwea8
+piGsEKTonNL3mFaoUrXfTLyJ0NMU9OsYbfw9BaRBqXtDF+cbjY4=
+=jcIp
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3ecf758954d5..81ed63809c54 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 08:09:57 +0000
+Sat, 28 Jan 2023 14:09:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7c7326330403..6e5891cb535b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan 28 08:09:56 AM UTC 2023
+Sat Jan 28 02:09:55 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fa1fbe0ebdda..0a6fb1da78cf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 08:15:01 +0000
+Sat, 28 Jan 2023 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f9fe01ecf24b..9657f5c647c7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-727429b31020c73898c663e0b1917c364aafd87f 1674892672 2023-01-28T07:57:52+00:00
+a426f18f919e26917aa46b8791931a29c779a2cb 1674913098 2023-01-28T13:38:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c23a799496c7..884805e55dd9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674893401 Sat 28 Jan 2023 08:10:01 AM UTC
+1674915001 Sat 28 Jan 2023 02:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index af2c6531c747..0f049a083826 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 08:09:56 +0000
+Sat, 28 Jan 2023 14:09:55 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b9614eb666bd..557e2424b89f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 11ed1a406e99..54fa3cb4823c 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -2,5 +2,5 @@ AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
 DIST monitoring-plugins-2.3.2.tar.gz 2766966 BLAKE2B 1a9c35e8df22d5666005b4b79f5a7ee878c0d4be1e98039f341b198a658747010e8c9d1c0a1818d67a402e5c302ec5eb5073628d52c29caf41dbc2ce57c18f6c SHA512 d155f09ddd99f4e0d065627d3bf8768e13ae3f58ed25912f33b070cd24d6f3f43243616ec3e2d496dec633feee6b1f14950035a928034a1413f725814e850765
 EBUILD monitoring-plugins-2.3.1-r4.ebuild 3128 BLAKE2B e98bc4bfd457e4d634560bf72b2edee08b47ed1b909bc691ade912ec5671da16f098d30ac62b1acb7512629f4da154836a9d01a7fca742f87b71f6cb8e0676e0 SHA512 f94963c668a11d67be9ab488ad39382d614bc0e246704fea51ca18bc3ec1dcf77c87fe36a3d3ab07b2d841fa7cbdb94db90d3bbca030458130b2087304e6c20f
-EBUILD monitoring-plugins-2.3.2-r1.ebuild 3059 BLAKE2B 2e8012fd6e9d24ec0ab8ad865b0c2c2c6cc4a836da5659f31187a710a03c2dbf01a82b430306e3aeb093a21250728c5220b756db391d2f9f2d6b06a24c1d855e SHA512 53821ecb5bc782684a6b6b8d85cd40393dfb2871fb60bacb199606e8bfb01108f28652c49bb147c43d09ebbd4f768b26d35e32cd84ebf1f17ac08afbebceffb6
+EBUILD monitoring-plugins-2.3.2-r1.ebuild 3056 BLAKE2B 59998577d7cf252f72058e359c7dcae42a199e16a16005e01279891e7e3fcb5277e64af4a32e512b8675fca128706e89a3e7f24483f16b8b0815427e17e68909 SHA512 357f02b81f09d3bb6a7054b11e0e06184da6c02ddc5794c27bb64aa29b4792428bdcdfb4aa331d46e53230102bed5a4a91dca417d23efa232da85e59215e9301
 MISC metadata.xml 1435 BLAKE2B 19cf3223867cee4899e5bdaf33948497c5cd66e94198b6a0c081ea440bf7ecfc7dcf4855b44a7ead5fc983756490f3a79059d51202be9d9f2eea24c6857eb165 SHA512 c781d735ced89fe81d49f400ada6916702ad2825c35c6bb589199902917df415a50335ce058eea45e6eb3fe66813ed2f4009cc6831e15d2b7369fcc12e8c0b26
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
index 27bd712c16c3..ee3f8666e960 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index f53dd9cd88b2..2560a527a689 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,5 +2,5 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac0
 DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff
 DIST nagios-plugins-2.4.2.tar.gz 2740092 BLAKE2B 73101f0d439a10bbc0e5d576fe1cf60f115eead00e4611e2f820ebde86390daf1904a45603389a6ad0a9fdb0f14fb49b429ad571159f605df5490f9798fc18d1 SHA512 43448483301c8f5fb9be9b496514a9e15199c320b2a320bb93c4fc6f6fcd35f2a469f980916b37b2b7e565edcb14eea1692f290b0a7bca9364e298eb42af63ce
 EBUILD nagios-plugins-2.4.0-r2.ebuild 3105 BLAKE2B 01ec6370a9a012276f884b67ece6c7f6a51e44921dd3032ba3c81e47c421ff6506c163bde204f8726d89326a7f384422b38b5790f9cf6eb9347b73d281288904 SHA512 b6ed87ca497ac292c343fb5573662d6bc02c355ec04a48d0c068017bb94b45426e07f6babf86ac47a4d31a16d7bce4716348208d452b750295d17a0c4e38f8b7
-EBUILD nagios-plugins-2.4.2-r2.ebuild 3044 BLAKE2B 7320972d54a00457286ee7ce24050450cd214d18d2ad9cc478689e0154b6d3806da399c05fc07ac744aa32022a8a8239f41d13c3836b70ded62bf43ca862496c SHA512 5bdf69f819f082e58a6674eb0f43814e984c8b0bbef9d05883226209c15e16e2172fe714a587780560faa2a5465824e6ed80b469094594c3f5a58b6dfc45b308
+EBUILD nagios-plugins-2.4.2-r2.ebuild 3040 BLAKE2B fdf0efe50d0885357fa77414585a067636423297a8e5dba2ec21d7bbdd1a41ac1d7c8528c5a9d8a0b1ea38c823765f16dd78dec7b26744550f818f348b375afc SHA512 a57d81a6981b28131a1c0793c0c581bccf4f5ff0000e0a7cc2194696d3f6ff0534338bace9cb931fdeeedb4b3f416177d00e1f6287b9e358eed3e86f95cde37a
 MISC metadata.xml 1431 BLAKE2B 7a5b71bb1d5acc47492a8ac0414c5de789e2fff607a1602c8e464dd4285adb1acd71f152dc9dae18bade31623d78ca2ebe796b871f62542d2d29a75a3b5e4ce6 SHA512 5aa293f0fd8f810b3b750772e260009cbf10bb68aae1f8cbb9e02f7565204f8ae14da3f6a18db58e9fdff5fd97ba8566d07a421ff8bc35f07747338ced13b92c
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild
index 8fe32f3ad69a..54c610e10a60 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b9e207f73e71..044ff7035a11 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 5c33ef18ce13..8d09fbcbc48e 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,7 @@
 DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 SHA512 43fd2cea52dfd1115a4cca83830ab5b93208be401cdbbdff2bbf204b8f0d99fb434ad3156d3a21649488cc904ae09f145feba97b9b6918b0cf063ff5e2b10af5
 DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44eadc1d86a0a0cf7126f615a929fa95fa27a63db3a5bcbff2af6aebc74a734ed5abcdfd38c9488ca89ebeb536875a SHA512 521a021456b6daf260fead75efc298dd964ff00947fd95fadb3c13d52f4c07fb61b74861601d22722e8d546dca284524fd4d770cc5cf347d9659b6df9654ed95
+DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
 EBUILD bind-tools-9.16.33.ebuild 3778 BLAKE2B 15e88193b61a9774a10ea5b83128ac47f7ad22af9a9b0c4f65db572da3d94f910d20bf42add3056f3d0853ef5e164130d0b69c2e5913bf8a128ce529084be395 SHA512 7fd826b96f4d0f2da4bfbde48b9d05de269d467ef45b704bd181c0b446b6ae60f03ab8b9f53c51b7fc87d88cecdeea5f0dad6604ade50cedbc4bab05bc8abab9
 EBUILD bind-tools-9.16.36.ebuild 3781 BLAKE2B 65c80c31ba6f93e7099ec1667bf42ca8dc1837c21c16700f148cbfde220cc35d0d13d20b6db438bcfd9a4f3200a8f2e8839bff1830da23c11d4a85a3ba6eba2a SHA512 be561223834edb35789a46068adcafaaeb50ca7c34c7e45687d5220913422ab3736d77ee54d4e99d72670cc7e5dad1d89f88ad8154849cead435f22a3112c16f
+EBUILD bind-tools-9.16.37.ebuild 3785 BLAKE2B d7a779a80cfe3b57a1c7098455f4b5479b5e4ce6534a50cd75a20f57b3d4a4f354507ac8f83d1e8ab01dfcb56e003bab356d6ec21d7b7be834e2ae5dd2767e71 SHA512 7644eddc5bbefe976b58ff86c353085e1e49f244ed113b427c5f7ed09dd086c4d703e8cf1346d1ef7a480206717473fb018233d1736a1360adee813e1ad38751
 MISC metadata.xml 316 BLAKE2B d3d5b29fadc8120581e31e73a19d580b6648056b96f24e6a17710a010143e18c473397b7ab1e37a0e4286502e828ca7def0a588fb2cc9e55b53d08abd6ba89d2 SHA512 ea847ab00b8d94429509aa83bc00daaae1403c16785d60eeb6c1d3e8e731ce9761ede3206b7e6bfc92a33b07ebdb107622f6511dd6bae994a65dfacc666a70f3
diff --git a/net-dns/bind-tools/bind-tools-9.16.37.ebuild b/net-dns/bind-tools/bind-tools-9.16.37.ebuild
new file mode 100644
index 000000000000..8c70c6e06ed8
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.37.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn libedit readline test xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	dev-libs/openssl:=
+	caps? ( sys-libs/libcap )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# sphinx required for man-page and html creation
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# Do not disable thread local storage on Solaris, it works with our
+	# toolchain, and it breaks further configure checks
+	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with idn libidn2 "${ESYSROOT}"/usr)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug #344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug #395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h || die
+}
+
+src_compile() {
+	local AR="$(tc-getAR)"
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 40679f1dab7e..887a631a4182 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -10,7 +10,9 @@ AUX named.init-r14 6167 BLAKE2B 7c3deb3492a50d2655814f9fb492706b671e08ccdc406be0
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 SHA512 43fd2cea52dfd1115a4cca83830ab5b93208be401cdbbdff2bbf204b8f0d99fb434ad3156d3a21649488cc904ae09f145feba97b9b6918b0cf063ff5e2b10af5
 DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44eadc1d86a0a0cf7126f615a929fa95fa27a63db3a5bcbff2af6aebc74a734ed5abcdfd38c9488ca89ebeb536875a SHA512 521a021456b6daf260fead75efc298dd964ff00947fd95fadb3c13d52f4c07fb61b74861601d22722e8d546dca284524fd4d770cc5cf347d9659b6df9654ed95
+DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.33.ebuild 11174 BLAKE2B 101f9c7aa64213edd1cfe3005af418a10a4364a6ee715bbdec1947749f19a3a3c418cb3610e6b1a08d2ba37df7678ff408a541158bb01116065f844468b3666a SHA512 2a12e8c111932241a18558c6a89104ad291a793650b57b4ba93c416c685668cc41beeba4ab6d21cb007c8acccbd2f65d38988f6421cbe98354b71ddbcb802cb7
 EBUILD bind-9.16.36.ebuild 11177 BLAKE2B 0989049e6fbb6a7fc316f5a76f2a6e5a7cd8743b3ca46097905ddc59676d53f0ec5d754f8eef88487be1d4a87f66ea97e94d2c31fe4f1a1a5b38cb495844c336 SHA512 69c6c0d8e100f62d7ddf8577d783b4278a33aafad3e9608a1b183b96b6bd718daf3207388e2bf77819a4267d5ad3478ecb8514337b5c944c8527a912d181a926
+EBUILD bind-9.16.37.ebuild 11180 BLAKE2B e580b6821b312bd7c5f5c10f7da514c02c3148075560ea1c28888b7122f40183910d8bedc2d2055e7ac54b75e28d54f0f1bf258ebe03f17f19b4da93c83efb6e SHA512 bec24d57abc732ca61166095674fc71625d66f1df83b2f09c2bed11e1d98475aa2fba94584f6f464c683cfe8f817fd69e9d68df4f0d9066947fcf7174562a4d6
 MISC metadata.xml 866 BLAKE2B 672d411e2fef8ac9003d975fff049d1c17da75984efccc30bd98812a4b3e1be74ebf408f6c650813deff5f326a9858dca3755383e9573059f3c8b5c290497fcf SHA512 fd16dda7b0f54faeec5429a8763fb9075da4eb8c358c88891e388b3e3c76e062e7f585cf0134b99648cfcbae07da7b786c3c16920aed329864ba2cf7c29d93c8
diff --git a/net-dns/bind/bind-9.16.37.ebuild b/net-dns/bind/bind-9.16.37.ebuild
new file mode 100644
index 000000000000..1231d3725562
--- /dev/null
+++ b/net-dns/bind/bind-9.16.37.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug #602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+RESTRICT="!test? ( test )"
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap:= )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb:= )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb:= )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+BDEPEND="
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+src_prepare() {
+	default
+
+	# Should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with test cmocka)
+		# Removed in 9.17, drags in libunwind dependency too
+		--disable-backtrace
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		$(use_with berkdb dlz-bdb "${ESYSROOT}"/usr)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+	#gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h || die
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index eb0d1ef2d7bb..e2a7cdeb2e4f 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index ab1770ad64ad..514b6f697b26 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,4 +1,6 @@
-DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
+AUX pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.14.10.tar.bz2 8229328 BLAKE2B 9f004abda0f00b315e763e8b17e4e938b44b8a971d5411d775b9428363ab2ae071462d6d16654fcc09270123c434ef2d1f639d7f6d85c08a83b05c0ba4342c21 SHA512 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
-EBUILD pidgin-2.14.10-r1.ebuild 7728 BLAKE2B d024db0b88aa4b5c60090367924b008d6d283509b3261043e708e5d4c66d9d7dbf4da0bb1143b55e524a0a808a2c359f46f49123046acaf087699835258d0db4 SHA512 4552af7a491b435633b85c7fd22f643ee4c7f02b76d29dcfc87b3fef810639cca7cb8b94f9c3d73ed4211053aeefc05ec7ba507c409b055eb19e11aced43bfbb
-MISC metadata.xml 1335 BLAKE2B 8d5230fc8c5b162d554279eff7091a987b04ea5374541e459edd658f49be9c3d4c528c10ff859fb0d6ae268d87f3bfe4d167be9a1ddedb32334b56ceb4ff1bde SHA512 0203995da946b5b76a3fdfc42302afd3229c25f95db450876a1d80d9a04019ce932e5bbcc19e7340d36a9d47d95617ed49e4fa74a11f222f5604bca4d50237b8
+DIST pidgin-2.14.12.tar.bz2 8226145 BLAKE2B 0f0bec301c196fb722b88998a2a420af4084aedb7563215bb44c2c74a670a20db030ac207f226cef7989477dba04a9655c71269564ccc3680b42946ee84fdb16 SHA512 ce016ab4c48448653ae22eead1ddc16f1d10f446c601f8abd2c85b4ea83a4e80092e1ce8182834d998b6587f42a92a9a91105b4db976e170ec7043bb6af3c54c
+EBUILD pidgin-2.14.10-r1.ebuild 7551 BLAKE2B 339382c262cfef76c3cf5901d2b724a456927cff0beaf358c71f3895e7d7a839efc6522c49ba9e075d8dff3d103e0de9ecac7802e796d365f5b2fa05f4a334eb SHA512 5be02e8c7e76b8717f4cd36186d256d06a7dd8803dee708e575f66e0bc670cb7c97532ec5f4a4db9b2ef01fd79bd2c39dfe928776ef26f84aabe99bad451c149
+EBUILD pidgin-2.14.12.ebuild 7493 BLAKE2B 1613cd564a6431b9aa997d31967ac61d6af2db6576044c3a72cd2b284f74475f0beebe85c0ae9cf9c87c5e78359a98ab98bd7c581b9a0c0703a41d9cd97f0017 SHA512 b7e8d2b6af1380ca05f50fb1c7e49fdb35f66bc3234acccac4ba245a9e576ca28b4c60b2c97093fd014da16a5cea9af33fa4ce57d1bf739e5cf867a9ae4f9907
+MISC metadata.xml 1342 BLAKE2B d292c0acd20a7f23a484d2e7fc77a9a3ed96a741826740ed9001e98d3582ab21e5c3f9d10a87fedcc269c1de682cfd186e066ddb4cdb5198f26ea7749d54bcfe SHA512 f828ce1faab5a9ad0b2d243dbe2473767d1df3792e14f22f7309dc7f7893b8b78f51c7eab1e148a33a07d31b06fdb4cd67c023bdf62836c17c1992f9b5cf69d3
diff --git a/net-im/pidgin/files/pidgin-2.10.9-irc_join_sleep.patch b/net-im/pidgin/files/pidgin-2.10.9-irc_join_sleep.patch
new file mode 100644
index 000000000000..860a43a9551a
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.9-irc_join_sleep.patch
@@ -0,0 +1,11 @@
+diff -ur ./pidgin-2.10.9.orig/libpurple/protocols/irc/irc.c pidgin-2.10.9/libpurple/protocols/irc/irc.c
+--- ./pidgin-2.10.9.orig/libpurple/protocols/irc/irc.c	2014-02-02 15:29:18.000000000 -0600
++++ pidgin-2.10.9/libpurple/protocols/irc/irc.c	2014-09-02 10:30:24.830599697 -0500
+@@ -742,6 +742,7 @@
+ 	struct irc_conn *irc = gc->proto_data;
+ 	const char *args[2];
+ 
++        g_usleep(500000);
+ 	args[0] = g_hash_table_lookup(data, "channel");
+ 	args[1] = g_hash_table_lookup(data, "password");
+ 	irc_cmd_join(irc, "join", NULL, args);
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 9d0e3f3f6588..ab06cd30670c 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -3,7 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-	Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE, and Zephyr.
+		Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes.
+		You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!,
+		Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE,
+		and Zephyr.
 	</longdescription>
 	<use>
 		<flag name="gadu">Enable Gadu Gadu protocol support</flag>
diff --git a/net-im/pidgin/pidgin-2.14.10-r1.ebuild b/net-im/pidgin/pidgin-2.14.10-r1.ebuild
index 3945e1e0ed20..6fb48c0c4752 100644
--- a/net-im/pidgin/pidgin-2.14.10-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.10-r1.ebuild
@@ -10,9 +10,7 @@ inherit autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
@@ -136,9 +134,7 @@ DEFAULT_PRPLS="irc,jabber,simple"
 #	x11-plugins/pidgin-sendscreenshot
 #	x11-plugins/pidgimpd
 
-PATCHES=(
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-)
+PATCHES=( "${FILESDIR}/${PN}-2.10.9-irc_join_sleep.patch" ) # 577286
 
 pkg_pretend() {
 	if ! use gtk && ! use ncurses ; then
diff --git a/net-im/pidgin/pidgin-2.14.12.ebuild b/net-im/pidgin/pidgin-2.14.12.ebuild
new file mode 100644
index 000000000000..3f2e59459b9a
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.12.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+test tk v4l +xscreensaver zephyr zeroconf"
+RESTRICT="!test? ( test )"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	idn? ( net-dns/libidn:= )
+	meanwhile? ( net-libs/meanwhile )
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	networkmanager? ( net-misc/networkmanager )
+	perl? ( >=dev-lang/perl-5.16:= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	v4l? ( media-plugins/gst-plugins-v4l2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND="
+	>=dev-util/intltool-0.41.1
+	sys-devel/gettext
+"
+DEPEND="
+	${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+	test? ( >=dev-libs/check-0.9.4 )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	v4l? ( gstreamer )
+"
+
+# Enable Default protocols
+DEFAULT_PRPLS="irc,jabber,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DEFAULT_PRPLS+=",gg"
+	use groupwise 	&& DEFAULT_PRPLS+=",novell"
+	use meanwhile 	&& DEFAULT_PRPLS+=",sametime"
+	use zephyr 	&& DEFAULT_PRPLS+=",zephyr"
+	use zeroconf 	&& DEFAULT_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		# Don't downgrade F_S, we already set it in toolchain, bug #890276
+		--disable-fortify
+		--with-dynamic-prpls="${DEFAULT_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable gstreamer)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(use_enable idn)
+		$(use_enable meanwhile)
+		$(use_enable networkmanager nm)
+		$(use_enable ncurses consoleui)
+		$(use_enable perl)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable v4l farstream)
+		$(use_enable v4l gstreamer-video)
+		$(use_enable v4l vv)
+		$(use_enable zeroconf avahi)
+		$(use_with gstreamer gstreamer 1.0)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable spell gtkspell)
+		$(use gtk && use_enable xscreensaver screensaver)
+	)
+
+	if use gnutls ; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-gnutls=yes
+			--enable-nss=no
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because we no longer use gnome2.eclass
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not compliant with new hicolor theme yet, #323355
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	use dbus && python_fix_shebang "${ED}"
+	if use python || use dbus ; then
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c966ca72d7bd..d68b39c401d2 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index d45da064bcb0..6fca2f90577a 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,4 @@
-DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
 DIST qxmpp-1.4.0.tar.gz 313356 BLAKE2B a3a5c5cf3b16c319a6eddb3808f22af946040945eb8e66a641fe3117217b04eaf4e2b88dab8fa9cd2a3034d54884e1fa3563b0e775660645a5bdd6045469f9a5 SHA512 5a0cb72899314e47846b8b47340738df20a8d198c2db8cfe38c2cc31615166e9d86c6aaf6931be16078b2f9decca2d767497ad32e1d6dd0f6af888406c33fee9
-EBUILD qxmpp-1.2.0.ebuild 1304 BLAKE2B b09eb5906fd02de48d40125dd6dfd33f4b7ca2f3b8e08fa9f9612051bc56e779a226a2b2b61dba3199a719cc81397886891c8df0fa6c77fc5c3c8396b8795d70 SHA512 ffe1fd8357e4fade7a76fda1131db43cc86a43c51378c9dd82b56906bed9e3dd3444d8458efea489efb373fe2d54a584a247983b0753d0ae7c7fba9145e53ac4
 EBUILD qxmpp-1.4.0.ebuild 1133 BLAKE2B 936b17149560dfa68abe80af3890db7ac7ca799b89f05d47b89734bf0e53f528e9503c28db6a39684e3d06155fdc93022282ecc65eb810298720f661b0faefdf SHA512 76cc4a6250823c71a4b9f1522877f57035fe0e41a87329bc1deda15dccd71e26d055ffbd406344256545c610ef77929f08567f9861b78996cc5b4b18283ae3e7
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 741 BLAKE2B 104cc4e50ee039c49589746a4de7e075a561fc329c64435f0701d6e1cc59d24ad6d58a3ed056a503308d1b95757b170f5b485181f84c9943e12ed190f2791ab6 SHA512 b07d41c1341aeb7164c686c9d04878d185a3744b4f0e8b2ce4c8db370b74becd065eb0546c574a547865913def6997022bc90d9f83e0c4bf896f09d568f9cc3b
diff --git a/net-libs/qxmpp/qxmpp-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
deleted file mode 100644
index ee138b7ec58f..000000000000
--- a/net-libs/qxmpp/qxmpp-1.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
-HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc opus +speex test theora vpx"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtxml:5
-	opus? ( media-libs/opus )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vpx? ( media-libs/libvpx:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	# requires network connection, bug #623708
-	sed \
-		-e "/qxmppiceconnection/d" \
-		-e "/qxmppserver/d" \
-		-e "/qxmpptransfermanager/d" \
-		-i tests/CMakeLists.txt \
-		|| die "failed to drop certain network tests"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_INTERNAL_TESTS=$(usex test)
-		-DWITH_OPUS=$(usex opus)
-		-DWITH_SPEEX=$(usex speex)
-		-DWITH_THEORA=$(usex theora)
-		-DWITH_VPX=$(usex vpx)
-	)
-
-	cmake_src_configure
-}
diff --git a/net-libs/usrsctp/Manifest b/net-libs/usrsctp/Manifest
index ab00a0acae28..2542c605f9d3 100644
--- a/net-libs/usrsctp/Manifest
+++ b/net-libs/usrsctp/Manifest
@@ -1,6 +1,4 @@
 AUX usrsctp-0.9.5.0-pc-inc-path.patch 835 BLAKE2B 596c7f288285501eedad5125168e8a60e40981a9e78680b7423420221b1fbbab55feb7bcefe924360467dd9210f7ae3e326a862339fa149dbace3ddaf6b75d12 SHA512 dd086d104e9e00ea3884cf155a1624cdc18dd4092263ed365fd6dae3232fb7be1e3d40eeb118b6029c9bfe586a08a72ca6f121eb429da8690ca20bf34b38bb0d
-DIST usrsctp-0.9.3.0_p20201102.tar.gz 770742 BLAKE2B 94c7b0417a076d627065c625726eb214ec58be90d0965748610f63c076f1c172cb114dc8162af5604751cfe5e86ebf5444f002d07e43c94e461e21f6a3a4819a SHA512 a4bb4dd0ec81b2314e8590cfe5386179697e64d82915a0ef7e8f7a0baf67f88e3da89329ea73b38e8c417668f971f6580e120ed5be8588761b4b334a65ab4120
 DIST usrsctp-0.9.5.0.tar.gz 771701 BLAKE2B 279394aecea61795360db3b57140c55dc2801f55471fb97754e054ccd5d99c87e17dc637cdcb347be258034175b96efbc18d75a114f47e1957cacef897822df3 SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3
-EBUILD usrsctp-0.9.3.0_p20201102.ebuild 640 BLAKE2B 7d2ea129e798ba74f2ea6d7c42cfca30c547f98cd3e67882589c679c7267f748719370c423582dbe950da131a51fa4d32bc525d4c97d509b84b23ce28005132e SHA512 9279d6e369cce5d3dc980aa96c92f96fde8357a20ead93c3e3d8a5f3f9ce2d9553e1368b43bef497a74bf5bf32340b4982d97bcf66743b127816ac4f2447f3a3
 EBUILD usrsctp-0.9.5.0.ebuild 601 BLAKE2B 65979096cad1d2526f795979689403234c69d21aeab4062c0daa57844a7e0374372c54cf44ca73f0c61c1f39199b01213e820fe2ebb23a5f251c2073b87464e7 SHA512 7ec2519b6c7285408a4c92382ae7fb41e06b79d453bd40d7bc5efbce756503003fec03c923d85b898fe221fef94d789df64ac0cad580ea222337e2387d083272
 MISC metadata.xml 475 BLAKE2B 5a6983dcb0d4f692c85e6e2c303041aa7350db1fb040a69fa0ad0bc3110f19aa7de6fbeeea89dd4b2b83725c0b3797429e2153b5bbdc021226bf3d476b48a855 SHA512 2927ad5ee6e7a8dd0d6a14f11d78b5ad3d00604cc7ea847db3d81a0c2a4e26703e04a6dcf1a9b0b3e0d220cfa8b39c1b1bfff9b8cb33ba19f92c8eec32396c94
diff --git a/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild b/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild
deleted file mode 100644
index 3f61a85db62a..000000000000
--- a/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A cross-platform userland SCTP stack"
-HOMEPAGE="https://github.com/sctplab/usrsctp"
-USRSCTP_VERSION="a3e76b281ff5e3469e1c216d47533a73b3b03fab"
-SRC_URI="https://github.com/sctplab/usrsctp/archive/${USRSCTP_VERSION}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( LICENSE.md Manual.md README.md )
-
-S="${WORKDIR}/${PN}-${USRSCTP_VERSION}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Dsctp_werror=0
-		-Dsctp_build_programs=0
-		-Dsctp_build_shared_lib=1
-	)
-	cmake_src_configure
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 369848543717..b62454031979 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 25cc9d768943..ae02c4195aa7 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,6 @@
 DIST Remmina-v1.4.27.tar.bz2 1975470 BLAKE2B 09ce4cd29f476a307dce4c35d8304b8383db016b63646375d50a86051f6dd99fb4775700e3d8887dbbbece72b90dcbc5987b0705e2fe8f5b0840bba1cb29c92e SHA512 44bc067eaf2c4c10e42182aa7c3ec2aa18ec5c0ce51a2fc765884cbfc11261d3c0db537b1674424aa092caf171e647714dcc8af6d813273f7b96876a251e0575
 DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
 EBUILD remmina-1.4.27.ebuild 2702 BLAKE2B c481ef70b489d8d35fcc94baba872cdfa21b1111ad853bf15a5928ab4d35da724aafd968803ef824cd13736d523973fa1db0bc01ed6c0d85168c82f149d40293 SHA512 454453b963eeeeb1be58aac6db22ad4909672b0d1ab238cd911e101aeb5883776ab609951422345b2ae4b7b9691a90209e07505c195ce6619f01baf91fa55ecb
+EBUILD remmina-1.4.29-r1.ebuild 2706 BLAKE2B dd15edd37d77276438e44bfd08895d9bf30ac2aead365d0e7a7556b0bb83a86ee8c38fc1c3bdc32f9f962fc58209b3239eb6688e4e7b7fc3b4b3fbb3c16dca0c SHA512 b46a5027b4a0eea624e8a5206746fa2bcdde075184d81b90c56220886cf6d2f53f453f81981c7f9f41b5a7788ece6e3e0e1f13f4efac46956e9b11c3c2b0b175
 EBUILD remmina-1.4.29.ebuild 2700 BLAKE2B 0189ecd073daab151c4dd42e0d7c4edafeeead44e2c8fd17f3bc26dfc6dd38e828463bd4d5a6c738be31f463c8620373f00ad290d9e0b7c228910672e1ca5b75 SHA512 dd26f3906654ad7c822e9282249172713da221a4abe3d694b7a04e322a1700539558248a8e70fc049a31d2e6ddcbee4b8b3045892c04d849cbe2bf7c16f2a727
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.29-r1.ebuild b/net-misc/remmina/remmina-1.4.29-r1.ebuild
new file mode 100644
index 000000000000..901a4cac14ff
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.29-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake optfeature python-single-r1 xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libayatana-appindicator )
+	crypt? ( dev-libs/libgcrypt:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet )
+	python? ( ${PYTHON_DEPS} )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	spice? ( app-emulation/spice-protocol )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_PYTHONLIBS=$(usex python ON OFF)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=OFF
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 56abcc1bf082..33d31483647d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index b3833478eb3b..a049cf8e72d7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-01-28)
+# Possible security issues, obsolete. Use OpenEXR-3 / Imath instead.
+# No revdeps and consumers left in ::gentoo
+# Removal in 30 days. Bug #892375
+media-libs/ilmbase
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-28)
+# No upstream releases since 2010. No longer maintained
+# upstream. ruby27-only package. Masked for removal on 2023-02-27.
+dev-ruby/ruby_gntp
+
 # Mike Gilbert <floppym@gentoo.org> (2023-01-28)
 # No upstream releases since 2008.
 # No Gentoo maintainer since 2009.
@@ -850,6 +861,7 @@ dev-python/pyside6-tools
 # Jimi Huotari <chiitoo@gentoo.org> (2022-08-02)
 # Masked for testing. The split of some packages may still
 # change. bug #838970.
+>=app-editors/retext-8.0.0
 dev-python/PyQt6
 dev-python/PyQt6-WebEngine
 dev-qt/qt5compat:6
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 9c95fe8943da..cdcb6ac3b6a5 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gnome-chemistry-utils/Manifest b/sci-chemistry/gnome-chemistry-utils/Manifest
index 56f55d5e4651..6bc82a7f1c9f 100644
--- a/sci-chemistry/gnome-chemistry-utils/Manifest
+++ b/sci-chemistry/gnome-chemistry-utils/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-chemistry-utils-0.14.17.tar.xz 5911248 BLAKE2B 5d3bb4afbe3d3f620912e810717f08674d56a11c384b1fb239788cfbbb625797e8c52de2b6d940ae7f3d83847533afedd6ed961b1fa0ea1cec62dda88de1a6df SHA512 01bb964e1484e028c5965f1de74798422b448823047fcadf668dc76e98b3e214939a2f031d0182c717c4376f490e5969a4604ee66d1763e6b480032d7ae97468
 DIST gnome-chemistry-utils_0.14.17-6.debian.tar.xz 68528 BLAKE2B 2e4d318a5b91ca7963829c40c5d732a0ffa7fd9f4a32a6727f4926d2d4ec57989f50bd6839da49b4fa71dc533830bd0926205e952f08d04c08320e76ab51914c SHA512 8c6fad95c5d5e0895666fb9fb880364a9e3ab89761893b812c2cf835265acb40abe6b40def0960e1b38a0eea441310a3c1af608a2bcea37d5558533c9151e309
-EBUILD gnome-chemistry-utils-0.14.17_p6-r1.ebuild 1687 BLAKE2B 60d754b891f66ed4f75c92db29aef405fb892ba774ef1444a7866dd72a09e92f35c61ff324356ff8e893874f104f0ecdd58ba7d72788f0ad86ea6dcf939bf0fa SHA512 4723b5584d922725434094e688062ff0757cb672bf1df1071177dc405d27f95c79485d126ead6ea76828f2cbd8c474fec59a08337ec75fd55b412d544ff6ec22
+EBUILD gnome-chemistry-utils-0.14.17_p6-r2.ebuild 1690 BLAKE2B 32a3fcd94a273338b8719e129011f3952dec08ac19f7ae7f4fca8b020068b955b9af1d235c10f682540225af1bd24723ca9aef3ecd17b7d0cf3c9ffecd459b1d SHA512 59d53622fca6b5a92f66e61a94f69114497008073b044556267d479b0f096fa1c38338f8e3edd3d226b205c8082eb6d390c94e9b885f6981b43f3f960f5da31b
 MISC metadata.xml 337 BLAKE2B f6895ff4b84e03d81d69b69efe05fc3bf246153e09afa56323c853c7b9b8e775d25173d24c82e2f2e66f5db42430c433e82940d91d47a99b51679af13b0d17ae SHA512 8a22e6a36ad43faeb635a12d977eed127f30f977915bfed2379b2187d33e05f2bbbc937977e168b47af5adb3fe26f964439d5d16e7a44dcd7f12faf7b84e60b1
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r1.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r2.ebuild
index 28d4cf3e6b85..1016b0732c17 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r1.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ RDEPEND="
 	>=x11-libs/cairo-1.6.0
 	>=x11-libs/gdk-pixbuf-2.22.0
 	>=x11-libs/goffice-0.10.12
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
 	>=x11-libs/libX11-1.0.0
 	virtual/glu
 	gnumeric? ( >=app-office/gnumeric-1.12.42:= )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f599565f71f5..1c348b59a62a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 895e604f5fe3..341362dfa880 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -5,7 +5,7 @@ DIST man-pages-6.02.tar.xz 1800876 BLAKE2B 005bc57d2abca18516502faa7ea31798e6fb9
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9
 EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b
-EBUILD man-pages-6.01.ebuild 3344 BLAKE2B db39439c12f46b6b456247193af1bb5eade15786f803bedd597b00d7cf9cdb28dd3d5d3e20b75bb016c538ee5200af7d6e2880026dd4beb8cdf70785b6e9357a SHA512 20650bc9bb7c40f448839c8a6c333473ca2c81d9ff7513f8eee2a07cdb305ca2c02fcf3bdc028fbfc2fdf8003fc10814b99ffa5ecf59a166cc3e9f49a11c3741
-EBUILD man-pages-6.02.ebuild 3323 BLAKE2B 1d47326ad7415e0d149412a69aba6c77b0086b520937c22672d4fc4a8596f6d01d0476a2c18373ae0e91154bf0a526e2dc6c30852ae230797a695067aa6c15e9 SHA512 1c307c7670984c12303bf313e6fee9f50100cccff35604dfa9acd8ae418adecd1e4e549b3458eb71eb6cb7a6a7ccd448184303b14b993cf792051e6fd9f1a791
+EBUILD man-pages-6.01.ebuild 3392 BLAKE2B 0f8398df0b7672947b45c8828722855ab33363b7bdf46fc6f9c9d4ffa95e90fc2d4ab200fa5d5707231b410619d3448ee7b1a855862d9e5085d3aec700a3dc14 SHA512 7082fa2ad2e45ed0948354bc9e4360f82ef182a17adc0e8525fbc661386c60c54c7bb4a7d1298d09ccef4105799b49520a9edd259b2acde1d83008c85a07fe44
+EBUILD man-pages-6.02-r1.ebuild 3371 BLAKE2B 9ecbd1a5707cb9587529024730ecbf8307d44e9db384a127ca0be500630abb4fa2bd7fa10dafab1745d1e1967f3cf71d3bb96ca266a3748718cbfb0c36e9b7fd SHA512 d6fa94f7b8c96c68c12b464700d111f651ed351977145efa52d8294472faf9e560eda024f43bde10e1416a570025c9685de6fa9486b53edb4de84a67a313f40d
 EBUILD man-pages-9999.ebuild 3331 BLAKE2B f2c4dc45fc55921d9469d70e22c0f8338a87323b034c85da25c2a5b75308a313c19ffa79b42900fb2d659daa45c54896f7913348e8f9b4f97f78653d73712abc SHA512 cc64c8a1208cbda742acb6edd48400ece591ac5b57b742c1a25edc3e4c1abc3b15e061654659cc931b4aa41ecce42a36dcc8d0e0f90ce27399e9572374229e1a
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.01.ebuild b/sys-apps/man-pages/man-pages-6.01.ebuild
index ed3684d362de..620361bb4149 100644
--- a/sys-apps/man-pages/man-pages-6.01.ebuild
+++ b/sys-apps/man-pages/man-pages-6.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,7 +67,10 @@ RDEPEND="
 "
 PDEPEND="
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_ru? ( || (
+		app-i18n/man-pages-l10n[l10n_ru(-)]
+		app-i18n/man-pages-ru
+	) )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 "
 for lang in "${MY_L10N[@]}"; do
diff --git a/sys-apps/man-pages/man-pages-6.02.ebuild b/sys-apps/man-pages/man-pages-6.02-r1.ebuild
index a4babec37084..2b358544342e 100644
--- a/sys-apps/man-pages/man-pages-6.02.ebuild
+++ b/sys-apps/man-pages/man-pages-6.02-r1.ebuild
@@ -67,7 +67,10 @@ RDEPEND="
 "
 PDEPEND="
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_ru? ( || (
+		app-i18n/man-pages-l10n[l10n_ru(-)]
+		app-i18n/man-pages-ru
+	) )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 "
 for lang in "${MY_L10N[@]}"; do
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 046cf3a8f9a5..82c6fd1cfa84 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index f52a9774b07f..77946003132a 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -21,8 +21,11 @@ AUX lvm2-2.03.17-locale-muck.patch 398 BLAKE2B adb1c2bcd216acb413733d9f3f3618cad
 AUX lvm2-2.03.17-musl-LOCK_EX.patch 537 BLAKE2B ab2045b3b13e71b8857fa122708ecd55a3341b8feceb6d9f8d16bb3b03f6b9b3519a158ecd4764c070a78b911d06b9dc15117a8aa450bcdbcfd0e96bb86b6647 SHA512 aa1dd5f6b88a2e358d381b6b31d19853f63bf3cae3d54c224aa096194fa07c6917f6a26d686d3ca52d6e83435135d88649afc76d73c586c65d7d19321ae4b9ec
 AUX lvm2-2.03.17-pthread-pkgconfig.patch 732 BLAKE2B 1c179420d8cc3efaff24f03a5356469222da360c407445e30c51cde3d055de0245bd2387e934ca6bbd8518d6cc4110fccecbf430d3ba580159ac300c8570e34a SHA512 d0a800017c00cc954567900331436f9ddf30f48c7eb14d1c5e181ec9e8485702d76ebb5e981b519b97bc91ac2f5ff182e4e9ad04363c20f759b6f221c8911486
 AUX lvm2-2.03.17-readelf.patch 1804 BLAKE2B 559eea74823b3d333e68ac9fddd1046617148fbf525afa03b587d242065fc441b0447ea49479b62906c1111d5a9b0ef0e0150c1d24f7ef96bb64892544dff668 SHA512 f3fdb9b54c41354c7144795a357ba898c65540f09ef974d441ffd6d84d6725bbf9293fab048a3b1155b8961af140335c0023a9085a7a4717f070270491a62f17
+AUX lvm2-2.03.18-freopen-musl.patch 1838 BLAKE2B 424dab306335d3b2df74e1366a7d7a15299848020dbe2030a88483f27e522e66d061e582e9841a162163cf8043e5472c1dda0beeab1cab5824abc46a070d7cb6 SHA512 78b04c8f15b09ed545df082b47d96d23cc13b863892134d18a506699ebd033657505de1d0ae8597b5a3bb264007c4db1b72183d7b4d7902647f444111e57aa11
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9
+DIST LVM2.2.03.18.tgz 2728113 BLAKE2B 59df1a6ece11473d3f15a8b81701faa363be556f7668a34d2cbbf9221a014f268c230f08d3bd873bbebee89480c787a6f358b2edf8777c990c62e7c6a36aecad SHA512 58043bdcad882065f15d772401d29fc7fb2d0a6b6b75063915dc38bb11cd847517dd18ae7e2acb3935e6c32ef620a275c2b2b9c307434f7457ea3203b87254c1
 EBUILD lvm2-2.03.17-r2.ebuild 9952 BLAKE2B 875bc183ee4e0e9f81c57e3b5faab740dd71ae421713f15497e94fb249d09200be653c8121ecd7c80e9c15a7ad1492ce33538b3b083c19c5164d8867f303e829 SHA512 4891ac05e9f3418b3f5c11f8a9d75d33842316e1be980a9cf6cb42222e34199541b6c6c929c213fa9c4c4f6b89a2b5c9c53dbb586f55c09ec8105902289fa944
+EBUILD lvm2-2.03.18.ebuild 9772 BLAKE2B 78995e2b773cf0135ace59ff866346eb58c4c1212d1ac00304a91110f09e387511672fac4556ed0b74cd9697666ded3fe3e95629ea6789731fd594979b58da31 SHA512 30493e60de36c45c648d3e85835cc29b939960666a58245700d468d34bc21662955ee4b9973efdac0850fff7e05befc6b9ced56829fddee5252ca3d1736f2bc8
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/files/lvm2-2.03.18-freopen-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.18-freopen-musl.patch
new file mode 100644
index 000000000000..13afb81796ac
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.18-freopen-musl.patch
@@ -0,0 +1,60 @@
+From c2817ff30c4ad1e1a171ee0e914dbecdd486e3cf Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 28 Jan 2023 14:22:42 +0100
+Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
+
+* ISO C does not guarantee that the standard streams are modifiable
+  lvalues. Glibc even calls out this behaviour as non-portable:
+    https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html
+---
+ lib/log/log.c      | 2 +-
+ tools/lvmcmdline.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/log/log.c b/lib/log/log.c
+index 118a3ba42..aecc72611 100644
+--- a/lib/log/log.c
++++ b/lib/log/log.c
+@@ -208,7 +208,7 @@ int reopen_standard_stream(FILE **stream, const char *mode)
+ 
+ 	_check_and_replace_standard_log_streams(old_stream, new_stream);
+ 
+-	*stream = new_stream;
++	freopen(NULL, mode, *stream);
+ 	return 1;
+ }
+ 
+diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
+index a5bb6a5c5..0ebfa375c 100644
+--- a/tools/lvmcmdline.c
++++ b/tools/lvmcmdline.c
+@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
+ 	int err = is_valid_fd(STDERR_FILENO);
+ 
+ 	if (!is_valid_fd(STDIN_FILENO) &&
+-	    !(stdin = fopen(_PATH_DEVNULL, "r"))) {
++	    !freopen(_PATH_DEVNULL, "r", stdin)) {
+ 		if (err)
+ 			perror("stdin stream open");
+ 		else
+@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
+ 	}
+ 
+ 	if (!is_valid_fd(STDOUT_FILENO) &&
+-	    !(stdout = fopen(_PATH_DEVNULL, "w"))) {
++	    !freopen(_PATH_DEVNULL, "w", stdout)) {
+ 		if (err)
+ 			perror("stdout stream open");
+ 		/* else no stdout */
+@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
+ 	}
+ 
+ 	if (!is_valid_fd(STDERR_FILENO) &&
+-	    !(stderr = fopen(_PATH_DEVNULL, "w"))) {
++	    !freopen(_PATH_DEVNULL, "w", stderr)) {
+ 		printf("stderr stream open: %s\n",
+ 		       strerror(errno));
+ 		return 0;
+-- 
+2.39.1
+
diff --git a/sys-fs/lvm2/lvm2-2.03.18.ebuild b/sys-fs/lvm2/lvm2-2.03.18.ebuild
new file mode 100644
index 000000000000..b93eea6a507f
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.03.18.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
+S="${WORKDIR}/${PN^^}.${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev"
+REQUIRED_USE="
+	static? ( !systemd !udev )
+	static-libs? ( static !udev )
+	systemd? ( udev )
+	thin? ( lvm )"
+
+DEPEND_COMMON="
+	udev? ( virtual/libudev:= )
+	lvm? (
+		dev-libs/libaio
+		sys-apps/util-linux
+		readline? ( sys-libs/readline:= )
+		sanlock? ( sys-cluster/sanlock )
+		systemd? ( sys-apps/systemd:= )
+	)"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	lvm? (
+		virtual/tmpfiles
+		lvm2create-initrd? ( sys-apps/makedev )
+		thin? ( sys-block/thin-provisioning-tools )
+	)"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+DEPEND="${DEPEND_COMMON}
+	static? (
+		lvm? (
+			dev-libs/libaio[static-libs]
+			sys-apps/util-linux[static-libs]
+			readline? ( sys-libs/readline[static-libs] )
+		)
+		selinux? ( sys-libs/libselinux[static-libs] )
+	)"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.03.17-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
+	"${FILESDIR}"/${PN}-2.03.17-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch
+	"${FILESDIR}"/${PN}-2.03.18-freopen-musl.patch
+	"${FILESDIR}"/${PN}-2.03.17-musl-LOCK_EX.patch #887259
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Users without systemd get no auto-activation of any logical volume
+	if ! use systemd ; then
+		eapply "${FILESDIR}"/${PN}-2.03.16-dm_lvm_rules_no_systemd.patch
+		sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+
+	# Workaround for bug #822210
+	tc-ld-disable-gold
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	local myeconfargs=(
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+		$(usev !lvm --disable-udev-systemd-background-jobs)
+
+		# This only causes the .static versions to become available
+		$(usev static --enable-static_link)
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex lvm internal none)"
+		--with-snapshots="$(usex lvm internal none)"
+	)
+
+	if use lvm && use thin; then
+		myeconfargs+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=(
+		# musl doesn't do symbol versioning so can end up with
+		# runtime breakage.
+		--with-symvers=$(usex elibc_glibc 'gnu' 'no')
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
+		# USE=sanlock requires USE=lvm
+		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
+		$(use_enable systemd udev-systemd-background-jobs)
+		$(use_enable systemd notify-dbus)
+		$(use_enable systemd app-machineid)
+		$(use_enable systemd systemd-journal)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+
+	# Hard-wire this to bash as some shells (dash) don't know
+	# "-o pipefail" #682404
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 -C include
+
+	if use lvm ; then
+		emake V=1
+		emake V=1 CC="$(tc-getCC)" -C scripts
+	else
+		emake V=1 device-mapper
+		# https://bugs.gentoo.org/878131
+		emake V=1 -C libdm/dm-tools device-mapper
+	fi
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
+
+src_install() {
+	local INSTALL_TARGETS=(
+		# full LVM2
+		$(usev lvm "install install_tmpfiles_configuration")
+		# install systemd related files only when requested, bug #522430
+		$(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators")
+
+		# install dm unconditionally
+		install_device-mapper
+	)
+	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use lvm ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
+		if ! use udev ; then
+			# We keep the variable but remove udev from it.
+			sed -r -i \
+				-e '/^rc_need=/s/\<udev\>//g' \
+				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
+		fi
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+
+		if use lvm2create-initrd; then
+			dosbin scripts/lvm2create_initrd/lvm2create_initrd
+			doman scripts/lvm2create_initrd/lvm2create_initrd.8
+			newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+		fi
+
+		if use sanlock; then
+			newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+		fi
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		if use lvm; then
+			# depends on lvmetad
+			dolib.a libdaemon/client/libdaemonclient.a #462908
+			# depends on dmeventd
+			dolib.a daemons/dmeventd/libdevmapper-event.a
+		fi
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_preinst() {
+	HAD_LVM=0
+
+	if has_version 'sys-fs/lvm2[lvm(+)]' ; then
+		HAD_LVM=1
+	fi
+}
+
+pkg_postinst() {
+	use lvm && tmpfiles_process lvm2.conf
+	use udev && udev_reload
+
+	# This is a new installation
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if use lvm ; then
+			ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+			ewarn "# rc-update add lvm boot"
+			ewarn
+			ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want"
+			ewarn "to enable lvm autoactivation and metadata caching."
+		else
+			ewarn "Please enable USE=lvm if you need the LVM daemon and"
+			ewarn "tools like 'lvchange', 'vgchange', etc!"
+		fi
+	else
+		if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then
+			ewarn "LVM was previously enabled but is now disabled."
+			ewarn "Please enable USE=lvm if you need the LVM daemon and"
+			ewarn "tools like 'lvchange', 'vgchange', etc!"
+			ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details."
+		fi
+	fi
+
+	if use udev && [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to cause problems for udev-enabled LVM services."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
+		udev_reload
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a52a701b2c56..3ed4bade4939 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 925d228af5e0..10dd14930d49 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a1
 DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
 DIST genpatches-6.1-1.base.tar.xz 4304 BLAKE2B f58a4e46ba85da5bee55c6fa14a57e7546813d167ac3d78fa8bfe4b386ce2240279b7c936094271cffbabd9f6eafd76a7bd609fb2136400cef2eaf443b452cd3 SHA512 310c97fb844db4ffd7272144d1d2d3d5fee1ecc31527ef3a6f0b67f0fbf1f3b7f9f9db9ae52f6e309cb7a8e0790019707db24db5db670d58179b7648c677c1d2
 DIST genpatches-6.1-1.extras.tar.xz 3804 BLAKE2B 62ee97ed9142b41f415129dfb12d10387561258c6798f055ef5c8767ca0f31b36d785045df4207f704ea37f6764a0fb6e6fb78859c0679ca5a75a5aa5fc458cd SHA512 21b8f5a44809a9866063fbac676df25db709105c702a5b90e5acb21f6a01f60d3a559d8398dba1ec2b0ade89b3a45b587933cb7ded0621d8e4aa13b4d4eb5daa
+DIST genpatches-6.1-10.base.tar.xz 591388 BLAKE2B 5352d923a1df59c38cd1061ea9454041143a9786e4c81c195edb0e50ae9490f9629f2806482246c417db294a2ad9b643c9a6b38403c46c1b135c73a94506e6f2 SHA512 5ed3ea65e2ad63f4d59241b8e11f4de068564e5079c7fd6d511e9636867843e517b662f744577b615cbd572fa7313af260fb07c5c4e39e0cd114e4f315d3d777
+DIST genpatches-6.1-10.extras.tar.xz 3804 BLAKE2B 2a713dcd63d5946368d0bf88fee904b05f3fceac266173aa3016c528cfb40eff98f7aeaca2fd67e52a02a39b80b430fd55c8abd65ff5e61dbb6e6cd6ee757282 SHA512 152c134efcd7ceeb233bd7d9211a871d6b4f633e4782ac73657d583e4f149763e37ad7cf0f19efbf1c4c25fc50f3c67167b15f024eabfcfcb016b1cb23c36ae0
 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
@@ -14,6 +16,7 @@ DIST linux-6.0-pf6.tar.gz 218406147 BLAKE2B b084ffd751a3be9043ab0c306623c2ede659
 DIST linux-6.1-pf1.tar.gz 220692376 BLAKE2B 4d5eb13df0d433057a7b7a6c347c44f42f3edbd8cf714258d274f8c65226e9ac09b80d583088678b25865dc73c2c29085949731b425e8529a5022c590d94220e SHA512 8b54d6b79e21fd89e64faac7502d846f9b1a1f6a1ad52f3bb3ead6074f7fe8e9fa531b8fa06a22372127a66da0c0234fb114a9f707e6512e3643328173ec1729
 DIST linux-6.1-pf2.tar.gz 220718450 BLAKE2B 54ce340573f6c0144db3a77355553a49607b83ef7fe5fda308d4eb4d04c5b5014ea9241f8e17e7c2bd89b7f10567a14814d027fe1826d78f4182127a1ebfa825 SHA512 db7d28834ea60e38873823c3a83e1f6a128d34f0a698a728052cde50cee7c5f40a8b41e0ec53e069887fe4b72ea3837a5adc4deee4036e8c6bda084cac0d806b
 DIST linux-6.1-pf3.tar.gz 220765042 BLAKE2B 0a52e6d6dbc8f18957ed3348f33edc8df0df7a30700cbc11792f0e668bc613f842ac0d92fcb45a9093aa9a893e3df0f05e16afce3f7734f8f41f7dd33083c72f SHA512 d1a0077d13600d7b684c59158e7994eeca6d9f8864eed40279b2fcfbb7cae627c1eab4d7e9a403d352409493b9fe82c037bd1f710578a13527505a41051bdf05
+DIST linux-6.1-pf4.tar.gz 220785813 BLAKE2B fe4b173aeba8a0101346e795331194bbc6c56c409191030ad18b56910d846e9ab473d03db35968d5f6a7ded1ba6ae3685ce9fea72bc578b7f1a20cc84088973b SHA512 57d3a8e16d0eca172f77e7a84bc73c514a05e5df66ae1151fe6230d462ae5d2fff8030852d03fa5cf008e4f36ed2cd9d85a3fd2df2a1c3533565f18cf0c1d81d
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 EBUILD pf-sources-5.18_p5.ebuild 2781 BLAKE2B a377fa1820f637bcab95c220e00375dc8a0f009ad728088a37e1f46c5c4c3931c9a4b9fa86d05130440d12e29534468adb488b54f8b7c1975546594d16f7a28d SHA512 4e0acd60313555185dc11e1d6310c3c4d7bdea8acb4256e9ffd985a001c72949a3065fbfa7830bc66827d56961fa523300827613bf5653ac359420f08172a62e
@@ -22,4 +25,5 @@ EBUILD pf-sources-6.0_p6.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783
 EBUILD pf-sources-6.1_p1.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
 EBUILD pf-sources-6.1_p2.ebuild 2525 BLAKE2B b65bde480d4c533212cdede619cb66b90f884fa3d8b800f4b41ce35074c572fabf7d909ed92a2fc43424e5da21b902fcbd526a34fc7281b2d3c993b5b65aad79 SHA512 ead6cb42e0415447414fe1856e536fe8512ef5d6b18afc6cd1fdbabd9650bf1ce32ba4fabcdb6a84254e97ded5f21692115842ba328f3b12152700eb9a5d10d4
 EBUILD pf-sources-6.1_p3.ebuild 2830 BLAKE2B 25f23abfcc0012e6d9221dc21098e85f1aa05405aed73f60fc8ff66c8dd0b51a630840ecc0fc5ee9be6a7c472d0b31a6c0bf0e022b05d09e2a3f48c2c018692a SHA512 6afd4091ea245270ea483fc71fa73936068c7c7eea8d384932918844626cd95934748b19ce9699def30167e4273afad263980daca8b347cbc6e48386526389c5
+EBUILD pf-sources-6.1_p4.ebuild 3133 BLAKE2B fd692acf63bb43aac029f72be50583841de512f1c2f91857d4d68e8cda0de1226570c85a783a7af3ad3f9f08e31a2f418f4ae8f921c72250d94e40c688571c1c SHA512 d5fea494386b01d4a22c79da913211176696b452839a95c5e27281a149e2e04ce9cc7c4934fd961d734d44d46f832c3bf4091e85cc203689192196c03b4a04b5
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild b/sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild
new file mode 100644
index 000000000000..2cc09b7a1782
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run.
+ETYPE="sources"
+
+# Use genpatches but don't include the 'experimental' use flag.
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Genpatches version to use. -pf patch set already includes vanilla linux updates. Regularly "1"
+# is the wanted value here, but the genpatches patch set can be bumped if it includes some
+# important fixes. src_prepare() will handle deleting the updated vanilla linux patches.
+K_GENPATCHES_VER="10"
+
+# -pf patch set already sets EXTRAVERSION to kernel Makefile.
+K_NOSETEXTRAVERSION="1"
+
+# pf-sources is not officially supported/covered by the Gentoo security team.
+K_SECURITY_UNSUPPORTED="1"
+
+# Define which parts to use from genpatches - experimental is already included in the -pf patch
+# set.
+K_WANT_GENPATCHES="base extras"
+
+# Major kernel version, e.g. 5.14.
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf", since using "-pf" is not allowed for an ebuild name by PMS.
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://pfkernel.natalenko.name/
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# When genpatches basic version is bumped, it also includes vanilla linux updates. Those are
+	# already in the -pf patch set, so need to remove the vanilla linux patches to avoid conflicts.
+	if [[ ${K_GENPATCHES_VER} -ne 1 ]]; then
+		find "${WORKDIR}"/ -type f -name '100*linux*patch' -delete ||
+			die "Failed to delete vanilla linux patches in src_prepare."
+	fi
+
+	# kernel-2_src_prepare doesn't apply PATCHES(). Chosen genpatches are also applied here.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-01-28 14:51:38 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-28 14:51:38 +0000
commit	d414c993cafd9e31a370c4a5aae042c710df2419 (patch)
tree	a4e123f32e84e3c7c7fdde2f083b1831f018bef6
parent	21dbcce41990b13f301240313be05c8d013a9258 (diff)