gentoo auto-resync : 13:01:2023 - 05:48:01

author: V3n3RiX <venerix@koprulu.sector> 2023-01-13 05:48:01 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-13 05:48:01 +0000
commit: 4bc834b03b9438dcfd45780f31a02994c24608ba (patch)
tree: 1ee84a24bd250533fbdadfa949f438db20ba98aa
parent: 175512fa7c74d0e48a7a1b40a6e456435af0481b (diff)
160 files changed, 3604 insertions, 2058 deletions
diff --git a/Manifest b/Manifest
index eab8f1d85d6d..7f549572d592 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29806 BLAKE2B 8b24437b3a0f9b1c97b8bcfb3b0905df3dbce2400c0e1642d4b0cc7e9edb7393990bcf6233842c21b3f7daee0399818e2b23e0dd8205106ddc0151704fbd5b86 SHA512 89a251a29143abf6176eb2eb209b96f57a11f233cb5ece0e2e37c0b8fe8894aec6ada1721ffc4ae5cebabe1608fd2f16c493de5b7415695104b3041a56e4c5c4
-TIMESTAMP 2023-01-12T23:09:50Z
+MANIFEST Manifest.files.gz 29786 BLAKE2B 643dfb3cc8c65d685ff62ec23bd049e1b42fe53e2c3700a32a4a590492c23c00586d3af983d4579e3b9df0fba1c566e36648a3cd8ddeedaa8697e5d50854d637 SHA512 aacb730a20dfd6e96ef484bc8841645df2ca369b7e9106a8687d3b35eace50873e89bf8bcb6c2d3f9db1832439cee7545c098514ddff2da85d900928b9b9ca22
+TIMESTAMP 2023-01-13T05:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPAkz5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPA55tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBW8A//c8uKFl5GpSVlqjuqf6fIakrhdWp0CaaH3pLZUYRaNDuLzpOlH9Jctwc+
-bt+pdcsUhvbAFOyktm0EYIEJS30GsP27HupGaR4Ngrvhf4h/duN6G6TOR+Qn6pmA
-oACqnVrkHA2lB2z36yXZLaEwu5iiOcaD+fci975T4aY5y2CZ12lVhgV5DxB0lt5a
-buqBSzyw5rrLX0bdArUAuJVswxQI8PD8zidmGJFvZCACGSzLQToFAJDMwv/joa+8
-LZ64tS4fajgZcezR2/RDGYLt862CMDrYhgQj1XmkFmNhNeQIFWZLXKDhRr3CwT3M
-W7O98mjfeocpJTd1z3WV0N8AeWnCbU3Qmt0HB9Y7Krijb3H5N3RFMqgOcbyJhzwC
-OvsZRH0SuXv9AQpNNYLa/Yan67BXennU133HT2yVmgNgpy/dzcYJKDWYZ8cylUQK
-jjhPgW2sICez/NMiWcP+otoybvLzYhQgWnWyhYTgkcpmVMt87WclBQZuPGQPlKFk
-fEfJYYSTY+QpcNPKNrLKcLz1K0bDkPWc1FicrGOvO1RR55ODkVWPVbgwIQEnfs9A
-6SzHdwHySbGW+yUi3dRO7CFOfNbe+J1B0japM2rkFC/Hwz4t2W7hhYdRkiSFnT+D
-s03zR42rhWaW5UmxWcfXU8Msk8r/SI6SlLPasOt76snnkc/gzFc=
-=rKLG
+klAgtg/9GkrPUSk3CQ6GlOUSuf1La4Bijpzo70uHqDHN+LXhylC7uVOquQTNBOdY
+yxtspiinZ1vot3s78ngFRV35mY0MuStsVJmZ0RyM/ktgkmofdMSU/EejJAy+q3pT
+9Z9wyA4UFmkpYzJpuooasuMM1FTGYz8w/y1Dw0x1zLIAgZCSErEDfEbqDAZrfEaq
+LPQoltxnZS7SZjAuSOEtmWiVsQFuenNZK1vl1Lt6e85u9K5L2PAxCdcJ8gO4+aDC
+YovJyxgwxh6e2aJXAjMVamk8vlJtT3AKSy/QemePv7wt+qCQ6OOpCAH8s5erpxzX
+9aZ14CvfzGHtRBWHM90KoZq27tXKTiL7DL4XJdHlgTnD8J79M1ik6yquN3pTSI+D
+st9XPWHB850kRU8+q8/q9UTjOWsdWei8d3xebA1Kg+70qCdQmagWL7cS0HzJ5lRT
+flQm6pixqvmzSw1IW1X75J2+CLGO7wkDfrO709clAlyXV+ZDCLqJAKpCo/u/zYx4
+yIqVXtZf6hK4v7Ti2fkTK0i0ZWJq97eeDfyLcUTJXEfzlMbGP8ltW+D8JVwofW75
+V2bCkL1Bwz+K8SvoQeHSKoas7rE16h6hKwm3VF4RR7Vl7KLCYC8/ouVYigicZKMt
+0PhBOLPW6FYvI/8niTSAHZXmob/GSjczb25SuqamK8tbs05J/gg=
+=y/Lt
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d7d848ccaff1..3997f0abbe4b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 66c5cd4dbad1..2a2ed547ee28 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/graphql/Manifest b/app-emacs/graphql/Manifest
index a9f035d2f45a..fdfd458652e8 100644
--- a/app-emacs/graphql/Manifest
+++ b/app-emacs/graphql/Manifest
@@ -1,4 +1,6 @@
 AUX 50graphql-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST graphql-0.1.1.tar.gz 6021 BLAKE2B 62755fda880042e00942acc6dbf98219521c92d052eeb0c584e8bb83ae8fdcea46185270f5dff8c89762d11b409e31b42d4ae62ab6831b04437ac0de517f442e SHA512 53f4c8b70be07f38b3554c4488a98ccdb956a68585955c7afd9df52d9d39cfaf7cc0efcadae1f42099495b8729851d089cd03d4570ed2a91a3354dd19f12d5bb
+DIST graphql-0.1.2.tar.gz 6231 BLAKE2B 55b121b3040b55c8c690637ef5fb034c66e2837e1c22c3e1b37911cc7c26741adb15344f861195f8156c33e844a950e4e6fe97acc502321a561b9c7b249c7aeb SHA512 45b1b72f4fafd884633dab3b464079ed7c80e671b4d0a5f26dc57f058177e5f54ed453710d36e02062d80abeee5e0215aff395063f8e3124646ffb05bdeff8c5
 EBUILD graphql-0.1.1.ebuild 612 BLAKE2B 1800f3570462602ea3f4d6092b0b7d6f2f68ed3df9c9c008cdb6e585e3006e01489702fb171d770514f7fc223a00b860d8f46a8ac8ce8ea34515b80a02f942c9 SHA512 186dc499b4c7aa6bb0cf147fbd86818eea049c04ca3baace42ea02ca9c35c6acc7fd8fc3ba3585bf17eea8ce59117cff09502f91e637363467a5f189669c9bc9
+EBUILD graphql-0.1.2.ebuild 688 BLAKE2B 8d6a1f74ba807da6f2486a9ace5c7f468ae927fd8a6d908569a10aa2cd4d81494453ac3664becd74107e82c43ee9241981553e4c4c97890d8d3c8d5830b7fa24 SHA512 655d44fc735b1b620046d0315497d6d515feea0347025f4576e37e6df2ea6618c669b2a72b3c74b3a9f14544a0ee9f5918e2f3d46b37da80ad17c154164b8a1e
 MISC metadata.xml 551 BLAKE2B 84dde44b4095c3ea5b613bd36771d7aca7d47d1304cdf71cf7009f5d88450bf56a2d72a1e47d254f68a297f0820eddd38ff59a0f3a4f112cbaf46f879d1c3a70 SHA512 c78b49db661a5b7044190e4ae2f82f103c1f09fd6ab4a429579f89f7ebfebb5a25392ad79d7012cc997aa67629887aa6a6776a06ea81e1e36a1e7c3749501cf3
diff --git a/app-emacs/graphql/graphql-0.1.2.ebuild b/app-emacs/graphql/graphql-0.1.2.ebuild
new file mode 100644
index 000000000000..1ea6269125e9
--- /dev/null
+++ b/app-emacs/graphql/graphql-0.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25
+[[ "${PV}" == 0.1.2 ]] && H=67237f284f2dfb94f3cfba672ff64a37e1cb860f
+
+inherit elisp
+
+DESCRIPTION="GraphQL utilities"
+HOMEPAGE="https://github.com/vermiculus/graphql.el/"
+SRC_URI="https://github.com/vermiculus/graphql.el/archive/${H}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+# Tries to download emake tool on the fly
+RESTRICT="test"
+
+src_prepare() {
+	# Avoid examples which would require circular dependencies
+	rm -f ${PN}-examples.el || die
+
+	default
+}
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 1b4a7e0d2eea..e8297ed4b035 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -3,11 +3,13 @@ DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8f
 DIST org-mode-release_9.5.3.tar.gz 2049323 BLAKE2B e6a93a74d5084ca168fb85d2651c23a0afb75ac649cf6821cf825bb54d69d61ea4694584872b49a23bac1374f0b22d2d7015a346b0dd46fb0795b75c8753c655 SHA512 7062e1075567b7af9b1c39f38930fc1fbc72e53be3c063dbd25cc4e8295932ba501586fcb1e2879da1db4200e63c79a454f4225b5d53dafb1773ebb2e0340ec5
 DIST org-mode-release_9.5.4.tar.gz 2049298 BLAKE2B 7abd01bd78357b09cdc10661ad9b285c2e717c5848be2ff61df023d752659b6636881dfe17fe13486db8c9c37f576edfb02303f552c85e72594af99de7618a24 SHA512 06feb279c8e669fed263f9a3dbd8e0fa25450b1310a968d22b4f4d94b6a0515a1242758ed2c91a4d7c4c6b8315e756fe26951e9f9731ed3e7cfb7a0a8ef6999e
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
+DIST org-mode-release_9.6.1.tar.gz 2207262 BLAKE2B 1e5880b9a3eab54e0a6f94cd630bff1ad00f58a24f0f46c203de01ee12c0ce652a8dd820b4a71c2d011d1cca55c08830cdf5e33410e2bccba95845ae05a20408 SHA512 0bf1e4879ade377276b438d7f71cfa28a75b70380db16d79fb698f7ff4f79b80684bc28a69dd23bbcd94844365a0cec36d70bd4097cc12e2b942ad6a97a5af6a
 DIST org-mode-release_9.6.tar.gz 2203782 BLAKE2B 2355202c3f570c7b9dfd2613d2cc0401d4bde086111736ec8d7e0d3203d87b3e8888ce91869cf75960f146c2f591387b9ff33a6d5b3c0ee9eba455394d8cbb11 SHA512 d81036d64a8903b33809512858dd5983b925503ca18648131a651a59e616ab2b63621964f1d6a2136ff4aa38cd56eaf099d12471dcca350acac6a240e61908fa
 EBUILD org-mode-9.4.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
 EBUILD org-mode-9.5.3-r1.ebuild 1400 BLAKE2B 93d99c3e959140b0064b37d275b4b1163624748c5c8cc90caa345bb283a775feb5803cac35b7d51d5b8890da94e6a052bcdda2f8a98b285e7771dc6c6779be45 SHA512 2a97b5b025ea6edbbb3a5168609e3780b944497bed223d5de47e1d6bf5c3229edfe42476bf7264c618c00346f8c3a27021146a80d9a24d1ac172004b455c080a
 EBUILD org-mode-9.5.4.ebuild 1400 BLAKE2B 8dae635a451ccad2b84b274afe2782adf13a200a2cfb4b7f0ad72849d7c37dd51384645894596db8f0adc7a4bc0b6e0b52a4e346ad8bff238169cd3fedc6d5e8 SHA512 7ff47b6781456aed31ac6b5f11a176db98d5f76db66af3288ca970f02e06be41882d3bebb758e421fbb77425082fd2150e258070467184c3d040d957a4fe47aa
 EBUILD org-mode-9.5.5.ebuild 1403 BLAKE2B a63cdcf1e1efda30f0a90466ae11d38e3d952fe8292bf8ea21d483322f9558c9223593a0887c1117a61c13f60116ff390c497fa1c862db110773fd1f47c784de SHA512 21441fe19106edf83c3f29f8be8caada903f35fbd196e7e86d4b606a4db8f8be82cd955fd7319f56abaec308324c8a0f3732e7950e63c0afbc44424f433fbae1
+EBUILD org-mode-9.6.1.ebuild 1422 BLAKE2B bc9c0ddb77b26905d702fd5b6253cba32516f3fff1f33f660675b90b77d6145ec504907e09d2b7edfdb577d966b7f73f42409dcd5c70e338c9ff87587b72ec17 SHA512 39c4f3a02c6effdcb190ca9ce6f1201e560e65dbaf73e52e287f98441ec1718f4064dd0334083c4a530757d1ead1d4b417137ab82bc58386aaff22b363828622
 EBUILD org-mode-9.6.ebuild 1422 BLAKE2B df6f47926ce062612f24d8dd306a8fe06416cc1bb979622812c13a617295884b344a4f9677fb0d3e56330543823c2add19812c938f024026ac1f9333cc87b89d SHA512 250259ff8afd7551cd3d6c006976699dc6aad16a297b959ef1dfc5701d8623ce51f8c24caee946f50e000f98a365974cc6657e917e14acd69c690708f4ee272b
 EBUILD org-mode-9999.ebuild 1548 BLAKE2B bf1ed3bb0ae6a50d6032f1166362806289cffc5f7846517ad77b9c8355a12d657c3d084639809be5db9c5c8f33d5084c21550fdb9cdb2928bfd28e80d792a7fc SHA512 584c1f87a553501a0fedbec2a784bf7615588505fedc486fc8c9e7bda51af5dd83dddd420837998f322b649f8c230d26a304f7cb08a17e965a8b494c6ce56c27
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.1.ebuild b/app-emacs/org-mode/org-mode-9.6.1.ebuild
new file mode 100644
index 000000000000..0bac68a752b9
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake -j1 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake -j1 pdf card
+}
+
+src_install() {
+	emake \
+		ORGVERSION=${PV} \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 7eb521824de2..d2083ae51e01 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ackvim/Manifest b/app-vim/ackvim/Manifest
index 9b53fc12fc50..1f955324eec7 100644
--- a/app-vim/ackvim/Manifest
+++ b/app-vim/ackvim/Manifest
@@ -1,3 +1,4 @@
 DIST ack.vim-1.0.9.tar.gz 9361 BLAKE2B c1bbcd00d7ec5207fb7de0ff1a49df5ada31f02f1b4dfabc84ae3567f62d058224fb6e7d3eae338f4ba9ae09276a1ca3dc2a7025a154b93d008e243fc36ba921 SHA512 42c931433ca2554cee0ccdc576891ba82efaebb0e5301ab279b3db8160816892b6f6232da7389058177ef9640a07e9582409c852ee5b55f3c9ee0b6f547ae8d0
 EBUILD ackvim-1.0.9-r1.ebuild 525 BLAKE2B a9efb2a16765815197b500d9cd92213345abb076018de164966a915fe2dc9601cae738b25f10be0c17eaaa8cfe816f82897e40403522e358170280fc775828c7 SHA512 c1584b58eb21af819309bbaa079d8762cd8a69034e12dffd243eca49bdc20d160ac92a3e5ba4c5c0d09e53cfb4a57ed421453dd1aad4b1a25c00b963e8138ced
+EBUILD ackvim-1.0.9-r2.ebuild 567 BLAKE2B cefa3e81d777875aff04041b4b011e4ba9f656943c802140df8473a71f55506a130402188a7566f2540ec6a9e35abb463c285f0c86c91657a4e4c57612970f70 SHA512 c41d57faa15d4cbfdf580f2a0d3b4b1f0ee1ec2df449daec81e5dba3fc414f2267267ede733e6e4b280826e1e88ac9da4b981cd2dddb58c555e1441bffeca293
 MISC metadata.xml 442 BLAKE2B dc75b2fa7da6dac82d3b53bc7b5320a474378b6d29bc55dce2dc7e399bac63ef13fc777332fd9387aec7b0a27c5d9e20e0bc3d7e91847b7a21626f1771686d86 SHA512 ad589a7f6c2d4ac8f8cd3aa97d6830424f9be0f3f589c55f57eaae8a6d407cae75e2069781e7e0b8222b6601612d63e36ca65e77c3ecc85e70d7bf996c553cf6
diff --git a/app-vim/ackvim/ackvim-1.0.9-r2.ebuild b/app-vim/ackvim/ackvim-1.0.9-r2.ebuild
new file mode 100644
index 000000000000..85fc526a2a0d
--- /dev/null
+++ b/app-vim/ackvim/ackvim-1.0.9-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="ack.vim"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: run ack from vim"
+HOMEPAGE="https://github.com/mileszs/ack.vim"
+SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		sys-apps/ack
+		sys-apps/the_silver_searcher
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# See bug 584768.
+	mv ftplugin/qf.vim ftplugin/ackqf.vim || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 15bfed5a5b70..3150f6c3a780 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 6b28d3cfcf7b..ee8fb3eb4cb5 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,5 +1,3 @@
-DIST imath-3.1.5.tar.gz 570875 BLAKE2B f78c8278a3ecb40afaa291b74c50c2ce01a5cba594e690041a57cfd3a65f9fe0842a41d600906ed864df239c2753488dedca53bdfa65a90c13513111a8068ca4 SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d
 DIST imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd
-EBUILD imath-3.1.5.ebuild 1800 BLAKE2B 4357749ea76d54448372fc725968f98cdadf09d72523608c12de014491d61e5eff9fce3a8ee620dec5ba726457a1c051a83c3ce92801a2b09c845c377fb31e63 SHA512 59917c1b55c7a381585c4cce24700f29c4b495a2fcd8d4376a5da863175bc2274d8817ec668563bf372968134e393d6022e674c92a4d59fa9e3078e54f01dbd2
 EBUILD imath-3.1.6.ebuild 1800 BLAKE2B c44864d2faed29ddad61ce7150d14c2b1018144bd25b05def6da275372ec5c7c8e03dccc5d5ab8b8d1b9c6dff887dabd146d3ffc58026ee418b31d2b69272036 SHA512 0a6d24a7e7ae5555149f2051e2050c1c0727493a218e393b009621322c9800cdbe6b4d864c6416343d19938bd163755586d2100dee8eac83fe0c1c03261e45de
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/imath-3.1.5.ebuild b/dev-libs/imath/imath-3.1.5.ebuild
deleted file mode 100644
index 0054d044b1b5..000000000000
--- a/dev-libs/imath/imath-3.1.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-MY_PN="${PN^}"
-
-DESCRIPTION="Imath basic math package"
-HOMEPAGE="https://imath.readthedocs.io"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="3/29"
-IUSE="doc large-stack python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# blocker due to file collision #803347
-RDEPEND="
-	!dev-libs/imath:0
-	!media-libs/ilmbase
-	sys-libs/zlib
-	python? (
-		!dev-python/pyilmbase
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCS=$(usex doc)
-		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
-		-DIMATH_INSTALL_PKG_CONFIG=ON
-		-DIMATH_USE_CLANG_TIDY=OFF
-		-DIMATH_USE_NOEXCEPT=ON
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DBoost_NO_BOOST_CMAKE=OFF
-			-DPYTHON=ON
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DPython3_INCLUDE_DIR=$(python_get_includedir)
-			-DPython3_LIBRARY=$(python_get_library_path)
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
index dcdaafd04810..189031c0099b 100644
--- a/dev-libs/libtraceevent/Manifest
+++ b/dev-libs/libtraceevent/Manifest
@@ -1,9 +1,5 @@
-DIST libtraceevent-1.5.2.tar.gz 135283 BLAKE2B e4202fc3c9b09d20bed375bc1833a4f49b63cf484e63ecf3cc5f1f3950a1de7607464e6c2ae194085e78978e5f480a7ae392a4cde739c3a244367eaf1000f70d SHA512 3804a84d2a4771335ba14a7383f977d641e6437f055837c2faece811b8ef931cfa9d38082bef48d96092aeae8cdcb543222a3042b2c11c41749dddbbb4813d94
-DIST libtraceevent-1.6.2.tar.gz 135857 BLAKE2B c5384d9bb8dc5977cfb412c22d9692ed757f94dcd01b6a93e8368cd3368bf2731c0c4eff764fd81b4627925e0fd370acd509710b538842708836b5d0ce777003 SHA512 8e951f66c339de2bc78c7c7f347f9283553ae62adc9e2bb96de1ed0aaadf91d59b2e93785c5030b0dd6d946488dc5e688d504eba54d674454c808c320127cfbf
 DIST libtraceevent-1.6.3.tar.gz 140072 BLAKE2B 416fa68e2604c3cc71323171b084261e38f08f630a03afda0e2ecc4860c8b08dae10b2abaa2afae54d2b4e382720b43a6616a9ab8599759de102af918eeb24fc SHA512 8064eb18dda6fdbff020759ed92e785b87d34be9ebc30cb6085785edeb8d7252cabf8d33d8738a3ec407672a3d891884d0f0b4c551fce26c76fa8eaf61b9e2f5
 DIST libtraceevent-1.7.0.tar.gz 147876 BLAKE2B 0017315845f96b6d92a9d4f6e0f2de5e130324c3142b382284838ee52db8df5892b7e9394690391cc2215a29cc685401767b0e5b64a493d8b4793b1fbb8d10a2 SHA512 ecfdadf450cfc4cc0ea878089b2f0f2bab68987609a39341c665481e0716f2ab3d3441fae72163354ab8ceebef0648d873a81ec00ce38e00066a60a2ad1673a7
-EBUILD libtraceevent-1.5.2-r1.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
-EBUILD libtraceevent-1.6.2.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
 EBUILD libtraceevent-1.6.3.ebuild 1131 BLAKE2B 978b12709e600b68e6046493323cb79ea4c1cef07352672046727036b33f48e6a44d37bc93cba37708716aaa4f8d58919a8d0043988705975aca96c908672421 SHA512 19239589602dda2b722cd9ba4d7037b047979b31e7024feb4a9f5e7d8dc226c2f8343726004e463ee57edd4c9c3668e0ade6e2189fd8ba7d40965516351abd5a
 EBUILD libtraceevent-1.7.0.ebuild 1139 BLAKE2B 7f3dd44a78be2d7017917d0f7901af9830e7d86ded1f34f3501e9c8775ac3c6ca50a8a454addafd55e29c3214ff403ccea308539be6de841cca95fdd885d3086 SHA512 8a21048d44869d56aff563619ba2c5c4daf4ea21034edd381572c6071bfaefebe10041d408e89d96612d6df260588e3d5a1f54a40edb2b4e0e2d80b112870724
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild b/dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild
deleted file mode 100644
index b9bb4041b4e1..000000000000
--- a/dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace event library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	!<dev-util/trace-cmd-3.0
-"
-BDEPEND="
-	doc? ( app-text/xmlto app-text/asciidoc )
-"
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
-}
diff --git a/dev-libs/libtraceevent/libtraceevent-1.6.2.ebuild b/dev-libs/libtraceevent/libtraceevent-1.6.2.ebuild
deleted file mode 100644
index b9bb4041b4e1..000000000000
--- a/dev-libs/libtraceevent/libtraceevent-1.6.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace event library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	!<dev-util/trace-cmd-3.0
-"
-BDEPEND="
-	doc? ( app-text/xmlto app-text/asciidoc )
-"
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
-}
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index 216871981586..be6fd81b4b20 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -1,13 +1,5 @@
-AUX libtracefs-1.3.1-musl-pthread.patch 505 BLAKE2B 34d07b0d7527d245f459bfb0a8339da56f7deec1a064c74a8419375dcec9b0c46ec7348603689846a60c0afaccc02ee4956cddaff42910d493c44fde343e1a04 SHA512 2d097f71c08625b4d0c49388537a73c06cea7047c34c04bba6bf5053308c49e8cced7da8cb9b173c00b18160de7404ff9f8cbdc5782ec6ef9c2a89b3d4f76790
-AUX libtracefs-1.4.2-fix-test.patch 257 BLAKE2B 80d8dab428f5d2e4a8124437c8468c6cf941c4b3f03cae3330db684e2b01060dd5c5acacae63fa3589651cf3bf213264fd0f408c7404248a0f57ef1fe0472c92 SHA512 42068f3009e81f3648d89515ea057e58f6327794316315248a5f0ec5351c76aaffe8815a8587cbaf2d3bcb6386f2238b1a735efda685bd3ed9d675a213201174
-DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e47b4c41ba1e887b28465d3a0a6bf10e5d2c60f81615615176bdb65e10ef7e2b7dee5cbb214705cc69e55bb923231c SHA512 1d8423ff1033a4ab601dd8e9fa4a801c27425234505070733641c8c9a4dd382cc6563d3fde89958f18e0bc95e2cbbdf65e69a2935fe208d5de9fd3ac26374ec1
-DIST libtracefs-1.4.2.tar.gz 178382 BLAKE2B a956423370077613417812ad18da284521e8798701d558f4e419af6c43bd8a06c489525bbab26e6bc5d5d5e8fd0e6a7322d34f976a4ea560670eb594818d07fc SHA512 4a66c3cf8050de5acc4c63996cbcfa2c014e26ad6011eb89b0cff47ffbd6343637009354edf6bb173b9fd08103012774376c33fd6f642741f7990f2d6de3ea0c
-DIST libtracefs-1.5.0.tar.gz 179569 BLAKE2B d69d4bb2c9cbf6dd971afaad280534ce8af4982ca76c7b12cb8432f56a01d622a5d58c827cfe86537e5db2a416ab1092c95309b77b766b183266e1ad22ad8d13 SHA512 5e936a788473c0eb373144231ef9ac139ae53b4685053dfed74157a9432d429f35b70290607679eae9f44fd858d2102a02c3beac35d8de35d856c3c1001644d3
 DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340
 DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa
-EBUILD libtracefs-1.3.1.ebuild 1391 BLAKE2B 28d81702b711190ddfa0b62a322ab222566c1ecd7185df38e1c30a57910e976f5c7fa42aa32b322934585cdb35d9936a0736e00c5674107ee58629dada2db684 SHA512 566dbbba263d368be4c3ddcc406025bde03f92555d1717bf958a6b71d3833bffea0bb68b3dfe4b50a542108522663e4fc549473379e7447061c2ddd90ea1bbb2
-EBUILD libtracefs-1.4.2.ebuild 1387 BLAKE2B b81fac4348de3bc92044a17bca680c836902a935804d8062156962bb5f9db5125631c28c61d11afe62a6349b34365a8918c1c78f4c419ff1bb34443b6699e0b9 SHA512 f7ed18ce5665c6d37a7148ff4ce3e9ac550f448c8a5699f9c346490c1624ed0ff584943c13cab52f2a2f29929a21d58abf8248db60c6f9aa57edb8f21ebf4b75
-EBUILD libtracefs-1.5.0.ebuild 1332 BLAKE2B e04d00b575e72204012ed76e0747e7a8f4f097679bbdf4c6b567f34978348ba1b05cd3dc626e93c030f4ae8a8c283cf68ade51036d68ff8a00df9ef1fcc90bd2 SHA512 c1e5ddbf5861db37d3f760acb9b02664fff89ff9d3abec944ea9bfe28b185353018d894d1abf82a9bead0ba09e9654b4cf60d4890395ed964bbfd502bfa1c847
 EBUILD libtracefs-1.6.1.ebuild 1331 BLAKE2B 071fa984599a0fe26be368bda86d09d835f46667d08bf1a134d95fca8519bd2406c43db47caeacba786fcc3da566aecaf0b22c04dec9f3426e8616f7d1384659 SHA512 01711c1f4510efad2edc1d3810f5adbe9348bae6f49a82fe139162f0795b5d52fbfd87228f0afc2820e99d6b98c9b017d1caebeb533086c62ba99db924dbc295
 EBUILD libtracefs-1.6.3.ebuild 1339 BLAKE2B e496720a68a772ef7ad97af1f5486af4d9dfa4589dafd190bde1d7bd1e45c7b8ca6da890ed9add0492209065d7036f97be83ae628e209281485256e91127f811 SHA512 6fa9b7610fb869d3c719e93ffad06dbb108732ce88e2bf1f5176d0e4369bf1df7282c9b8dc154e442e219026dd2b94cb9b14e55c03e81c3a564be8bec2f6acb1
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch b/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch
deleted file mode 100644
index 0f909111150d..000000000000
--- a/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# On musl it is necessary to include pthread header else the compiler cannot
-# identify pthread_mutex_t as a known type
-# Closes: https://bugs.gentoo.org/855893
-diff --git a/include/tracefs-local.h b/include/tracefs-local.h
-index 926fd02..779e853 100644
---- a/include/tracefs-local.h
-+++ b/include/tracefs-local.h
-@@ -6,6 +6,8 @@
- #ifndef _TRACE_FS_LOCAL_H
- #define _TRACE_FS_LOCAL_H
-
-+#include <pthread.h>
-+
- #define __hidden __attribute__((visibility ("hidden")))
- #define __weak __attribute__((weak))
-
diff --git a/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch b/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch
deleted file mode 100644
index fb2bdb2f5995..000000000000
--- a/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# Fix PATH_MAX not defined due to missing limits.h
---- a/utest/tracefs-utest.c
-+++ b/utest/tracefs-utest.c
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <dirent.h>
- #include <ftw.h>
-+#include <limits.h>
-
- #include <CUnit/CUnit.h>
- #include <CUnit/Basic.h>
diff --git a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
deleted file mode 100644
index f3049d954da5..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-RDEPEND="
-	>=dev-libs/libtraceevent-1.3.0
-"
-DEPEND="${RDEPEND}"
-# source-highlight is needed, see bug https://bugs.gentoo.org/865469
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.1-musl-pthread.patch
-)
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
-	# install-doc is wrong target, see https://bugs.gentoo.org/865465
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
-}
diff --git a/dev-libs/libtracefs/libtracefs-1.4.2.ebuild b/dev-libs/libtracefs/libtracefs-1.4.2.ebuild
deleted file mode 100644
index 70e3e35683e6..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-RDEPEND="
-	>=dev-libs/libtraceevent-1.3.0
-"
-DEPEND="${RDEPEND}"
-# source-highlight is needed, see bug https://bugs.gentoo.org/865469
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-fix-test.patch
-)
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
-	# install-doc is wrong target, see https://bugs.gentoo.org/865465
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
-}
diff --git a/dev-libs/libtracefs/libtracefs-1.5.0.ebuild b/dev-libs/libtracefs/libtracefs-1.5.0.ebuild
deleted file mode 100644
index 440403770349..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-RDEPEND="
-	>=dev-libs/libtraceevent-1.3.0
-"
-DEPEND="${RDEPEND}"
-# source-highlight is needed, see bug https://bugs.gentoo.org/865469
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-"
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
-	# install-doc is wrong target, see https://bugs.gentoo.org/865465
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9047edef9b40..d7742433841d 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lambda-term/Manifest b/dev-ml/lambda-term/Manifest
index c693978ccd68..325bed636573 100644
--- a/dev-ml/lambda-term/Manifest
+++ b/dev-ml/lambda-term/Manifest
@@ -1,3 +1,5 @@
 DIST lambda-term-3.1.0.tar.gz 144714 BLAKE2B a84af472834f33ce0a88b0e21f13db66e5b28576a959c0c2e173da045d4c408c183c9eb9664678de7574b840bd129284e406af3d7392ceb0b8be3e53973214bd SHA512 b1601749214747504a248392ec81ce20f4cd44bddbf14424e40725e6d506d925320fc7ef7f4ce58e876769d858c5e3882664e27ca33a9dc74d29a4a22ed0d705
+DIST lambda-term-3.3.1.tar.gz 142511 BLAKE2B 43238adc5f2e780903edec79d190ebbee27dc719ec166f693354f76148d115cbe35877f469662025805bbc8585bd2e8d59e1bd52c90bcc5c201b70863effaa27 SHA512 0cbb35717012d648175cb74677e857973e40f153f3d85adb28bcbcfdaabb7b0f35c4b0ce88cd6f2158cedfab74d16acc1b3b987161a71dfda24892f34393b3ed
 EBUILD lambda-term-3.1.0.ebuild 533 BLAKE2B 2eff8937debc2ed3fcdfca40483fee94e2d8443a5fbbb3f52f7278c9a5f88e011d555e9fafeec4d39c85c96568b752e9a35f5134af9f0252eee5f2893df04e43 SHA512 e53683b52d81612f3698b4bfdae3e0f4bc55f652ef17c842583e732c020ef17ec30df48ab86d5c2b08bfca7c63a76b4633cf58a337c87f913928e96cc2711016
+EBUILD lambda-term-3.3.1.ebuild 533 BLAKE2B ac585e1221c7a3c2b514cad1112b514a248b11aef235d48ee60d3436beed11c2641d828f0017b4d99e7a079f0aa2a9e5694fad571db5ca0c582455cc9551f827 SHA512 81cc9bb64a47b8b55e838731ead8981a32af79dc2b177027e944db2791c2c240808fa48defc55dcf83439d454b0095fc943c4cc22873a79054109873d3cc48c6
 MISC metadata.xml 979 BLAKE2B b9b1298397f0b376d54f7d5920d47a58e11f1345d04a376273c9ba21fe7c80c3a3058ba4e73502092a0a63d8dd9e493002c76bf031ecba23112adc04e8c49b62 SHA512 7160fadbd00ba69a20e10a16ab30a53f2e348c866bc45466dd064d05c99e4b0abc3f19831b86f0711e791c9cafc6a9c25fc2f0956a3fabd98509189d1e926688
diff --git a/dev-ml/lambda-term/lambda-term-3.3.1.ebuild b/dev-ml/lambda-term/lambda-term-3.3.1.ebuild
new file mode 100644
index 000000000000..a24670b816de
--- /dev/null
+++ b/dev-ml/lambda-term/lambda-term-3.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Terminal manipulation library for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/lambda-term"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	>=dev-ml/lwt-5.4:=
+	dev-ml/lwt_log:=
+	dev-ml/mew_vi:=
+	dev-ml/react:=
+	dev-ml/zed:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index 46a621fbcf7e..8b61902cce9e 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,7 +1,9 @@
 AUX 50utop-gentoo.el 100 BLAKE2B eb2061a156c26f41f06076905e66212743aca67b3692c14f5347006aeda59f05d973f766fd65c97dfd14ab0dca22cac831076c7809e12d509253483cd0ab8bb4 SHA512 80ef89749dc68e7d339bc6fc63984b56913b3d94c22fa38ab82a6d4e4867ea30e94ce116d25212785d00ce721909fbda3cb3ff9e710e617e241b42f8152b18d2
+DIST utop-2.11.0.tar.gz 416351 BLAKE2B 14d407bd79f83b9b0307ec34ec9330e625e0e5fbc4b4091f98a45d90ff6225c292b6d764746273a5b7e7abda74c83852056f470d8f2f3b16fffc16569ecc6f98 SHA512 ebc27219b0345ab1478499221756806874c430f81aa9f40e7d482d0fd948750919d631b6159faec19fef0d23d14e6a115e6b21a5aa724ce1534e000e5d35bdae
 DIST utop-2.9.0.tar.gz 414953 BLAKE2B 96fbf38d4a638137b73264bc523b8a81e47ddd609a7987073313f4b1d628e4e84c31f98195105911dd0930b8d27007cf5cc1633771bc6d2e975bd169e1e3ba9c SHA512 dd3f52fb915493cb32b5ee722361e884a481d04ef175d5bdf58f4032b70826c38b2f5279b7c64b78961170a86bc80fbd59f03026fac99bb5da2b46a8f341aa45
 DIST utop-2.9.1.tar.gz 421430 BLAKE2B c90a7fe54c5fbf15ce209e9bf850031e0368104c1f8f61a2d982b2b43d87b4bb95c91e3af6da16ae27ebfab71f2b9907e7dec68d34f619597fe8db45ff363bf4 SHA512 10942a4c7d2e13081f2e02c29b767863176fe90ca5baf48d3be47bb0871a12840d873e5d3eb7d7dd9b0362e849f70afb913ff50c07e66c6b7f221c8bb98fa469
 DIST utop-2.9.2.tar.gz 421512 BLAKE2B 235b4739e644877e4b9eef432a00ba053f42f2b4d4fdd9b0bd925af736d9a351c8f9373031bc4fc23835872034d48a27b8eac99d286f57cb975d2b1368f420c8 SHA512 14dd690b459cfea90c565b397b5d914add7e92b152b476ab58576dc827fa204b3d721955bfc3508bcb953778a8d6fb3b299b0293f8ddf64b3f0155fc9a0e7fda
+EBUILD utop-2.11.0.ebuild 1058 BLAKE2B 576941435287305e92e5416ec2a23836f8acb7f99280d4ee4ca679e8abe278bc208bf6b8593fb2a0f2332525146f9ed504efd8f497abc6b0089a91edf998e4a2 SHA512 e3d36e0d8c22ff206e05f75803321bdf7388273fcbc3b277bb835e10c2c72708b50e641641ed1cd155c813035366ae743ecf8d3ebf68ab3cfbc8e6dc39f394e3
 EBUILD utop-2.9.0-r1.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
 EBUILD utop-2.9.1-r1.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
 EBUILD utop-2.9.2.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
diff --git a/dev-ml/utop/utop-2.11.0.ebuild b/dev-ml/utop/utop-2.11.0.ebuild
new file mode 100644
index 000000000000..a975e9bda1b7
--- /dev/null
+++ b/dev-ml/utop/utop-2.11.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop"
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+	emacs? (
+		>=app-editors/emacs-24:*
+		>=app-emacs/tuareg-mode-2.2.0
+	)
+"
+DEPEND="
+	dev-ml/camomile:=
+	dev-ml/lambda-term:=
+	dev-ml/lwt:=
+	dev-ml/react:=
+"
+RDEPEND="
+	${DEPEND}
+	${ELISP_DEPEND}
+"
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+	${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs &&
+		BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} src/top/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/uuseg/Manifest b/dev-ml/uuseg/Manifest
new file mode 100644
index 000000000000..fac47c8eb601
--- /dev/null
+++ b/dev-ml/uuseg/Manifest
@@ -0,0 +1,3 @@
+DIST uuseg-15.0.0.tar.gz 25540 BLAKE2B 4ee1512bde79aab4777395d3ccfb8fe76c97ba7e93b722acd7c36acac432a44a9eade512ea45a0204a1d947a60e3d61773de05890d64d7afac4b1965d1493bb3 SHA512 c117868d52ca8f5de3104b0ea25ea011c19cefd53018c4d9bdf900185d04f74c097b7f129b75366a8da905a79dac3cbf8e6c66ff6c20fee1c2e42b9cdd6a9fa6
+EBUILD uuseg-15.0.0.ebuild 716 BLAKE2B f7f9bf91292d206612de4694d5f0d0ad5dcad001f64dc79ec051346745e055f21c05d16b5f02cc64b8061334eb33514d431a0fcd8d8d775ccbbd5a060b1ccfe7 SHA512 060f48421b1d1b746124d5501d6b1684153e6abb446275083a4052a35b988bb521e51c25dfe78a8b8ebdc17c8ccd45452f35853b5729b51af117ad8255ab57a9
+MISC metadata.xml 1002 BLAKE2B 14f5a9298b9d11dd13223511e22eb4125f424236cb53acfbe19030abd6c2578c26d6388dd11724bfb7bf4ebb9b4c9bbdf7e69020fbfbec39d12cff3b5af61d85 SHA512 2263e315de73941247a7926928e648b6c5dc2fac151b9db1dca7dc5d1af3c80c1cb72d5ec601ad262f2166fcb4cf7532ba0ec8a59f6455ced007f6282299f63a
diff --git a/dev-ml/uuseg/metadata.xml b/dev-ml/uuseg/metadata.xml
new file mode 100644
index 000000000000..83ae1c163f95
--- /dev/null
+++ b/dev-ml/uuseg/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <longdescription>
+    Uuseg is an OCaml library for segmenting Unicode text. It implements the
+    locale independent Unicode text segmentation algorithms to detect grapheme
+    cluster, word and sentence boundaries and the Unicode line breaking
+    algorithm to detect line break opportunities. The library is independent
+    from any IO mechanism or Unicode text data structure and it can process
+    text without a complete in-memory representation. Uuseg depends on Uucp and
+    optionally on Uutf for support on OCaml UTF-X encoded strings. It is
+    distributed under the ISC license.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/dbuenzli/uuseg/issues/</bugs-to>
+    <remote-id type="github">dbuenzli/uuseg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/uuseg/uuseg-15.0.0.ebuild b/dev-ml/uuseg/uuseg-15.0.0.ebuild
new file mode 100644
index 000000000000..d3dd9d062ae2
--- /dev/null
+++ b/dev-ml/uuseg/uuseg-15.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit opam
+
+DESCRIPTION="Unicode text segmentation for OCaml"
+HOMEPAGE="https://erratique.ch/software/uuseg/
+	https://github.com/dbuenzli/uuseg/"
+SRC_URI="https://github.com/dbuenzli/uuseg/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/uucp:=
+	dev-ml/uutf:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/ocamlbuild
+	dev-ml/findlib
+	dev-ml/topkg
+"
+
+src_compile() {
+	ocaml pkg/pkg.ml build --tests $(usex test true false) || die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
index 25df946b2a84..50552fed2260 100644
--- a/dev-ml/zed/Manifest
+++ b/dev-ml/zed/Manifest
@@ -1,3 +1,5 @@
 DIST zed-3.1.0.tar.gz 45535 BLAKE2B 8c8898f01add91807fa282baae1c5ee34e77c5234e87e4c79c17a9f55756d3b4c2af5f0b01deb9414a657f63ea6cf6db44af7249adb0f2b147e923b4112a7dd7 SHA512 d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a
+DIST zed-3.2.1.tar.gz 43683 BLAKE2B 311fc78674116df9e1f9119102dbd6a882b305c22db0e6b59332d1a71f5a85f7169ba860f7064a72c0825e745e1f0a14f6bb247403a90ebc66a6bcec6c0d25fe SHA512 a1de65684d04d5d44ca4396365c98bfa070cf7c78318b53c3ad3ecca2b411450158ef7644b235490d879b37fe983f1707fef527b69af0c2958e45fd1e7a30f11
 EBUILD zed-3.1.0.ebuild 481 BLAKE2B 601461c875758a110f37dbae328bbd1d60bd83aa3716c367bb5cfb293b41f643f684c1ad2d6575a550986befca0c77aa7e1de33b4ff7cf843bb2507ced796588 SHA512 50b8d34ecfab53c921fc4c03afade28de347d77adc074c6cf6de757894cb7f9aeb21b7123b20904dcfda4fc744bdf190bdbfcecdc11b8ed7a494125f7101f1fa
+EBUILD zed-3.2.1.ebuild 498 BLAKE2B 85e753d0e68087f672cfe6629dfe23bb9a7baf3039e59f17cadbd117cff0957fb2b2bccbd025d864c8bd8c18d449cb8886158c5840e51a200417fa7e0f08f3ed SHA512 8e3d1621afa6ec1b461f56fb223c8ed6ec84cd74cd49a2efb76ef1a4c8c325d17c6b14961baebe3244ad680fba92711f62313b375fa016972bb39be5d825f065
 MISC metadata.xml 954 BLAKE2B d34a05ffaf2d7469b3ae6b65399a316279748536b93b9868f83484d0d719db9af3f1ec7fd834c7fd06902292231c3a964df8d94ad7c7b1044c614bbfae41bf53 SHA512 a44ecc312b950eeb782987e69bff55687be570ef304ae8689c8f1d5afd29d3990a54245a0229c1cff1964cd42e343350350fae30037b8f6856dd254893af8690
diff --git a/dev-ml/zed/zed-3.2.1.ebuild b/dev-ml/zed/zed-3.2.1.ebuild
new file mode 100644
index 000000000000..91421c5d8ec0
--- /dev/null
+++ b/dev-ml/zed/zed-3.2.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="Abstract engine for text edition in OCaml"
+HOMEPAGE="https://github.com/ocaml-community/zed"
+SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/camomile:=
+	dev-ml/charinfo_width:=
+	dev-ml/react:=
+	dev-ml/uuseg:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 58aef097e39d..d01d656d7578 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 070537b8b489..aeb11ef3ced0 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,12 +1,6 @@
 AUX trace-cmd-3.1.4-hang-make-4.4.patch 3094 BLAKE2B 7e2a83981b214125daff015b464f8c6c233fb91944b2dbae7c38b4440045bb872beb47540d63736b580d45ffedd3345926b14a3733ae9b1d1cc801f09f3c2943 SHA512 ec660038b02b2afed0b06d08be79ad6fbae7ea02caaa88367ac5b8c59b9ea9e52f3f01f77d936188c612c3c2521f6d6925f5e4c5a1de6977586373d0568311d3
-DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
-DIST trace-cmd-v3.0.2.tar.gz 308097 BLAKE2B 109cf260a2bc219c9bef92fb85bdd5abd0698d261ecec35ea31b152986af720aae26720cfa6148f798fca1d33f631ea3e50906a5fc7ef00dbd705c63d3b83f2a SHA512 3f364409f4a8931a09b762b19ee19ae52215b46e7ed90610a0fa4092e71d88d0dae91353ff98ba11f18012c27ef67289097c6c132f0f07193fac459ac52861d0
-DIST trace-cmd-v3.1.2.tar.gz 317611 BLAKE2B 485d62bfd6c7e3dedc5c3a9eb18af4b425bccc03e932854ef87fc0d032ef011e68cb978b34e319d97b85b24bba6d16ce619faaca8d96c77be1b64b1c4ca06e69 SHA512 d894842c11d895e2753fe254a83ecdc6bedcdfe1eceba5d75f1302b5476c9a3114c1fc5acddcba19ab05eaafb30db97e2e9b51b90afb1fd0550f1fbe0f59e0ac
 DIST trace-cmd-v3.1.4.tar.gz 328452 BLAKE2B 6d3c964d1ba585213b75834b1037449464e5d54e5f49ed5b532cc599f6b960b79d0f0327a6af38e38b3471b54316810d9f05ef6cc7a3a4e39ee7eec9864e5ef9 SHA512 93ad775c1767d2a02b72386a29867c3bc141171403c152c0c4cb907da16b5ae69100924279d9529083449c1774c97c35d5b4790b188bcd4930cfa69076cef0b8
 DIST trace-cmd-v3.1.5.tar.gz 328689 BLAKE2B ae77b418505c545ef2b701c484cec944b6d8b9e7b0df9ea0a6475b099d59997a426a4c3f69fc2cfdaaaa4280f5fc53b18caf7a39011cd980fa331122f59feb13 SHA512 7262e69a990986975f0ee9287b16afc48f4f481fcb54ce64ca51dbba2e4c8cbb3c7c7d3d888aba10f3b12ac6b1cf9e612dd98982dc8d48ea221d231e3d16ac4d
-EBUILD trace-cmd-2.9.1.ebuild 2787 BLAKE2B 22b4be76ae6d985733791fe7c47fc274b83e5861695b99d4065e24667e567704591f0e532867e6524e603101c7a7b131eed7ee310beb2fb6f69dc279d7360548 SHA512 589e69f1c0c06887bfd27438617c9038ee59e4c9f21bf0807489aaf1c114b630756ed31a37c2fdda40c5474aa6a2699b88fd71e2eb0d356942b065e75cbabd61
-EBUILD trace-cmd-3.0.2.ebuild 3028 BLAKE2B dca25da4895984203d401b75e79328cfc4e80408f62792ae63c17ef5c41a388f725af9d1054f23f83c20a0cce754b3638eaa02de6b5599f2c7c7be44f9ad189b SHA512 089bc4e6ecd966bf37217bc1bdbe06f883cb9f3116e3b69591a229baec093c9638e3305ff7efac4e2a58cf22fdc44885f7cabeee8760c370ac57cf49ce9903c5
-EBUILD trace-cmd-3.1.2.ebuild 3028 BLAKE2B 2d9f8226f5423bd93bc3af018108bcad3dc19f87b25aa17a30eea44221602a2f57372e020ac7254e08f9f00d9a4d4bff0248ac745ff5aba56fd1d614254269f9 SHA512 d9578451a54a19e52f2a2716543366b69da83c90ccf426f6e01f50b98b90306aef0774d9e239a1405e63fc1157236fb5805e03f72ed20c4d55a23b5a64628cbf
 EBUILD trace-cmd-3.1.4.ebuild 3302 BLAKE2B 19a58b8d6aaf7bd964e4ef036463f2cd2dfcdeef4e9f33394585477957e6acc85bf8d3a9384f5d414889d5ed2154f9c624d1dce4848761ef54cdbd61baa14c86 SHA512 cc46c5c67a21d95fd8f948c003ed6e0caf02782538a7f4dfabd50351bf4e3ee3afe14572fc88ede593c9c408172fa7d71110e7a1b7f0ba3d88b190ecae7319ad
 EBUILD trace-cmd-3.1.5.ebuild 3317 BLAKE2B c0b524b324dc5c14349a28f43fe61465ded1caddbf9a46905dbae4cd258d9b2e23881f92f7b4cc56354a9b642d9e699bb97a25f759e5cc572609cba2293bfbcd SHA512 814e02289dfa8d4e88b845f6d8297a1aaafe848e5b3508dc77a2bdc0cad874cc63cf04cccfe48bf03a496a915150b9b25c332e3ac333939f8dc9d535f9a42952
 MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
deleted file mode 100644
index f34720f3ae29..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-	doc? ( app-text/asciidoc )
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-i Makefile || die "sed failed"
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild b/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
deleted file mode 100644
index e0a9c53636de..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86 +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# XXX trace-cmd autodetects this without configurability. This might cause
-# issues if the libraries are picked up with the useflag disabled and later
-# uninstalled
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	zstd? ( >=app-arch/zstd-1.4 )
-	>=dev-libs/libtracefs-1.3
-	>=dev-libs/libtraceevent-1.5
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-	doc? ( app-text/asciidoc )
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-i Makefile || die "sed failed"
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.2.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.2.ebuild
deleted file mode 100644
index 0d772370332c..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.1.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86 +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# XXX trace-cmd autodetects this without configurability. This might cause
-# issues if the libraries are picked up with the useflag disabled and later
-# uninstalled
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	zstd? ( >=app-arch/zstd-1.4 )
-	>=dev-libs/libtracefs-1.4
-	>=dev-libs/libtraceevent-1.5
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-	doc? ( app-text/asciidoc )
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-i Makefile || die "sed failed"
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index be39b17148bc..b56681144302 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 408aa6af5123..1a6f0cb513cc 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,3 +1,5 @@
 DIST naev-0.10.1-source.tar.xz 444805652 BLAKE2B 5855608c14ba2d32824d14867c60b91321dba0be44e9857f795db308353428c6c0fcf891dc099221695e94479f6bffbc309e97380751d70b55f2060f889a9144 SHA512 91a1f3909462cb00a366a5006a1ea5da289f10dfe8ec3a5b8ab21bc281a74742724bb287fc8ffc31277e38b0f4c778812b800eb814f399b480ba72deb957249c
+DIST naev-0.10.2-source.tar.xz 444824076 BLAKE2B 8f45c279c1077a50a2951d4a1a5ebd035e3980b05097c0631b02560597ab94f7e8eca4a76a280c348df709c9a5e75c352ecfb02550de9ec53bf987c6e1257cc8 SHA512 8e9eff735f12bf308d52ae3bae10a83cfbd7e80d614b366d53c7f2d37826f5b9158f430324d7106f8c2c750888c09fe09f0a97d1f6af31e50b4f77bdf456025a
 EBUILD naev-0.10.1.ebuild 2212 BLAKE2B 95efe45179fefbf33a550e6ce1a6229900c88a8910d414b75e4c246502a796e985701c11693f5a6dc9fea6b5819fe25802e834bb130b261a9331478569bf0aef SHA512 9c692ab03639a524ce17bde63cfb5634823b6f5630f60d069418851a47a84a11439e84d01edad0bc533fc2f3060cac10fd59f4650fe34fee88e2d9eff07b8874
+EBUILD naev-0.10.2.ebuild 2287 BLAKE2B 5c0c61dcdb428f08b1e15fc6664ba42b09e2144d2ae55a45bb33a789dfe957afedf2c7495afb7476176f9ae799425f4bd9933b94d4cb722a98e84e1a4609aa4a SHA512 33f4b8113af1657cffa3b5073a8295239ce92c0fba6fa6718759d232af72ada0f09ac9eac5758cb91c4de31c765d1c0f2409e2e0532a32f60a88f62cb68ce2ed
 MISC metadata.xml 328 BLAKE2B 2c831943c7eee723e5c707906bcec96e97abd71e5d6fc3256010cca9626aebe95ecd7dca316a9567fe41186f0a656a434d774f83f088f414a95b3aba425c23b9 SHA512 426ac4b34b6cb45db05f5a7768a15947f67f5e90cda1bafa817320988aeb96ade18d774b2aa5e92d12c1fd1fd7a4964ac1bbdacbca6655325ccccc6a9405dfa4
diff --git a/games-strategy/naev/naev-0.10.2.ebuild b/games-strategy/naev/naev-0.10.2.ebuild
new file mode 100644
index 000000000000..f66552cc380e
--- /dev/null
+++ b/games-strategy/naev/naev-0.10.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+inherit lua-single meson python-any-r1 virtualx xdg
+
+DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="
+	GPL-3+
+	Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0
+	CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# dlopen: libglvnd
+RDEPEND="
+	${LUA_DEPS}
+	dev-games/physfs
+	dev-libs/libpcre2:=
+	dev-libs/libunibreak:=
+	dev-libs/libxml2
+	media-libs/freetype:2
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png,webp]
+	net-libs/enet:1.3=
+	sci-libs/cholmod
+	sci-libs/cxsparse
+	sci-libs/openblas
+	sci-libs/suitesparse
+	sci-mathematics/glpk:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-games/physfs[zip]
+		media-libs/libsdl2[X]
+		media-libs/mesa[llvm]
+	)"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/gettext
+	doc? (
+		app-doc/doxygen
+		dev-lua/ldoc
+		media-gfx/graphviz
+	)"
+
+python_check_deps() {
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# use eclass' generated lua.pc first rather than as fallback
+	sed -i "s/'lua51'/'lua'/" meson.build || die
+
+	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369),
+	# mesa[llvm] should ensure software rendering will work
+	sed -i "/subdir('glcheck')/d" test/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc docs_c)
+		$(meson_feature doc docs_lua)
+		$(meson_feature lua_single_target_luajit luajit)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	local DOCS=( CHANGELOG Readme.md )
+	meson_src_install
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}/html
+		mv "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
+		rm -r "${ED}"/usr/doc || die
+	fi
+
+	rm -r "${ED}"/usr/share/doc/naev || die
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index a0f8d1629afc..faa4959e00a9 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 3a888156954e..a8474aaed04b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -6,7 +6,9 @@ AUX 43.1-maximized-signal.patch 1160 BLAKE2B 139b9d96bfb0052f81e0cdda2612482d646
 AUX 43.1-treeview-shortcuts.patch 1562 BLAKE2B d2128d9b4abdf9618062fbecc14601f62a66e0029b7f1c0f73a46e34885b2a7d51071d44d84ed1a1730311262afd5eac3d84d308ab4765c6cae4702dad702514 SHA512 be6e52b6deeb92c2e4451eb61c579a004a4c4702db0816078c47687e216c9797d6b271300a044ff206ab9f8142911aefdb969bc495f48233edccdae772debf8a
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
 DIST nautilus-43.1.tar.xz 3162772 BLAKE2B 5150f1453328d3861b343bdd7070ee5eaea95a96b5b52db928eeb16e0aefad05cc0281295cb26c28cf3808e6ea3d76a2efff0fd9fc670b173ef3d3ad8c9ed9f3 SHA512 f09362584f2d4a04870c7e6b64ec3d23c90f20c8d37aa7103277985f182db49f3306f6e130966c6cfc97463fd5322f454564f713e70b839fea177545214dced2
+DIST nautilus-43.2.tar.xz 3166792 BLAKE2B 354cbdef7ec272a4966229d3c7da192c4613ef7c19187503253b0936dec6efb236e45793089709ab639dab94e372173d8c37c90e0beb9b0d258e384c2370bc8a SHA512 e4a12984b74614185cd7fbb9bf8c49a2572d673ae59d0f481dac92459d965ccc0eae6d9a5f545afb52ce1f24438a7feb02c0a35b8175187b5d74a9044488c13b
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
 EBUILD nautilus-43.1-r1.ebuild 3535 BLAKE2B 4f386ff1ef3bb76dfa39c5b406c3742653b99162bbf2ebbaa9ae815046cac559b22b31ee59cbb6d7323b7c995bd1e9da46d76fea52dc73c21fc68f64e5800b4d SHA512 0226b63a9cf0cf207c4abe57d8cb8ef51abf578d3d07b4350852c54d434da1e0cdf3c8697cac95bc97a0fdb94dab831e5c3153e2510e90099798c3661f3cd8c8
 EBUILD nautilus-43.1.ebuild 3305 BLAKE2B 42a1391510632fc8b74c442ec633727e1af9dd6212786d1e757c8bca97919ebcf992315a7281ad01842dfe1f5666d93f8d06e04450781a789747900572aad14b SHA512 81565901b4ea66597eb7559a1b08f2a8dd7d93d23734309400d02fb9fd57c625d72f17ccff8e03d596ce052a2e58baafad3ecd9b62557bc63b57a8c958c6c6fa
+EBUILD nautilus-43.2.ebuild 3308 BLAKE2B ddf0d2b8ef59ef0feed393d91e2b8e4b2ca6b16603a30663cbb14d9d0d5f90e735d23e5928055ab559c87aba93d005913a70c89fd86d0c448835f784b341041d SHA512 5bde65e205064ae85ce1e34de3ec42899c869cb80f674337640854acb110f498d6f2948fe5fe5e696e3b38c564cc0164ed21121dbce8b8ab2550b77fdc7ef4ba
 MISC metadata.xml 662 BLAKE2B 0d7e1a575749fe5e00899852e51bc0eb184f7b2a55f2fe0eaade6ca087961ceb673d7523b9c6b71d4ac266b8488ad599de1651fb7e6fb0b2c7c160384dc059f5 SHA512 696cc099a35c07475920b8ee5785820ab6f0505bf3a14fc67f6372d8762012f5d21e3c4fa573fee1d7e6cff4e7233dacfb9c78c5f7f025a03f50e6374f3ebb67
diff --git a/gnome-base/nautilus/nautilus-43.2.ebuild b/gnome-base/nautilus/nautilus-43.2.ebuild
new file mode 100644
index 000000000000..9397251db6a9
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-43.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.72.0:2
+	>=media-libs/gexiv2-0.14.0
+	>=x11-libs/gdk-pixbuf-2.30.0:2
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.4.0
+	>=gnome-base/gnome-desktop-43:4=
+	>=gnome-base/gsettings-desktop-schemas-42
+	>=gui-libs/gtk-4.7.2:4[introspection?]
+	>=gui-libs/libadwaita-1.2:1
+	>=dev-libs/libportal-0.5:=[gtk]
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-libs/libcloudproviders-0.3.1
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	dev-util/glib-utils
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-util/gi-docgen
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Disable test-nautilus-search-engine-tracker; bug #831170
+	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6fd52fffe786..c9af825a3769 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index f03648715e62..f2a6796da2e4 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -8,7 +8,7 @@ DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c9603
 DIST libplacebo-v5.229.1.tar.gz 673121 BLAKE2B 0a59e16b4565b10b222c5a5a8e607670bd4010a2be9b99ebdc15638827fcaf21bbf3c16a3cd2b902bcef43041dec56441494a0f618094e14db8f99a9d314c621 SHA512 45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334
 DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165
 EBUILD libplacebo-4.192.1-r2.ebuild 2333 BLAKE2B e3c2735e64a54f34c83b14d425e8c99170e9d8048bd02ae1b4fc44e676b8fe1e03d92bcfbc7d353186a98387c0609d767bfe118d2e64e54baba577fe58b7071f SHA512 49008898a94dd60fd96a9489dca9421c2d3d6a34bcc3a9b8dd953707a4f7a6a7534112a4cd4bc339b637317590c8329b210eb8310924f3bb945a806f884536b7
-EBUILD libplacebo-5.229.1.ebuild 3074 BLAKE2B 55a9c4109bf201ac64ae46fa50e8a9e61d482769ee53ae332e3e27de1bba9228a9a6bd38c93890410b9a5d918d04f72570fba51f90dcce2766c1af3a94a02565 SHA512 ca846167b0d355c5d8bcf4b1fe11b3e72868a5e9aa53d65700041b938a586aed92bd6321a6a7ce2f135053038a03f184324530cc05c078c0cacc6f405e9335e8
+EBUILD libplacebo-5.229.1.ebuild 3073 BLAKE2B 6d6aa844a1d7e9104cd88709055b1b82901ca8ff89c2ee5c395ed1d097973a893e751941c27b90030d10284dd612fc10353f4d7af11c5c72f3bda369e0d32bc6 SHA512 80c9b7fce7ce70ee18db44a16c1a12cc076fb49ba856b7855192c866b52a34161687b12af6e512a4ef06e19aac0f134548ada3bd524bcffb5be1f1bd9eab121d
 EBUILD libplacebo-5.229.2.ebuild 3074 BLAKE2B 55a9c4109bf201ac64ae46fa50e8a9e61d482769ee53ae332e3e27de1bba9228a9a6bd38c93890410b9a5d918d04f72570fba51f90dcce2766c1af3a94a02565 SHA512 ca846167b0d355c5d8bcf4b1fe11b3e72868a5e9aa53d65700041b938a586aed92bd6321a6a7ce2f135053038a03f184324530cc05c078c0cacc6f405e9335e8
 EBUILD libplacebo-9999.ebuild 3076 BLAKE2B 81c80fe48d52835d60315a19a364a700d10f5d2217aa1a89ae2e6cca9e22c5cfd761bf9db1a7bd02da61f74fe0a0e83d9f29e932548f480cef237f140812ab6c SHA512 83fc05ee35a6b4fc8e5085c8b1bc6792ce3d63ddfede2dbeafac753c88afe2ae8c50ccafd51343ecfe3a8cde0bffcad020ca99972344c74a9eed59912ee6996d
 MISC metadata.xml 678 BLAKE2B 7b4c70ba3d89a81182905365354eaac312888c492a33e2d7b410c79139af9680aeac65c2dc6b692410e601c9bba13c4ff16f80c48c2d9accc3d5d1f82be5395f SHA512 64cd5d5d2231ed1bf6298f074d56471bf158ea29fdac3c4d7f1e54b7259e4ce294b6c1ed31b1397fad952224e9211778bdb59dd33c429870fd58ab9931ab0677
diff --git a/media-libs/libplacebo/libplacebo-5.229.1.ebuild b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
index 95d5231d0b11..06ebf3b6e6a7 100644
--- a/media-libs/libplacebo/libplacebo-5.229.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
@@ -15,7 +15,7 @@ else
 		https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
 		opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ppc64 x86"
 fi
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 04e0017d5996..49e393da2278 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -2,5 +2,5 @@ AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4f
 AUX libsixel-musl.patch 1304 BLAKE2B 09e7a75a94edd944cca9997c74b235f9f27aeff550b2a9a02225c93d60f1faf598b9c5c304c9e8f1f207da37d7712d40115410f65cae17995c3bdaed6cfc99d7 SHA512 39b7227040e523881a9405e7f6b98362a0c4fb7f717bf50a724eabfd5cfe9779f820243f7ae0a83b61b4dd124ec4ff0070d391ea43476388095e1d4160f13cbd
 AUX libsixel-static-libs.patch 240 BLAKE2B ba9091c4991c6e69f83ca7eaa35aa7ceaf81e8542b1edffd1ce64ba1bedf518ad82603cdc610f256b1a0dc4954151b7407202a27c101ef6de59ff0724021faa3 SHA512 d3c6c060e8eba47c98180e5e4e127dfcb6f77f89b11dbaa8595cfd9786eee94a884476d210deb9ca6eaa2f548c6407a9bff714cfc3f18d4fa36b60d2c1fc165e
 DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
-EBUILD libsixel-1.10.3.ebuild 1972 BLAKE2B 1d8283914cc5cc1efb807f195740928dc834f738a762bdee743142f60a91e068b86dbf17e38bbab413322999776e5da3d8f00e458ae65a953995df176f8006e2 SHA512 976382f80591eeb59754c0d0805ab8b319ff08ac16c6410d0e6c2ff349631e926c4983fcab5ab7df293a820f65b3d0e96b989629758b0eb10d1edae57d37f95e
+EBUILD libsixel-1.10.3.ebuild 1970 BLAKE2B e219bccdd274418a8623ac2957429a7b74faf42236b08ef6e3c1c22555452e87c8c2445089c6ca60bb40d4813663991969846df67eefc5085c845fa06545d83a SHA512 f2f6c51aba5eec0c4f85a8c5cee03623707f2509d2f7b20e4f4a5e2369f0a377be55cf975cb0f5e43a3ef6a5b7efec9a43434818df3f5528f4d709c270729536
 MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index 49ec04c37761..ee70ffa4e73f 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="curl gd gtk jpeg png python test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 4e638f87f576..31e7b9a59462 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -7,6 +7,5 @@ AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a
 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 2099 BLAKE2B d32706cce58c6d09a6e73e139a60276e58db914c426f7a30dfad5370cacc6a0907dcae594fd47a8b0ac761b4b6af88abf7afd31782ad7e306aa644395d104cf7 SHA512 f4f8513ae022c1a7478c3b759823c82d0500e42dab40c43cefd614b357ef36c7affa57befcaf3923857747b0afdefe0b8554d509e51afb1229b926cdfce59488
-EBUILD openexr-3.1.5.ebuild 2097 BLAKE2B fbf6c8253b2e0a2a57ce576b8810bf0b3aebe592af78f914eae3419c611e3df2d15989bff213f6c77d2a7161c6ecd0277b0d72d755f7d6f044dae4f0f10db899 SHA512 bd88bf3a5564f65e89319952c4e8838c4158689e55d044b66e7e4b503c75e5fd532a2c4d1896818c197ab1f4c7cf79b551629d0dab067f5baaebba9b6c673a26
+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/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild
index 80f5ea2cb0f2..545e236dc104 100644
--- a/media-libs/openexr/openexr-3.1.5-r1.ebuild
+++ b/media-libs/openexr/openexr-3.1.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="0/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-3.1.5.ebuild b/media-libs/openexr/openexr-3.1.5.ebuild
deleted file mode 100644
index ffa3ffbf3b37..000000000000
--- a/media-libs/openexr/openexr-3.1.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-libs/imath-${PV}:=
-	sys-libs/zlib
-	!media-libs/openexr:3
-	!media-libs/ilmbase
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/breathe )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
-	"${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
-	"${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -e "s:/var/tmp/:${T}:" \
-		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
-	if use x86; then
-		eapply "${FILESDIR}"/${P}-drop-failing-testDwaLookups.patch
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	if use x86; then
-		replace-cpu-flags native i686
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DDOCS=$(usex doc)
-		-DOPENEXR_BUILD_TOOLS=$(usex utils)
-		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DOPENEXR_ENABLE_THREADING=$(usex threads)
-		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
-		-DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
-	)
-
-	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
-	cmake_src_configure
-}
-
-src_install() {
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-
-	cmake_src_install
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4d63015ca91e..610b2ea74f20 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 4bc424354290..3f5875e93516 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,7 +2,7 @@ DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa19
 DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f SHA512 d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 7c2c0935efc35f23a5389f4f9e367e3e0e0dc862b27b27c816edcaf0623c5dc9879ccef5e3519fc35b9be1ae87b3ba80f5e60dd430bbb43df581245e92b3be80 SHA512 64f06b5d6e16d943d4bf614117304839c09cb34cba4ce561b5e68c826e83672a0e9218a486de68fd506ce9c7b2a50e92b0627c66c3ebe048175c214dabd09aba
-EBUILD mpv-0.35.0-r1.ebuild 7587 BLAKE2B 839cc31d866f1bf092c5198cc20d5ac79d0576b032bd31591128ba6370bcd0274c98f7ad308af9c3364936101f39a9c8489509970f271ba9531c63591a602823 SHA512 c91749f856503fb603643a72eb09b260f40798cc9e0077c9b508ee7db92b911b69c4f65e6f1344aaaaf4c938b1d59ffe00c60bfc42ee7f0637792b43e6e94064
+EBUILD mpv-0.35.0-r1.ebuild 7585 BLAKE2B f597ad5f2537b981ef08c9b3046bb082e55fa23425557ef187c8aaf40cd581d2dc12cc280eb8c8bfd353f652dcab03dce5ce96db2bdfa5bdcba37947cf42aa44 SHA512 d44c011c8638093fb20f75ff7b780972da1a8444943a7c5783b01c8fe6eefd57cab0c0845f61bd18106ffe316a7d3d1d9104d950e940bae803b99372928b44a7
 EBUILD mpv-0.35.0.ebuild 7226 BLAKE2B 41fc509f955dc0695a951518389cffad2fec804d46a8c5a7a2eee52557ea200ee24e4153ecffa51449ba919aa33567f95aee1109340b5647e87417441cd980b0 SHA512 f056b477c65ebe1da92cd2da255885d5b5b42ea63887af595eb500e8077ba004fcddcfcd9d8918158103df5a7f2c2766e53de3c082af1fcd308f8bcda069ae00
 EBUILD mpv-9999.ebuild 7608 BLAKE2B 22d6b79ca805f3307bc605ca0396b3ec562f2f1da062ae55de498f9550cd930269c2b760737e822c3d9efc0671c7d09195cabd4fc1078742c4802aee92961e11 SHA512 c677106a71d552f3c9e98f86568ca8ea96cd831e758546552266710b6c9c01c1a98857c2fa1b68613483b22448c31c42f7a48e8d06b033980515f8f04465a9ac
 MISC metadata.xml 2645 BLAKE2B 3b20ff6e14ca27d98aca25e3fe6589705d6830fe56097e5d5f842e7b498133e6311c44cb5bf52476aea5a7223e6dac5bf0d3c51226db7d1efd2fa2b8e6190b98 SHA512 f72d25cc03d476da861b8209d13093f5351e7598dc482f517d5cb89fbf3987be4280bfe25902b172f4da74c36528c2581c8f848d746e64183a29a5bbf1baff5f
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 7882a7e133ca..c83c4bf9a053 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="Media player for the command line"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index cdc851c07ff8..cc0a29b8bbac 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -11,8 +11,10 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354 SHA512 f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
 DIST pipewire-0.3.61.tar.bz2 1480364 BLAKE2B df940896189b986e1d63ce6d5ec6cb554ae030ef2ed217a5310f06d959b8c28bff12bc48d847ce5bc6ff007b3652f9ae6e35fd15ef39283348c010cd341bcea6 SHA512 8fe5b6ce0fd1ef2a20b1253436fb97aab9da168ce243400b0291051e97809d75793d9446fd4aafc835f82fd257009ec6df9e181d375b492ee72d7f90275ab917
 DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa SHA512 0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805
+DIST pipewire-0.3.64.tar.bz2 1490475 BLAKE2B 9a4d9e23a5d60da7c5788ce5145ce083f13fe771f3f5bcb3dfd1e9560d982f20415f32f756b875081464e1b175ef80af56d7babb3bbbd7a5eaf034c9c43b810a SHA512 4dff77cf1ab9fefffad1b6f7182115dbb5e4f0339f052dcfcc34b62687b461d25a6f891d1ad0246dab5a8cb80ca190d97d358a6494da8c6a8cc64e0b38452093
 EBUILD pipewire-0.3.59-r2.ebuild 15852 BLAKE2B 21cf0a628f02e323ee25220ac73659813009ec786962a579ed882297315415096ebcbd2db9a0463d892a592d22142cd2eaf39c8abd767a18124bbaf523b057ed SHA512 3294fc701cd4953e40920e9679b57531e29512cdb65f82a9b2f611212497572e388b3a3ced87898a0f262279588ac82d861d7de46f4048976f1508c16663f364
 EBUILD pipewire-0.3.61.ebuild 16087 BLAKE2B b0691d341f9bbf4ed48dadc6bdb4ccfcb861792f04b3fac7b514d2a5fb134609f813a74ac8618b3ace6a80c69e01c69eec9b2b1a8bdcd2e14bad91cdccaff911 SHA512 9e15b42b38d2fd3bc2fe27aef0e0c3abfaacd2e32b4d648984a1cb1d90c51e2e08857e37f01dd681d3042eb5c5e7e1daf9f284a0a8e095f1e5d5f7be2d5ea1d2
 EBUILD pipewire-0.3.63-r2.ebuild 16345 BLAKE2B 928930ef99813ff8522aae1238e893d56c1c4044d3246a2e492bc8fa6d089b12ef768a2d762ec2d78aa6a4221a6f168e717465d6b641ada3e8f0b0fb057d011e SHA512 af8684afa9ebd91084816624b04ec48683dfd0fb0e93c89f18dd11fe9882f5ce4c0c432930f22984a7cff3ed417eaf35ae25dec27b1767edec7e07b5c5b4ed10
+EBUILD pipewire-0.3.64.ebuild 16187 BLAKE2B f4937275d2f170b559f848221a95666a7499af72e258000b9b840ea239d4944d9917c35fbe9867c5c9aba871b398ef204027195cf2bfa20dc6bb3eb5a16982fe SHA512 8228bf949565d73106f22c5d5054b1171b58bd23bb2f1c37559150695dd7cdf12ec1c2dbecfe04cf1a283fd43bc82c3f21d1abfa9e76d11d786b2b7b24cc989a
 EBUILD pipewire-9999.ebuild 16187 BLAKE2B 2a8a2dd8f18b777ce2d9428aecb74495cdca09e68002ef60fe30595b19fdabf410d6adc1ccf339ceeb0f37347607d546f4091241d20bd410f29c7daac5f66cad SHA512 3b9ef7155317e966dc2c4f7b77b6a7d483d4661c9c4c81e92f87328a814be80d0d05f540b9c7d936628f329284b979d02fe79c9d65a69ee3897e71e699771792
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/pipewire-0.3.64.ebuild b/media-video/pipewire/pipewire-0.3.64.ebuild
new file mode 100644
index 000000000000..2bb3dd69eed1
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.64.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	flatpak? (
+		dev-libs/glib
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? (
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8d2c60f13a1e..d96bf55ab413 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c3eb195c386f..5345d13e7329 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2023 23:09:45 +0000
+Fri, 13 Jan 2023 05:09:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8e836df15ac0..31da33075328 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-12T23:09:49Z
+TIMESTAMP 2023-01-13T05:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPAkz1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPA55pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDEghAAgbmjI3748enO+vyb/GGQB0EqHxmI9WccIBLsE8FGmHRUImdQ0pahkbin
-6GgOUT7qWWfEwxHwiQnJEkRnkBEpZ3dK0Gt+MdEerk/bruxNh7pFxvfLA4EMai/h
-SFtWWbOHIIHwvL59abuELb5lic78PTiSn1hH1YWJQSCi8eh3IICu0Q/LvjTfrxVI
-zHYEFrNxLcXYOoB42a7NmOtPm+Sht130SkLdrdTnNR+DMpagLQP+cEBxLUAFhA7W
-Q9ltaAZc6sGvlHlbXvuibNviFEl/SBvJHGjVEdqRlVrWNeyeix8w9r7vYRUqSWoZ
-HndLQHU0C4oQgr5AeersIHCk3j3bx9oZ7/ePU4lUsemTBwWDMQEcYcwzX1hGjUS9
-4JC3SH1udpn7z4tA4VFkYvdrv6R3YA/AFUdugDiOKU/K/ay2KZ3HR7sij2gKimLO
-l/NGq0p0z2yEhciUl05uh0XZmLoQDC06549IFN4b8c6Z3Hux9WKGT6/94TcSPu3+
-2auvraYToKwCbWD31kTUaz51AUnMDGAlb3p6cGYcX27W4Jye3KH4b1O3BhYeDgUa
-94iVbNyg2YstspR9iyy9+O4n23XwoqwU6votKqrPNOUrt2QREIO6xq3TsVQo2qtx
-V1SbfkldcgDRi9qVHPBUSdCLK41l6s15Gvid/I3S7vqbD0fEE6Y=
-=sliQ
+klCidRAAiojjkOjm7iWZl1dRTREFFGfURbB+gARQPPp7PvbHh9H+rxaWgviOfXYV
+BeUcpkbyGaU7QNamojmXMYGONBNCZnK7f3H/ZMSSRuMjzZLc4YOOCDgBfmsO3Jwx
+Rc6ecx+6aFEQT8/n+IOQsBzbUl7w+hxvmJzlknPOjTz2PKiQx5IrHBPmq6IcAafm
+8Lm+16a2+E9+aJem3T2UI0gTbRMqC6qO9DzxQAxwOfUQlw9QMWxvGsSZH/a6076M
+qKwNQ4XS94lEpNJcZfqsj7lOc4418Ht/i2zlF5nIqStjAHjEQ4lEixC3BsD4JK16
+AsyfYodV/+G++TLLDpnoutRfkAcGAExhiqjZoJxDvDmi5YQE/wt4oP0dN0kOgKKX
+9SjY4Qyuu2PGBDZLhzrieN9qVhnfHjfkFeTTa2KDJkq6HVNKjer0VcR+3u3qq7S0
+pZUEwpVWulBkz8OiGzIIUDuqmE/j4PI4mzLeasOW0CuKpENTlvmUVRikfv1ZSgvH
+VGNTU8Y+KxCMb4JPFLKxh5xMaTyqHvJtzQb/P4/Svd6LBh2lvlqlLieN8v60gCYA
+QDYe8OW8QIb722XaAlyWH6z3P6HUXl1yKTcgSCprI50+whmzaFUCpM28I3dm8PW2
+i4m3jJk82MRR3l71DDfrDAjLgxc2TgAv53URoSBhpBNlHutuK/Y=
+=tFN/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b2c6bbd97877..5345d13e7329 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2023 23:09:46 +0000
+Fri, 13 Jan 2023 05:09:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8ecdf4f79cf7..605019aab3d2 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index dcfab63fe7f5..45b2bb9ce373 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/graphql-0.1.2 b/metadata/md5-cache/app-emacs/graphql-0.1.2
new file mode 100644
index 000000000000..db93b4bf52c9
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/graphql-0.1.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-25:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=GraphQL utilities
+EAPI=8
+HOMEPAGE=https://github.com/vermiculus/graphql.el/
+INHERIT=elisp
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vermiculus/graphql.el/archive/67237f284f2dfb94f3cfba672ff64a37e1cb860f.tar.gz -> graphql-0.1.2.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=f1b5c6f27a84656177f6945603527ce0
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.6.1 b/metadata/md5-cache/app-emacs/org-mode-9.6.1
new file mode 100644
index 000000000000..a8a5c31cc464
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/org-mode-9.6.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Emacs mode for notes and project planning
+EAPI=8
+HOMEPAGE=https://www.orgmode.org/
+INHERIT=elisp readme.gentoo-r1
+IUSE=doc odt-schema
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )
+RDEPEND=>=app-editors/emacs-25.1:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.6.1.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=f240fda5348f0f7e2fcbf677f27b4838
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 387eaad393d1..5c97dc4b0795 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/ackvim-1.0.9-r2 b/metadata/md5-cache/app-vim/ackvim-1.0.9-r2
new file mode 100644
index 000000000000..938e338548b2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/ackvim-1.0.9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: run ack from vim
+EAPI=8
+HOMEPAGE=https://github.com/mileszs/ack.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( sys-apps/ack sys-apps/the_silver_searcher ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/mileszs/ack.vim/archive/1.0.9.tar.gz -> ack.vim-1.0.9.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
+_md5_=a6afaba61a87ededeeaade3a6b0d0dd8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 864876d53c79..ec12b3072ca7 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/imath-3.1.5 b/metadata/md5-cache/dev-libs/imath-3.1.5
deleted file mode 100644
index a0398f64c134..000000000000
--- a/metadata/md5-cache/dev-libs/imath-3.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/breathe[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!dev-libs/imath:0 !media-libs/ilmbase sys-libs/zlib python? ( !dev-python/pyilmbase python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
-DESCRIPTION=Imath basic math package
-EAPI=8
-HOMEPAGE=https://imath.readthedocs.io
-INHERIT=cmake python-single-r1
-IUSE=doc large-stack python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!dev-libs/imath:0 !media-libs/ilmbase sys-libs/zlib python? ( !dev-python/pyilmbase python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=3/29
-SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.5.tar.gz -> imath-3.1.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b0599da64b304ef0bde0cc424e07202e
diff --git a/metadata/md5-cache/dev-libs/libtraceevent-1.5.2-r1 b/metadata/md5-cache/dev-libs/libtraceevent-1.5.2-r1
deleted file mode 100644
index 6be0fa0f6767..000000000000
--- a/metadata/md5-cache/dev-libs/libtraceevent-1.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-text/xmlto app-text/asciidoc )
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Linux kernel trace event library
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!<dev-util/trace-cmd-3.0
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.5.2.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b5e14a4f12e2059f573a70a4ea5f125c
diff --git a/metadata/md5-cache/dev-libs/libtraceevent-1.6.2 b/metadata/md5-cache/dev-libs/libtraceevent-1.6.2
deleted file mode 100644
index dd607a7cb62f..000000000000
--- a/metadata/md5-cache/dev-libs/libtraceevent-1.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-text/xmlto app-text/asciidoc )
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Linux kernel trace event library
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!<dev-util/trace-cmd-3.0
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.6.2.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b5e14a4f12e2059f573a70a4ea5f125c
diff --git a/metadata/md5-cache/dev-libs/libtracefs-1.3.1 b/metadata/md5-cache/dev-libs/libtracefs-1.3.1
deleted file mode 100644
index 3e1b2b9df1cd..000000000000
--- a/metadata/md5-cache/dev-libs/libtracefs-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/libtraceevent-1.3.0
-DESCRIPTION=Linux kernel trace file system library
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libtraceevent-1.3.0
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-1.3.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=cc8879467dbb321f80b0312c9c671dfe
diff --git a/metadata/md5-cache/dev-libs/libtracefs-1.4.2 b/metadata/md5-cache/dev-libs/libtracefs-1.4.2
deleted file mode 100644
index 6bf707449d8a..000000000000
--- a/metadata/md5-cache/dev-libs/libtracefs-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/libtraceevent-1.3.0
-DESCRIPTION=Linux kernel trace file system library
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libtraceevent-1.3.0
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-1.4.2.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ee32fc559ea5abc27c7567b2b94132b1
diff --git a/metadata/md5-cache/dev-libs/libtracefs-1.5.0 b/metadata/md5-cache/dev-libs/libtracefs-1.5.0
deleted file mode 100644
index 5febe3867794..000000000000
--- a/metadata/md5-cache/dev-libs/libtracefs-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/libtraceevent-1.3.0
-DESCRIPTION=Linux kernel trace file system library
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libtraceevent-1.3.0
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-1.5.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d7b0e8dc9fabf43f3e23e7f9fcf563f5
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 81345f2393c3..b2f3af46b8a4 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/lambda-term-3.3.1 b/metadata/md5-cache/dev-ml/lambda-term-3.3.1
new file mode 100644
index 000000000000..6a41c2b48e08
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lambda-term-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/camomile:= >=dev-ml/lwt-5.4:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Terminal manipulation library for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/lambda-term
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/camomile:= >=dev-ml/lwt-5.4:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/3.3.1
+SRC_URI=https://github.com/ocaml-community/lambda-term/archive/3.3.1.tar.gz -> lambda-term-3.3.1.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=2416fd26448301dade40e6e1de3c564d
diff --git a/metadata/md5-cache/dev-ml/utop-2.11.0 b/metadata/md5-cache/dev-ml/utop-2.11.0
new file mode 100644
index 000000000000..a66b9a909462
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/utop-2.11.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/cppo dev-ml/findlib emacs? ( >=app-editors/emacs-24:* >=app-emacs/tuareg-mode-2.2.0 ) dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install postinst postrm test
+DEPEND=dev-ml/camomile:= dev-ml/lambda-term:= dev-ml/lwt:= dev-ml/react:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Universal toplevel for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-community/utop
+INHERIT=dune elisp-common
+IUSE=emacs +ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/camomile:= dev-ml/lambda-term:= dev-ml/lwt:= dev-ml/react:= emacs? ( >=app-editors/emacs-24:* >=app-emacs/tuareg-mode-2.2.0 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2.11.0
+SRC_URI=https://github.com/ocaml-community/utop/archive/2.11.0.tar.gz -> utop-2.11.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=a086e0da4b2a41aa6ddbb5d23a91d395
diff --git a/metadata/md5-cache/dev-ml/uuseg-15.0.0 b/metadata/md5-cache/dev-ml/uuseg-15.0.0
new file mode 100644
index 000000000000..ccf74df98c99
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/uuseg-15.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-ml/ocamlbuild dev-ml/findlib dev-ml/topkg dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/cmdliner:= dev-ml/uucp:= dev-ml/uutf:= >=dev-lang/ocaml-4:=
+DESCRIPTION=Unicode text segmentation for OCaml
+EAPI=8
+HOMEPAGE=https://erratique.ch/software/uuseg/ https://github.com/dbuenzli/uuseg/
+INHERIT=opam
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-ml/cmdliner:= dev-ml/uucp:= dev-ml/uutf:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
+SLOT=0/15.0.0
+SRC_URI=https://github.com/dbuenzli/uuseg/archive/v15.0.0.tar.gz -> uuseg-15.0.0.tar.gz
+_eclasses_=opam	42c5d48985d3f77484fe405cfc69356d
+_md5_=74feef1b8eea1a72089016f0c4afc8a7
diff --git a/metadata/md5-cache/dev-ml/zed-3.2.1 b/metadata/md5-cache/dev-ml/zed-3.2.1
new file mode 100644
index 000000000000..24330cf17389
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/zed-3.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/camomile:= dev-ml/charinfo_width:= dev-ml/react:= dev-ml/uuseg:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Abstract engine for text edition in OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-community/zed
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/camomile:= dev-ml/charinfo_width:= dev-ml/react:= dev-ml/uuseg:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/3.2.1
+SRC_URI=https://github.com/ocaml-community/zed/archive/3.2.1.tar.gz -> zed-3.2.1.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=5d1bcb35a19e1246c21efa6587130929
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b30edb566759..b430f94c3067 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/trace-cmd-2.9.1 b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
deleted file mode 100644
index 8d84a4df0aa5..000000000000
--- a/metadata/md5-cache/dev-util/trace-cmd-2.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( virtual/pkgconfig dev-lang/swig ) doc? ( app-text/asciidoc )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) ) udis86? ( dev-libs/udis86 ) sys-kernel/linux-headers test? ( dev-util/cunit )
-DESCRIPTION=User-space front-end for Ftrace
-EAPI=7
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
-INHERIT=linux-info bash-completion-r1 python-r1 toolchain-funcs
-IUSE=+audit doc python test udis86 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) ) udis86? ( dev-libs/udis86 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/2.9.1
-SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.9.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=21d62ebda4dae5fb77e22a3c46cc3e2d
diff --git a/metadata/md5-cache/dev-util/trace-cmd-3.0.2 b/metadata/md5-cache/dev-util/trace-cmd-3.0.2
deleted file mode 100644
index 1f4de26060be..000000000000
--- a/metadata/md5-cache/dev-util/trace-cmd-3.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( dev-lang/swig ) doc? ( app-text/asciidoc )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.3 >=dev-libs/libtraceevent-1.5 sys-kernel/linux-headers test? ( dev-util/cunit )
-DESCRIPTION=User-space front-end for Ftrace
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
-INHERIT=linux-info bash-completion-r1 python-r1 toolchain-funcs
-IUSE=+audit doc python test udis86 +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.3 >=dev-libs/libtraceevent-1.5
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/3.0.2
-SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v3.0.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=195d36500d385a46ece6c8d865d0f8ca
diff --git a/metadata/md5-cache/dev-util/trace-cmd-3.1.2 b/metadata/md5-cache/dev-util/trace-cmd-3.1.2
deleted file mode 100644
index 216f82131443..000000000000
--- a/metadata/md5-cache/dev-util/trace-cmd-3.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( dev-lang/swig ) doc? ( app-text/asciidoc )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.4 >=dev-libs/libtraceevent-1.5 sys-kernel/linux-headers test? ( dev-util/cunit )
-DESCRIPTION=User-space front-end for Ftrace
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
-INHERIT=linux-info bash-completion-r1 python-r1 toolchain-funcs
-IUSE=+audit doc python test udis86 +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.4 >=dev-libs/libtraceevent-1.5
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/3.1.2
-SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v3.1.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7e8c4194ff7ac9f79368d709de43c112
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 532d82d14d29..5549ec0d2c5d 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/naev-0.10.2 b/metadata/md5-cache/games-strategy/naev-0.10.2
new file mode 100644
index 000000000000..36a5c7786c2c
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/naev-0.10.2
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/gettext doc? ( app-doc/doxygen dev-lua/ldoc media-gfx/graphviz ) >=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 prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/physfs dev-libs/libpcre2:= dev-libs/libunibreak:= dev-libs/libxml2 media-libs/freetype:2 media-libs/libglvnd media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png,webp] net-libs/enet:1.3= sci-libs/cholmod sci-libs/cxsparse sci-libs/openblas sci-libs/suitesparse sci-mathematics/glpk:= virtual/libintl test? ( dev-games/physfs[zip] media-libs/libsdl2[X] media-libs/mesa[llvm] )
+DESCRIPTION=2D space trading and combat game, in a similar vein to Escape Velocity
+EAPI=8
+HOMEPAGE=https://naev.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=lua-single meson python-any-r1 virtualx xdg
+IUSE=doc lua_single_target_luajit lua_single_target_lua5-1 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/physfs dev-libs/libpcre2:= dev-libs/libunibreak:= dev-libs/libxml2 media-libs/freetype:2 media-libs/libglvnd media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png,webp] net-libs/enet:1.3= sci-libs/cholmod sci-libs/cxsparse sci-libs/openblas sci-libs/suitesparse sci-mathematics/glpk:= virtual/libintl
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/naev/naev/releases/download/v0.10.2/naev-0.10.2-source.tar.xz
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=10badfd1abcd1c87f27434de53b0583b
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index b415c391281b..7a09ba8705b6 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/nautilus-43.2 b/metadata/md5-cache/gnome-base/nautilus-43.2
new file mode 100644
index 000000000000..76e24542ba57
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/nautilus-43.2
@@ -0,0 +1,19 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-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 prepare test
+DEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.7.2:4[introspection?] >=gui-libs/libadwaita-1.2:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Default file manager for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+ LGPL-2.1+
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
+RDEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.7.2:4[introspection?] >=gui-libs/libadwaita-1.2:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
+REQUIRED_USE=gtk-doc? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/43/nautilus-43.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4aa2ebbff9f4db45964cf127730a20e7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index b4320d45ac4b..d860d1e95993 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/libplacebo-5.229.1 b/metadata/md5-cache/media-libs/libplacebo-5.229.1
index 98ec83638280..334f0cbb37ca 100644
--- a/metadata/md5-cache/media-libs/libplacebo-5.229.1
+++ b/metadata/md5-cache/media-libs/libplacebo-5.229.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://code.videolan.org/videolan/libplacebo/
 INHERIT=meson-multilib python-any-r1
 IUSE=glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan 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 ~ppc64 x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=LGPL-2.1+ opengl? ( MIT )
 RDEPEND=lcms? ( media-libs/lcms:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) shaderc? ( media-libs/shaderc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !shaderc? ( glslang? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=vulkan? ( || ( glslang shaderc ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/229
 SRC_URI=https://code.videolan.org/videolan/libplacebo/-/archive/v5.229.1/libplacebo-v5.229.1.tar.gz opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v2.0.1.tar.gz -> libplacebo-glad-2.0.1.tar.gz )
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c01d92244d7d0be4c7658ad375ca6ee4
+_md5_=7f14a4753318379cfc83f196eccbe272
diff --git a/metadata/md5-cache/media-libs/libsixel-1.10.3 b/metadata/md5-cache/media-libs/libsixel-1.10.3
index edc41a03387f..fc378adceebe 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.10.3
+++ b/metadata/md5-cache/media-libs/libsixel-1.10.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libsixel/libsixel
 INHERIT=bash-completion-r1 distutils-r1 meson
 IUSE=curl gd gtk jpeg png python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT public-domain
 RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsixel/libsixel/archive/v1.10.3.tar.gz -> libsixel-1.10.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=937856c37518da619915efc8343cc105
+_md5_=7e10956c6c2896639234db0b04bd6b48
diff --git a/metadata/md5-cache/media-libs/openexr-3.1.5 b/metadata/md5-cache/media-libs/openexr-3.1.5
deleted file mode 100644
index 8c85d26370ec..000000000000
--- a/metadata/md5-cache/media-libs/openexr-3.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/breathe ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/imath-3.1.5:= sys-libs/zlib !media-libs/openexr:3 !media-libs/ilmbase
-DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
-EAPI=8
-HOMEPAGE=https://www.openexr.com/
-INHERIT=cmake flag-o-matic
-IUSE=cpu_flags_x86_avx doc examples large-stack utils test threads
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=~dev-libs/imath-3.1.5:= sys-libs/zlib !media-libs/openexr:3 !media-libs/ilmbase
-RESTRICT=!test? ( test )
-SLOT=0/30
-SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.5.tar.gz -> openexr-3.1.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d20fc117f55ca7c1cfc1b692b922d50
diff --git a/metadata/md5-cache/media-libs/openexr-3.1.5-r1 b/metadata/md5-cache/media-libs/openexr-3.1.5-r1
index 7f9830661971..a51aa579e783 100644
--- a/metadata/md5-cache/media-libs/openexr-3.1.5-r1
+++ b/metadata/md5-cache/media-libs/openexr-3.1.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.openexr.com/
 INHERIT=cmake flag-o-matic
 IUSE=cpu_flags_x86_avx doc examples large-stack utils test threads
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-libs/imath-3.1.5:= sys-libs/zlib !media-libs/openexr:3 !media-libs/ilmbase
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.5.tar.gz -> openexr-3.1.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=83ff4b39af2a972ac821ff219dd63e27
+_md5_=a4592439e47446adf5d5727bcc598385
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 736adb34c488..301e2619b29c 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/mpv-0.35.0-r1 b/metadata/md5-cache/media-video/mpv-0.35.0-r1
index 0574bd442d84..65a0f57c7581 100644
--- a/metadata/md5-cache/media-video/mpv-0.35.0-r1
+++ b/metadata/md5-cache/media-video/mpv-0.35.0-r1
@@ -7,7 +7,7 @@ HOMEPAGE=https://mpv.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
 IUSE=+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet vaapi vdpau vulkan wayland +xv zimg zlib lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux
 LICENSE=LGPL-2.1+ GPL-2+ BSD ISC MIT
 RDEPEND=media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) libplacebo? ( >=media-libs/libplacebo-4.202:=[opengl?,vulkan?] egl? ( media-libs/libplacebo[opengl] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( media-libs/raspberrypi-userland ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( cli libmpv ) egl? ( || ( X drm wayland ) ) libplacebo? ( || ( egl opengl vulkan ) ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( || ( egl opengl vulkan ) ) opengl? ( || ( X aqua ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( X egl libplacebo wayland ) wayland? ( drm ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) xv? ( X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.35.0.tar.gz -> mpv-0.35.0.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7e012072c8b149aefa10d05562d24e3d
+_md5_=42fc9e78e12d7a87c19c080b4a530348
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.64 b/metadata/md5-cache/media-video/pipewire-0.3.64
new file mode 100644
index 000000000000..2c5e8106d7f4
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.64
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.64/pipewire-0.3.64.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=d2ce221f1bf3fcddfbe86e68fa633e7d
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 912580069264..f5665e691d6e 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.9 b/metadata/md5-cache/net-firewall/iptables-1.8.9
new file mode 100644
index 000000000000..7b6983faa29e
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.9
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nftables? ( sys-devel/flex app-alternatives/yacc ) 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 postinst prepare prerm
+DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:= >=net-libs/libnftnl-1.1.6:= ) pcap? ( net-libs/libpcap ) virtual/os-headers >=sys-kernel/linux-headers-4.4:0
+DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
+EAPI=8
+HOMEPAGE=https://www.netfilter.org/projects/iptables/
+IDEPEND=>=app-eselect/eselect-iptables-20220320
+INHERIT=systemd toolchain-funcs autotools flag-o-matic usr-ldscript
+IUSE=conntrack netlink nftables pcap static-libs split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:= >=net-libs/libnftnl-1.1.6:= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes ) !<net-firewall/ebtables-2.0.11-r1 !<net-firewall/arptables-0.0.5-r1
+SLOT=0/1.8.3
+SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.9.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a
+_md5_=7bfed1a2b6cf595029721fd79a974400
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 9113492cb907..04a1f4ccc3e0 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/discord-bin-0.0.22 b/metadata/md5-cache/net-im/discord-bin-0.0.23
index 2401aeca4119..e7a11c9de45e 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.22
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.23
@@ -7,9 +7,9 @@ INHERIT=chromium-2 desktop linux-info optfeature unpacker xdg
 IUSE=+seccomp system-ffmpeg +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=amd64
 LICENSE=all-rights-reserved
-RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango system-ffmpeg? ( media-video/ffmpeg[chromium] )
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango system-ffmpeg? ( media-video/ffmpeg-chromium:102 )
 RESTRICT=bindist mirror strip test
 SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.22/discord-0.0.22.tar.gz
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.23/discord-0.0.23.tar.gz
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a03755448a7f878d2bccb007491b53da
+_md5_=7c29af0ec12cb2edfd7d48ea7c311cea
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0acde7c2972f..af78f43bf6fe 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.13 b/metadata/md5-cache/net-vpn/tor-0.4.7.13
new file mode 100644
index 000000000000..d757f54368d1
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.13
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install setup unpack
+DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=8
+HOMEPAGE=https://www.torproject.org/
+INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
+IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.4.7.13.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.13.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum.asc )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=b6236b7b654545481b45e61ac92a8909
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a6255da9fa9f..9ea6d1b722cd 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/file-5.43-r2 b/metadata/md5-cache/sys-apps/file-5.43-r3
index aac6881ff85a..8253baacdd73 100644
--- a/metadata/md5-cache/sys-apps/file-5.43-r2
+++ b/metadata/md5-cache/sys-apps/file-5.43-r3
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Identify a file's format by scanning binary data for patterns
 EAPI=8
 HOMEPAGE=https://www.darwinsys.com/file/
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
 IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 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
 LICENSE=BSD-2
-RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.43.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.43.tar.gz.asc )
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3ea9991e5268a18a1f40df54549a1342
+_md5_=7d3788af756591b3090c14f8a6fee231
diff --git a/metadata/md5-cache/sys-apps/file-5.44-r2 b/metadata/md5-cache/sys-apps/file-5.44-r2
deleted file mode 100644
index e37f16def2ec..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.44-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[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=Identify a file's format by scanning binary data for patterns
-EAPI=8
-HOMEPAGE=https://www.darwinsys.com/file/
-INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
-IUSE=bzip2 lzip lzma python seccomp static-libs zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 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
-LICENSE=BSD-2
-RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.44.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.44.tar.gz.asc )
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=e885307cbbe33e80e5f8c1104376371e
diff --git a/metadata/md5-cache/sys-apps/file-5.44-r1 b/metadata/md5-cache/sys-apps/file-5.44-r3
index 6431ecce53dd..d1e0e32806df 100644
--- a/metadata/md5-cache/sys-apps/file-5.44-r1
+++ b/metadata/md5-cache/sys-apps/file-5.44-r3
@@ -1,16 +1,16 @@
 BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[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=Identify a file's format by scanning binary data for patterns
 EAPI=8
 HOMEPAGE=https://www.darwinsys.com/file/
 INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
 IUSE=bzip2 lzip lzma python seccomp static-libs zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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-2
-RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.44.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.44.tar.gz.asc )
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=261bd238f06b60e5b0d6e0de4c019b93
+_md5_=9b955d4a66e99cda0648aa709e2fa75f
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index a41c8c0f2401..bee32da6e0cf 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -1,6 +1,6 @@
 BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[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=Identify a file's format by scanning binary data for patterns
 EAPI=8
 HOMEPAGE=https://www.darwinsys.com/file/
@@ -8,8 +8,8 @@ INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal autotools git-r3
 IUSE=bzip2 lzip lzma python seccomp static-libs zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6895fca5e5a52ab78294dcad624354cd
+_md5_=2329c24fc1f7800de560628c652ec20e
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.38.1-r6 b/metadata/md5-cache/sys-apps/portage-3.0.38.1-r6
deleted file mode 100644
index f76fc6a7edbc..000000000000
--- a/metadata/md5-cache/sys-apps/portage-3.0.38.1-r6
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=The package management and distribution system for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 || ( >=sys-apps/file-5.44-r1 =sys-apps/file-5.43-r2 ) >=sys-apps/coreutils-6.4 )
-RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.38.1.tar.bz2
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=bed5edd245ed6583c309ea17debe302e
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.41-r2 b/metadata/md5-cache/sys-apps/portage-3.0.41-r3
index c7aef9e04c08..a7865ab95b35 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.41-r2
+++ b/metadata/md5-cache/sys-apps/portage-3.0.41-r3
@@ -8,11 +8,11 @@ INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 || ( >=sys-apps/file-5.44-r1 =sys-apps/file-5.43-r2 ) >=sys-apps/coreutils-6.4 )
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 || ( >=sys-apps/file-5.44-r3 =sys-apps/file-5.43-r3 ) >=sys-apps/coreutils-6.4 )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.41.tar.bz2
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4de9b79871d3b3f8fb40d5ab31c2b752
+_md5_=d3671fdb4e931a847e1476b44b8fef45
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.42-r1 b/metadata/md5-cache/sys-apps/portage-3.0.42-r1
deleted file mode 100644
index 465d573ee68d..000000000000
--- a/metadata/md5-cache/sys-apps/portage-3.0.42-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=The package management and distribution system for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 || ( >=sys-apps/file-5.44-r1 =sys-apps/file-5.43-r2 ) >=sys-apps/coreutils-6.4 )
-RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.42.tar.bz2
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=be09a1765673f98fa66cc1cd36be3cd5
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.43 b/metadata/md5-cache/sys-apps/portage-3.0.43-r1
index f8956be8f5bd..29269d71a543 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.43
+++ b/metadata/md5-cache/sys-apps/portage-3.0.43-r1
@@ -8,11 +8,11 @@ INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 || ( >=sys-apps/file-5.44-r1 =sys-apps/file-5.43-r2 ) >=sys-apps/coreutils-6.4 )
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/coreutils-6.4 >=sys-apps/file-5.44-r3 )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.43.tar.bz2
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ab5866751631d8a9afcb571e8017e605
+_md5_=e28a82356c7e41e1c9a72417df2bf510
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 1641bc9f2f22..9c2d4ee29835 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 INHERIT=distutils-r1 git-r3 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 || ( >=sys-apps/file-5.44-r1 =sys-apps/file-5.43-r2 ) >=sys-apps/coreutils-6.4 )
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/coreutils-6.4 >=sys-apps/file-5.44-r3 )
 PROPERTIES=live
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[bzip2(+),threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=889818ba2a8a196cde914e066cd13018
+_md5_=b5a5faa6df881830b9ab923177ab2ebb
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4bf1dd9143be..9b34a205bf14 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r2
new file mode 100644
index 000000000000..eafc97bf1af0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0e75789c1c6e3edcaba4042b1f5486b2
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r4 b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r4
new file mode 100644
index 000000000000..0d86f7083d8c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r4
@@ -0,0 +1,17 @@
+BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.10.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8a446b4e2c8b972c349375998b6e29eb
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.5-r3 b/metadata/md5-cache/sys-cluster/ceph-17.2.5-r3
new file mode 100644
index 000000000000..fbb1848e1622
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.5-r3
@@ -0,0 +1,17 @@
+BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( >=dev-libs/pmdk-1.10.0:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( >=dev-libs/pmdk-1.10.0:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.5.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.5.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1432fbdcb9ac96abf851e67d7806abb2
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 5bf9791d8907..a0a97c8fa1ee 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/zfs-2.1.7-r1 b/metadata/md5-cache/sys-fs/zfs-2.1.7-r1
index c8be52e6536d..89128ab74a6a 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.7-r1
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.7-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openzfs/zfs
 INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript verify-sig
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm64 ppc64 ~riscv ~sparc
 LICENSE=BSD-2 CDDL MIT
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-kmod-2.1.7[dist-kernel] )
 RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.7:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts app-alternatives/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) selinux? ( sec-policy/selinux-zfs ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=972ad680382035d69466ae7b529e6798
+_md5_=a11c06619a9571924d4500588064ed12
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7
index 2905edc3481e..202043492124 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openzfs/zfs
 INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs verify-sig
 IUSE=custom-cflags debug +rootfs dist-kernel verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm64 ppc64 ~riscv ~sparc
 LICENSE=CDDL MIT debug? ( GPL-2+ )
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.1.7[dist-kernel] )
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
@@ -14,4 +14,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.7
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	linux-mod	a138af023f7507b676b0aec9fe4b1e83	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=be67f69824060664e77a061d50365323
+_md5_=6d6ff3eca5efe69ad59e4ffdce1f6cd0
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0ccaf1e40c73..64ee190b5e33 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-12T23:09:49Z
+TIMESTAMP 2023-01-13T05:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPAkz1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPA55pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0lw//beFheNQSH37AUhCQR7kqqcZGDUkfGN0jui6eihdYwWAbD0PYVa56OOsT
-M+DugviDv1rk74v3WWUtiBysi0W+u/g0dfRN88XWYCWwgK3qYfbunYof65NglxrR
-WHx7lZ+x3/psZN8Ph1c9S9FPJ1hLKEc7+74YsrY2l+VbqNwSfuvCquzeQFEHtvQA
-QeZ1LG52Xq6L3s/oDIJ5Sclbqb55HdpCZ9WJJeH6iLB1ISAdkP7r6StYg3l3L13U
-HZl4TLpDdSLYawWRG8IuVxbeZfLh8VNQKa8IwEXckP4/s+EA7oG7HN4FKFLZOZAQ
-Bku0WXsFg8JTsQzShBq6zRbKgewD3jhl7nap1YSFq/yadsVFbq3d81iHVHsoqsMu
-vUUhrfrD5iNa3TLqNKudo6xScLsHqOMopNOSBLJ6PdHSZG28QgHvyK6/86D9/9zV
-1kKwQIj4yqbRrkppxGR+NRg2ZzO6kiTNyMk/MXfitZzSFKAsyGa2dca3/qu+kg/3
-RajjK1hsqzeMxwj3tC9+LCmuAO1YuSXl9ET39jTcf9xUP8ZzXA3wwI+Ko35tjWEj
-SmClDtP/06AHsMNFuty86XgbII9jO106KTdlExEhZ3KZZCRoewq1yrlBO8df/4fZ
-8ME1G+LlmlT9lyzTjqwfI7CKzkaDDv1mD14xzMTU0sGL2DtOTZk=
-=7Yjy
+klCS0Q//Snv22ld3FA6AGY8qtudsbITqWXFNnkNl6lLw3JCrTXAaEvhYMm+W+eDI
+a2L9ix9QffjcnpPaK3yQibr7QC9Zo55gq3qT0E8r+bvhA70vR868M1kDu/wX9ukK
+lApmS/PsOyGshyzvYfStYSv8tYGPLkA3RimrAucuwNJI/z/TG+YYVm/0Ez8oALbp
+dXUkdIuka6yffOapz0r7waNDIeUIyRxXJjbSwQfG4pg+bTai3KAnPP04apxGWDyB
+i7enVbj0BWM1tO8/1oBDQkFHba3hJB2m+/ssCBnuu5vHsaGKf4gn2I1TQngnyOun
+Y+ZP5sA/EP+XrswCQAhDp4VMlm47fUhFtbV54yXZfeJDHFcGK37b86WXYOQ/fK5K
+Q+1JCEMF6/HLJjCyMGEya+igHMToyNkh2GMH4BmcGD3dBR2vtsjczs0ehrL0KlHt
+5qjNgxoGTVZGUMJ3YxAIY1/RMnfq3olVMx8VnE1JdeM7jLlVxyI4oSJLMyc00CGA
+kGKVGzwQg0/M/lpDzzwbWmyGN9o9UkT7Cv8f3ls/p/bNmxWX/Hc8xvK0Vu8+92DK
+y8/+QNDIipUjQz0OKCHBsAZsOxBYm6MPHoDgiYkdMS9nB1vxklDcbbUbvo1Pi/v5
+WT+fDqAGbQJvjxo7FRZKiHdsHMWinCprn3eHk6euKD5WxcS+X6U=
+=6Ldq
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b2c6bbd97877..5345d13e7329 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2023 23:09:46 +0000
+Fri, 13 Jan 2023 05:09:43 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4fdec2d5c111..00d860a1d7db 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 12 11:09:45 PM UTC 2023
+Fri Jan 13 05:09:43 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c1a3f34cd3e4..f64d01a175d0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2023 23:15:01 +0000
+Fri, 13 Jan 2023 05:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 44fe4841cf77..6cc09dfd209f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-68ea4dcfcb973282c49c8cd186dc2cb57d3673a8 1673564136 2023-01-12T22:55:36+00:00
+2b8d461e20dfef36b17971b668aa77dba1de4dc2 1673584937 2023-01-13T04:42:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e9a53039bf7d..042df8cbd174 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673565001 Thu 12 Jan 2023 11:10:01 PM UTC
+1673586601 Fri 13 Jan 2023 05:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b2c6bbd97877..5345d13e7329 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2023 23:09:46 +0000
+Fri, 13 Jan 2023 05:09:43 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index aeb59f602dc2..a3bb6ac390ed 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index b1e5ac3f39c6..f8f484b9ec94 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -5,6 +5,7 @@ AUX iptables-1.8.8-format-security.patch 639 BLAKE2B df5c843d0cd6634740b37230026
 AUX iptables-1.8.8-musl-headers.patch 2061 BLAKE2B 6876d083d179a055c60422397e67a24137ae5bb72cba02f732d4dd7313171c10717202a41f1256196d5b64bc29d22e98d8d0eb9861130fa93481b527d0117e96 SHA512 136f3c7dae7c88739ed1c2d2c14e9a8381013c8a376bee80a7f994098810bb61d76dd143dc65430f0ec7b44d542b64242dd947134936468155840a4a26e6ce79
 AUX iptables-1.8.8-out-of-tree-build.patch 1058 BLAKE2B 5a358632780b607533033dc3bf6b6e24ac1af49dbbc26afae05668187c2a4072dba1cdbf51647b6b5f7c5f68e5a3d64fa82b5b0477d3cd4e936d466b731707fb SHA512 453ed9a2b3b2dddb3ccc9a099386c28290416ea356884084fd4d9bd2b026e21732b91f020fbe55de12ba970b815993f2e3a18a52a6774ab7738383e2f144a973
 AUX iptables-1.8.8-uint-musl.patch 4607 BLAKE2B 8ca4ba2fec97e99e1f57d9d1f376dbdab53a698279534879163ad5dade629cda3ac232df54d57ae75e589c2327492953e0c30356bdc4367b9a1474afc259136c SHA512 01d3af7330334b5002ec9d50e4b469651148b911d9ab5d45d5a2cd08e72c3be5e770c047cbc337485e40cb622ee470faa9ed91b53ca59e09a1c197bf5df48a9a
+AUX iptables-1.8.9-format-security.patch 870 BLAKE2B fc33c16eae1c77a5714ecb3f7bbb859dfe64b9506ac82a6d8f91f206d24a5ebf66664e141b60e4580e59bd85314d27df5edf6bd11511ffa4dab7deaf833ccb93 SHA512 7551438de030506e4fe462a715f6a16637991f90cfaddc352a95c0341c72ae7d90728bc0a4e56da2cc108ff2c4e3f9e92451fb6dc65633d47973694550fd08b4
 AUX iptables-r1.confd 890 BLAKE2B 0aaca870e3c03f19a71cf1b210377dfda320faf118359e298bef419eaf280fd11c9726d200ae89602e863c9b48de0bb51ac05424b50c064afe948a980e300153 SHA512 10002da01ded6be0e9bca6041798ad0859fa2212fde077a048443e4f3012c95d86e4580ae426e87af5891368062af9af6f9fd35ed617d24cdd3c51702b816b13
 AUX iptables-r3.init 3961 BLAKE2B fd25c46060f31242e1cb5e07281a79431eba2915a34fd91df86f3e6573029d46bb3cdf97d1297863def105cbbc34fadf6b19785951ca16893f1fe539bb070354 SHA512 13a5128f531f9f146e5f77985b899ec5d8b99223b3a1e90e656c1819bfa0984645de412b3938f998eb216ef98d5fd558dbc183351e707be0997499f40f706f16
 AUX systemd/ip6tables-restore.service 404 BLAKE2B 35cdf804e787aa5cc382cc638de523735ab47b878168c41d8eef85eb592e5bebd9319e75a10db28f0eba6618efae355c90f03ac0798239edeb80d01108e98a47 SHA512 34730df7464354bce11ca5bdceb5cf305e8ab7e2ded2c2689448379e74ff93252e7a83cfe05c2f3238f59a2ade69cd9c328291c28c43b6612bfb7b29fcb0feee
@@ -12,5 +13,7 @@ AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a
 AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3de245a7b03965129f3d7f13097fc03fbb1390167dcd971eff216eabad9e59b261a9c0f54bfc48a77453aa40d164 SHA512 f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59
+DIST iptables-1.8.9.tar.xz 637848 BLAKE2B 37ba80be0ee7049c4d3ee5689b273b4d2cc6e6fb9ebb297e86976b5750f987f2ae4536013fe1749ae79b6989c241eaece3202019fafd47d842c7a4fe3e5093b1 SHA512 e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70
 EBUILD iptables-1.8.8-r5.ebuild 4733 BLAKE2B 46f0e77386ae051047868354c5ce774e4d88113aed56e70338c98150de672b959d2200d5da59051f1272cbad28a03153bc5503705c1b58bbb9c7fb041947fd6e SHA512 d0379b878c8c7d52b6967a9a8634ee5e48fceee70910733d1ec46f793fdf5adceb8946924619052b63c77a4715a5225a2a95f61402c29c4110aa0af4a5e88a33
+EBUILD iptables-1.8.9.ebuild 4558 BLAKE2B 5495e16fd5616051dbd1d9b8e5610b11fb647f506be28edf589699ca3d136dce8ad735a451f18b51a0e621e3f44c93bc61ca21a8b4f0430e11647168f51689d8 SHA512 8bbf97b626085aafe531eb802cffb8e7e76c64328759c651d1a47df97eb83b95cea65870e3cb7a702bbc5c7b53aed09d9e88543cd526344725a1eb7999976dfd
 MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842
diff --git a/net-firewall/iptables/files/iptables-1.8.9-format-security.patch b/net-firewall/iptables/files/iptables-1.8.9-format-security.patch
new file mode 100644
index 000000000000..a95c43600986
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.8.9-format-security.patch
@@ -0,0 +1,26 @@
+https://git.netfilter.org/iptables/commit/?id=ed4082a7405a5838c205a34c1559e289949200cc
+
+From ed4082a7405a5838c205a34c1559e289949200cc Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Thu, 12 Jan 2023 14:38:44 +0100
+Subject: extensions: NAT: Fix for -Werror=format-security
+
+Have to pass either a string literal or format string to xt_xlate_add().
+
+Fixes: f30c5edce0413 ("extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE")
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+--- a/extensions/libxt_NAT.c
++++ b/extensions/libxt_NAT.c
+@@ -424,7 +424,7 @@ __NAT_xlate(struct xt_xlate *xl, const struct nf_nat_range2 *r,
+ 	if (r->flags & NF_NAT_RANGE_PROTO_OFFSET)
+ 		return 0;
+ 
+-	xt_xlate_add(xl, tgt);
++	xt_xlate_add(xl, "%s", tgt);
+ 	if (strlen(range_str))
+ 		xt_xlate_add(xl, " to %s", range_str);
+ 	if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) {
+-- 
+cgit v1.2.3
+
+
diff --git a/net-firewall/iptables/iptables-1.8.9.ebuild b/net-firewall/iptables/iptables-1.8.9.ebuild
new file mode 100644
index 000000000000..09aace20ecdd
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.8.9.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs autotools flag-o-matic usr-ldscript
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://www.netfilter.org/projects/iptables/"
+SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.xz"
+
+LICENSE="GPL-2"
+# Subslot reflects PV when libxtables and/or libip*tc was changed
+# the last time.
+SLOT="0/1.8.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="conntrack netlink nftables pcap static-libs"
+
+COMMON_DEPEND="
+	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+	netlink? ( net-libs/libnfnetlink )
+	nftables? (
+		>=net-libs/libmnl-1.0:=
+		>=net-libs/libnftnl-1.1.6:=
+	)
+	pcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/os-headers
+	>=sys-kernel/linux-headers-4.4:0
+"
+BDEPEND="
+	virtual/pkgconfig
+	nftables? (
+		sys-devel/flex
+		app-alternatives/yacc
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	nftables? ( net-misc/ethertypes )
+	!<net-firewall/ebtables-2.0.11-r1
+	!<net-firewall/arptables-0.0.5-r1
+"
+IDEPEND=">=app-eselect/eselect-iptables-20220320"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.4-no-symlinks.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_prepare() {
+	# Use the saner headers from the kernel
+	rm include/linux/{kernel,types}.h || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Some libs use $(AR) rather than libtool to build, bug #444282
+	tc-export AR
+
+	# Hack around struct mismatches between userland & kernel for some ABIs
+	# bug #472388
+	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
+
+	sed -i \
+		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
+		configure || die
+
+	local myeconfargs=(
+		--sbindir="${EPREFIX}/sbin"
+		--libexecdir="${EPREFIX}/$(get_libdir)"
+		--enable-devel
+		--enable-ipv6
+		--enable-shared
+		$(use_enable nftables)
+		$(use_enable pcap bpf-compiler)
+		$(use_enable pcap nfsynproxy)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+
+	# Managed by eselect-iptables
+	# https://bugs.gentoo.org/881295
+	rm "${ED}/usr/bin/iptables-xml" || die
+
+	dodoc iptables/iptables.xslt
+
+	# All the iptables binaries are in /sbin, so might as well
+	# put these small files in with them
+	into /
+	dosbin iptables/iptables-apply
+	dosym iptables-apply /sbin/ip6tables-apply
+	doman iptables/iptables-apply.8
+
+	insinto /usr/include
+	doins include/ip{,6}tables.h
+	insinto /usr/include/iptables
+	doins include/iptables/internal.h
+
+	keepdir /var/lib/ip{,6}tables
+	newinitd "${FILESDIR}"/${PN}-r3.init iptables
+	newconfd "${FILESDIR}"/${PN}-r1.confd iptables
+	dosym iptables /etc/init.d/ip6tables
+	newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables
+
+	if use nftables; then
+		# Bug #647458
+		rm "${ED}"/etc/ethertypes || die
+
+		# Bugs #660886 and #669894
+		rm "${ED}"/sbin/{arptables,ebtables}{,-{save,restore}} || die
+	fi
+
+	systemd_dounit "${FILESDIR}"/systemd/ip{,6}tables-{re,}store.service
+
+	# Move important libs to /lib, bug #332175
+	gen_usr_ldscript -a ip{4,6}tc xtables
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	local default_iptables="xtables-legacy-multi"
+	if ! eselect iptables show &>/dev/null; then
+		elog "Current iptables implementation is unset, setting to ${default_iptables}"
+		eselect iptables set "${default_iptables}"
+	fi
+
+	if use nftables; then
+		local tables
+		for tables in {arp,eb}tables; do
+			if ! eselect ${tables} show &>/dev/null; then
+				elog "Current ${tables} implementation is unset, setting to ${default_iptables}"
+				eselect ${tables} set xtables-nft-multi
+			fi
+		done
+	fi
+
+	eselect iptables show
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		elog "Unsetting iptables symlinks before removal"
+		eselect iptables unset
+	fi
+
+	if ! has_version 'net-firewall/ebtables'; then
+		elog "Unsetting ebtables symlinks before removal"
+		eselect ebtables unset
+	elif [[ -z ${REPLACED_BY_VERSION} ]]; then
+		elog "Resetting ebtables symlinks to ebtables-legacy"
+		eselect ebtables set ebtables-legacy
+	fi
+
+	if ! has_version 'net-firewall/arptables'; then
+		elog "Unsetting arptables symlinks before removal"
+		eselect arptables unset
+	elif [[ -z ${REPLACED_BY_VERSION} ]]; then
+		elog "Resetting arptables symlinks to arptables-legacy"
+		eselect arptables set arptables-legacy
+	fi
+
+	# The eselect module failing should not be fatal
+	return 0
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index da767a72cea4..5982b40fe61c 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 0629667764e9..50628f88bd2d 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.22.tar.gz 77553233 BLAKE2B c0c9a5a9b088a3f619f498c345f46f5e43712c353f723427a1ffd95a2a66817e8d5e5298a8290d88df807251cc156db0e26ec1403ed4b3cba241b624d436346b SHA512 96c8486577bee7ae165bf96aab50c0733d83a2d9435357d9a4d9a3e9f3225ae6a7bf46e1a7d8b419ecc7ab4e270755332621a4f786ddb89a842379f5da40b271
-EBUILD discord-bin-0.0.22.ebuild 3815 BLAKE2B f80d35014beec420549387e8816846018e76c405208eca94b00321488c08e40e5d77c2023a7eef9964a2de947233be48633cebe62c134b960c347ce8e2edf005 SHA512 ea6e13c461190262108c9e2c974b1dd6da814bdb198791996d94aa821b31054c0fb42b80d0aa68e18da98b9901e82bdab5da7c219c46c1c0a9a7bb1dbdef898e
+DIST discord-0.0.23.tar.gz 82116322 BLAKE2B 5ed0d4d20d20a5bdb2e5bfc31b0a9c47baeaca976ee0f0861fdb436d89eccd4f5d50df9bd366f996cdbc767ce6d06bddf5992574329c7b5c01b47a9c154a37c4 SHA512 d03b27180c95ca74c93323090ce5c1e4351577d27184cfbf5525439052505ba198fafbd4b1489f97ce4c103bc35d1cfb4cdb1c32fc9c80bc55e2373b7a894a39
+EBUILD discord-bin-0.0.23.ebuild 3939 BLAKE2B 41afddb6118865e75a7fb60ab4116a09c3aa966fb2e513613156b76d0fb68f5cda440af9cdd57ae101ac6d7b7e574e43f5d623d73d505e385e083b5e187e18d6 SHA512 6f34c9138a15d45f2d9824c6151de82bbb238b8ebc2c0e2c16b432e940439d281420c22e805b231a01c59a08aea37ff37b333f4e3574373500044f1e195dce47
 MISC metadata.xml 521 BLAKE2B d35802fb6784e2029bd0478c24ec5d4c43f7183c4c94c3aea0c7c3e172855d1f4fe1ee5e163b7d5d1b41d2cdcf9bc5b9ecc56e4556e2ab8ffdc5503f19f0ee87 SHA512 3d0e4099b7881affc0a6e6cc6bb13d68a83df833db8def22d60d441f27ad576f88651f6f4133b82146e9e346cc646c2d347c517ec5e90d01118e1a1f9d2bdfa1
diff --git a/net-im/discord-bin/discord-bin-0.0.22.ebuild b/net-im/discord-bin/discord-bin-0.0.23.ebuild
index e006e6ca8030..b521475a6cfa 100644
--- a/net-im/discord-bin/discord-bin-0.0.22.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.23.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
@@ -6,6 +6,7 @@ EAPI=8
 MY_PN="${PN/-bin/}"
 MY_PV="${PV/-r*/}"
 
+CHROMIUM_VERSION="102"
 CHROMIUM_LANGS="
 	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
 	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
@@ -56,13 +57,14 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/libxshmfence
 	x11-libs/pango
-	system-ffmpeg? ( media-video/ffmpeg[chromium] )
+	system-ffmpeg? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
 "
 
 DESTDIR="/opt/${MY_PN}"
 
 QA_PREBUILT="
 	${DESTDIR#/}/${MY_PN^}
+	${DESTDIT#/}/chrome_crashpad_handler
 	${DESTDIR#/}/chrome-sandbox
 	${DESTDIR#/}/libffmpeg.so
 	${DESTDIR#/}/libvk_swiftshader.so
@@ -121,10 +123,10 @@ src_install() {
 
 	exeinto "${DESTDIR}"
 
-	doexe "${MY_PN^}" chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so
+	doexe "${MY_PN^}" chrome_crashpad_handler chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so
 
 	if use system-ffmpeg; then
-		dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "${DESTDIR}/libffmpeg.so" || die
+		dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION}" "${DESTDIR}/libffmpeg.so" || die
 	else
 		doexe libffmpeg.so
 	fi
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index ea59c550b327..4efa40ff600d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index f1e450299194..8736c0c04445 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -10,6 +10,10 @@ DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931
 DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9 SHA512 b97a6cc3fd3353cc1cdbb47df6d8895d0f730967083171795be56ffab4660c9a0f8f73ce83a98eff1fbd0793bae28c987d53c29f57fc5e0f26dddc30c197abb2
 DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1
 DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc
+DIST tor-0.4.7.13.tar.gz 8031948 BLAKE2B 338a0a541423f27f594a091307b5edeafc9826bb651c2bd050f3282c9355d9d43d1ef4791f3c98a37dc4c0f64bc40925ea1c1e32cbdff78b1a7308df501f279a SHA512 0900416887afbb24f7b72e6ef181b7b01308d1bb35c37736f3b13e06810a07febf9f47fadd9ff6c0e73204d93b49545e4e2516906eb3ba74398ad2b299f530be
+DIST tor-0.4.7.13.tar.gz.sha256sum 86 BLAKE2B 339db9869bfe485cbd328fe942cc23e60c08ad67fc2d9e7927ed3c9f3b606192e5efac34013c5bf0b0e8b26e957dcf8b586e1cc0a0c27756b8b3d823af37fdee SHA512 ec1d19fa662255df5dd575ba943f4ccb30d9dfa49ff656cdfa73df2d24248b52a3bfd715f4d3efe11d8129968b0e06e3c75e8d82416e1807020ebf65f65401a0
+DIST tor-0.4.7.13.tar.gz.sha256sum.asc 716 BLAKE2B 968a3852293ab9bcadac626862c9dc360b17de5afd00af7c46358fa2adfc03b55c02dfe029e9427efba999f553489a04388b395e8fb8fe16325e0895663c2deb SHA512 eb78e8369941d8de833e3616a9a1c1e59b0d3dde918353e2f4fa5eb5da09f038238c46f5e180844bd3cba1211a9daa6d60e9ddb5690998e27a6b7d1616aa20cc
 EBUILD tor-0.4.7.11.ebuild 3182 BLAKE2B 0a9d4c581b51b370fba88c124df05938111ea4cc404b6f134f364a705ef0d07b106b1eddedaa67ddab845948f8840745eb08032aae874b9906ea4705a30a76eb SHA512 d237932416e70bf209f389bd18ff43f7fb4e95c61f6b141ae609b90b9428550e296f23f9ea26e7f758237c1719663639cd22215629aabb56ab1a002ab734d242
 EBUILD tor-0.4.7.12.ebuild 3182 BLAKE2B dff408c48a7f2ed744feb922e8879f1c5b3c9cd6217cb713c737a8d83495b63b0d765fd937acd885d2189dd4e20f3d5933a7d755a8075b342a261ea8580a3323 SHA512 79515b99143e6f7bdcce73ff21a1af59cda3ae88b7eeeb7cb522f3366ab6a2e172cdcd073d3bb19bd9ad649d30b6a4f77b5c6c49db6a4c8782336a3bc933170a
+EBUILD tor-0.4.7.13.ebuild 3188 BLAKE2B f66585ff11b67dbab8aea85d573de6d4be4e4a336c4ed47fcd7a53b36f4f47104ece828b59ebb0bcbe721a77b1022de72c63349224c3563843ff28acdf72a608 SHA512 27b61260297e567fd34d16dd84b0a5d138e77b6c72ef8c0257369fe0166888e6634fcd367aa3ed930d2429e25775cc0d04587724c35350352809e6b3de787955
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.13.ebuild b/net-vpn/tor/tor-0.4.7.13.ebuild
new file mode 100644
index 000000000000..e67b47263631
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.13.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="https://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
+	verify-sig? (
+		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
+		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
+	)"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+fi
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+RESTRICT="!test? ( test )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )"
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	dev-libs/openssl:0=[-bindist(-)]
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+# bug #764260
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)"
+
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+# EAPI 8 tries to append it but it doesn't exist here
+# bug #831311 etc
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
+		verify-sig_verify_unsigned_checksums \
+			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_configure() {
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--disable-all-bugs-are-fatal \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-html-manual \
+		--disable-libfuzzer \
+		--enable-missing-doc-warnings \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
+		$(use_enable man manpage) \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable server module-relay) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r9 tor
+	systemd_dounit "${FILESDIR}"/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r2 torrc
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index efc4c634582d..95078448b7f4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 46db78182caa..f7edc7fe6762 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -8,8 +8,7 @@ DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3
 DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
 DIST file-5.44.tar.gz 1186437 BLAKE2B a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42 SHA512 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
 DIST file-5.44.tar.gz.asc 195 BLAKE2B a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1 SHA512 1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
-EBUILD file-5.43-r2.ebuild 3748 BLAKE2B 8a3bf79b24f0e7adb88254c67efffd6c4d811b2dbbe95067861ca0c750ce3f4eaf48d996cf9d903196da0889796051c55d79443132b0ff4ef3337342f730b5e1 SHA512 e3cad781107a0db9d3125584c48ffb70aa22ca211691aba621d342f61878bb6b1460aede609e51d2f80bfd866dac5d9f1e57fca1c5bfd03c83e7063307ffb519
-EBUILD file-5.44-r1.ebuild 3977 BLAKE2B 3f59ebb6fe4aa4d30c634ed3605df50e9353a764314a3199a402637ef05f726799da80e51dae5743d7aae04aaf7b41218edbd172216166ce58340bc7081ea97e SHA512 f73860f67289d5193d08874d4c6552e4f4a56145bab1cbb78224c81a4cfed4ed7a2a517e334673e54b07674b77b9abce977b60d54e2582f291266c984c55a6ad
-EBUILD file-5.44-r2.ebuild 4043 BLAKE2B 3cbaab2716d4332b44281c0590bd09f7f23f85f1a77eb4668e52fb0f4021b06c77e077691f8fc57eaa30b5727f34b4e1aeee7afa1900610cf55933143a934003 SHA512 0c4f262b6dd6c5127271085b3a26781b1a995128291ba2ad9bd0bb4c3928f21756d6cec768d672ac1bc122dc4583161930896db3548526f6cc6021faa1948f96
-EBUILD file-9999.ebuild 3855 BLAKE2B 29dc182f37fe2d0195eee8df904472447b97f97db750a46d686badb2795736035661ec2a398e36b416c27880df4caadddd283fddf2762a17ce1e94faca4faf49 SHA512 a271f686925d2b3be69e08f58a84be9ab742a19c0dc5f8d86413aae646aedbcc27fe51c0e8451ca92633d268bed1e529e52aa227e1c77b520f60048cc7dcd60c
+EBUILD file-5.43-r3.ebuild 3761 BLAKE2B 881479611df8c807c9bac3f27089f4309ee6027b9d3c29f91d0ce31f8d066174c94525070870cf5e9f852ead592d45316371e9eb062d12c459bca930de2e1e33 SHA512 94654d48b9abbbe1e2d05262a458b8e6727f2152208e305f5aca80c1f572b0b2ca70fc792a3d12e94407abab2dfc8c995320140b8906b25f98658a82bff80d11
+EBUILD file-5.44-r3.ebuild 4115 BLAKE2B 26eea17058f3861789aa28d5b4e3857870ece9233d700d8ae5b1888263cacb492578bb355647d6bb8800e24d86886e105f86d5dfe75f36ef6fb3c6d62fe90b4d SHA512 8153cb7c88e2aa433cfc41589cb56c62c5cffae24de213af8654fd08aa2f10d648227c16811f05a736533e857690b5742115eb694cbac4e39a895f1ee2fa445e
+EBUILD file-9999.ebuild 3929 BLAKE2B 5854263d17a82befc2f7b7a20afea07447c02849ca15778520ba4a96c9e6917d47f11db54d5ba7b04b364768f15e236a5ade9e5010a4ee957197181ea5b6a80d SHA512 332376a86b77ee6a187b1c2447bbc007ac99e1515f2d86ad6b89371d725ed7aa14b7132cd9b6f7d59552c950d311a479bdfc1f9eba1edbe53ed08f4980576d2a
 MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.43-r2.ebuild b/sys-apps/file/file-5.43-r3.ebuild
index 610753073aa6..040db6fb3eb5 100644
--- a/sys-apps/file/file-5.43-r2.ebuild
+++ b/sys-apps/file/file-5.43-r3.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
@@ -38,15 +38,19 @@ DEPEND="
 		${PYTHON_DEPS}
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
+	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
 	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+"
 BDEPEND+="
 	python? (
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978
diff --git a/sys-apps/file/file-5.44-r1.ebuild b/sys-apps/file/file-5.44-r1.ebuild
deleted file mode 100644
index c29778951f51..000000000000
--- a/sys-apps/file/file-5.44-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
-	inherit verify-sig
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzip? ( app-arch/lzlib )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)"
-
-PATCHES=(
-	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
-	"${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
-	"${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Don't let python README kill main README, bug ##60043
-	mv python/README.md python/README.python.md || die
-
-	# bug #662090
-	sed 's@README.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(multilib_native_use_enable lzip lzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-		$(use_enable zstd zstdlib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# When cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.44-r2.ebuild b/sys-apps/file/file-5.44-r3.ebuild
index b20035b2e73c..2ef72d8197bf 100644
--- a/sys-apps/file/file-5.44-r2.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	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"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
@@ -39,17 +39,21 @@ DEPEND="
 		${PYTHON_DEPS}
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
+	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+"
 BDEPEND+="
 	python? (
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index c83ce4f71f81..0c13d481dc8d 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,17 +39,21 @@ DEPEND="
 		${PYTHON_DEPS}
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
+	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+"
 BDEPEND+="
 	python? (
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f958c27f2093..061f7dc88da4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,14 +1,9 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
-AUX portage-3.0.38.1-xz-32-bit.patch 4263 BLAKE2B 83ee332acc8290a1e96eaafbfff7e42c6a686c4dc34e1fb2e1e935fe04cd98071d14299d76294e8d4178615ee9309985a7f508a7aaad0f9f0efaaeeb89301565 SHA512 6d75e5bdc463ffed264b4db5a953a7bb49971109ea88c4645d1c35dd2d5e8f0a4913a2fc20b858a91921734f6ff906293b14308e24bf591d86150e93af6bbcc8
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
-DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
 DIST portage-3.0.41.tar.bz2 1119737 BLAKE2B 6c6d1fa11f16362505e321eb530d233cf73a7e1cc7dab2fc88ad40701c16835e08a7d16a408381e2f717ac5f48d46344e57b9b5296be4eba0a7583540c6a81aa SHA512 046621ee59b2b1b374a63091028ed3462b1212960b337e8e034c739d5c51d5ae1e7b491c88940199e710081409e38778749a5c86576cf5bb6c59b1890dc892b5
-DIST portage-3.0.42.tar.bz2 1122793 BLAKE2B 9df93e5ebeab415bd3b56e4e1771b628f5e3622d997aa8818e7ce42f77d60ffcb1807093dbc44852c5b359c632c11dcb7db6c026f2e7e224293e7ebb9e64b286 SHA512 f3d2bb5a1adc801c641ff14043b1617831c646a9432b2602e48343d8264850bb410a1666d646b97e224864d56cc7acae0aa044a7476384030063fb77e4323724
 DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691
-EBUILD portage-3.0.38.1-r6.ebuild 9294 BLAKE2B d22e4580b7afc07fc6ed98fb00f9b2b1b2993549239ab3abfd6411865ae5adb281fe423cdd96549458d91139d53911f044f8f01736f86292809576377f6c09c6 SHA512 6a642e20914d25ea37c5f94d053741378c8be60d8be0ed07ec7becc35e7f0dd9ff9a6edce238b1ac5b67236d0cbefece005f51ee06945dc59927db771d452103
-EBUILD portage-3.0.41-r2.ebuild 9261 BLAKE2B 836391be0afa5d1f971775a9cc1b6db8bf26a940315f46d04d6e36c7fadc7f316dc8551d7d379913e1cb3eb5bb3dd376cbac59e0f6cdfd955685c3c529baca2a SHA512 08c70bbca341b0acc5f8636f8b84f828cd351a91e8d5a58e493f3602b66a2568cd6914f2deabd12216e0839b12328370f1bb7f94f021ea781647007234cd5df6
-EBUILD portage-3.0.42-r1.ebuild 9269 BLAKE2B 0cc257e6cf91ea251575cff68ab3a704a44c40a08d59ff8eadacfd6bcba72a72712e002d1ecf1d1475904a94d5dfa1e96fbd9f3f2b95e7aada77f3fb19c620c3 SHA512 8dbd085382e1688958bb2154c9bead21b430670d107ae1b13c8487c0d61bf0e63eb1779347913c42555ce5a5541fb95a21885946af35f08af15a8fa552ecd9e9
-EBUILD portage-3.0.43.ebuild 9269 BLAKE2B c56c74e0d13584f7be004e36a774a74c6c6ca2fa5b936756b67dc9b70c43dde38e1c470dfae1e94592c428b8d1f8f03bf56ecac2f53b9e59a28faa648c6a8396 SHA512 648716d6e12ad62093795a46a9bed4a788721eeb7f59df42f153da6dc4b3377063f1c60c805a577dfab37c5e1e6509a8e9aa6ff38af5b2d8b0e38d1044db4c0d
-EBUILD portage-9999.ebuild 8507 BLAKE2B 5cf45f1540fcb04ca5d03ad158e339557ed418cc9b8bc61fd8bb31f791c23a083b506af8b77348a093705772accc83da1f68a282bbde06ea4d1a09d961866ee3 SHA512 6303c0c02ee72409411266542d6026d6a8e34fdcf46eaa9652984f5704f83d2eccaf7c8f574ddbf26385ef21fc1961dd973560ed2b35d89d4ae63e17d41e8edd
+EBUILD portage-3.0.41-r3.ebuild 9261 BLAKE2B 902b4ac2710171442d914aa961f206b639d121d77e192e34f2734550d9e1a11c17d5b92f4a2090284feec02344d0df48622faf937490727451c8eb0db760c81d SHA512 fd039dc7390b5ec5da7b3196425a53715e07c77b93754062e6595e547537b3a937e54ac3449fa648525c65d6420162a88e8e1a889cddac17cbffb6937d06ab7f
+EBUILD portage-3.0.43-r1.ebuild 9149 BLAKE2B 6f756224f2f960b80816d1b99a035344ba737a5c5fbf8e10aeaa7f6a80bcf217f64d505e5d011b36b2655c3910fd0d91b2f3add66296114411525d6f4ec3f8e2 SHA512 296e2d7e7db9ca1fde286436e5f8da7c2b668620537426614a45e88d4e4a1d97aa433fe0c09173d58295cdeae052b65b53f131eaeb18355a112764427436a78f
+EBUILD portage-9999.ebuild 8387 BLAKE2B 4472feab6cdef183ec974ea758354ca07ced42eb8c010bdf75d8c2d500e45a641ee9790f1282ddeed8ab846851b1e0dc266d41a072bcced9060bdbc642a48f13 SHA512 7f167da460ae9511da2aea557ac51829178c70664a6e00d6145a15696ace1330d12f223e9b959e18ac8c360c3be4c51b0eb83d35e5bb57b99534541f2b3e3fb8
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch b/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch
deleted file mode 100644
index fa50fbab01fc..000000000000
--- a/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://github.com/gentoo/portage/commit/6a47cc7bcf49b7c17fdca31969b6d6aeff84332c
-https://github.com/gentoo/portage/commit/041da67db3a61d19fa5b287db4da9c51794af115
-https://github.com/gentoo/portage/commit/6834e464803b5ac98f8ab1bbca5379970b5bc6d9
-
-From 6a47cc7bcf49b7c17fdca31969b6d6aeff84332c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 17 Oct 2022 19:37:03 +0100
-Subject: [PATCH] xz: add workaround for < xz 5.3.3_alpha 32-bit issue
-
-With older versions of xz, xz -T0 will on 32-bit systems
-try to allocate too much memory and bail out.
-
-After discussing with upstream, we set --memlimit-compress=50% as a
-way to make things work with both older & newer versions. This limiting
-is essentially already present with >= 5.3.3_alpha as -T0 includes it.
-
-Note that we don't need to do this for decompression as it's automatic
-there for newer versions and older versions -Tn a no-op.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/ecompress
-+++ b/bin/ecompress
-@@ -128,7 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
- 		# See: https://bugs.gentoo.org/672916
- 		# Setting '--rm' will remove the source files after a successful compression.
- 		lz4)  PORTAGE_COMPRESS_FLAGS="-m --rm";;
--		xz)   PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs)";;
-+		xz)   PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50%";;
- 		zstd) PORTAGE_COMPRESS_FLAGS="-q --rm -T$(___makeopts_jobs)";;
- 	esac
- fi
-
-From 041da67db3a61d19fa5b287db4da9c51794af115 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 17 Oct 2022 23:07:58 +0100
-Subject: [PATCH] xz: pass -q to xz
-
-Avoids noise from memlimit-compress.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/ecompress
-+++ b/bin/ecompress
-@@ -128,7 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
- 		# See: https://bugs.gentoo.org/672916
- 		# Setting '--rm' will remove the source files after a successful compression.
- 		lz4)  PORTAGE_COMPRESS_FLAGS="-m --rm";;
--		xz)   PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50%";;
-+		xz)   PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50% -q";;
- 		zstd) PORTAGE_COMPRESS_FLAGS="-q --rm -T$(___makeopts_jobs)";;
- 	esac
- fi
-
-From 6834e464803b5ac98f8ab1bbca5379970b5bc6d9 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 21 Oct 2022 02:32:17 +0100
-Subject: [PATCH] ecompress: don't set -9 for xz
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From xz(1):
-"""
-The differences between the presets are more significant than with gzip(1) and bzip2(1).  The selected compression settings determine the memory requirements of the decompressor, thus  us‐
-ing  a too high preset level might make it painful to decompress the file on an old system with little RAM.  Specifically, it's not a good idea to blindly use -9 for everything like it of‐
-ten is with gzip(1) and bzip2(1).
-[...]
--7 ... -9
-     These are like -6 but with higher compressor and decompressor memory requirements.  These are useful only when compressing files bigger than 8 MiB, 16 MiB, and 32 MiB, respectively.
-[...]
-•  DictSize  is  the  LZMA2 dictionary size.  It is waste of memory to use a dictionary bigger than the size of the uncompressed file.  This is why it is good to avoid using the presets -7
-... -9 when there's no real need for them.  At -6 and lower, the amount of memory wasted is usually low enough to not matter.
-"""
-
-Most things that ecompress touches are tiny (<32MB certainly). I made the
-mistake the man page warngs about -- don't assume it's a good idea just
-because of gzip & bzip2, and that's exactly what I did!
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/ecompress
-+++ b/bin/ecompress
-@@ -128,7 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
- 		# See: https://bugs.gentoo.org/672916
- 		# Setting '--rm' will remove the source files after a successful compression.
- 		lz4)  PORTAGE_COMPRESS_FLAGS="-m --rm";;
--		xz)   PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50% -q";;
-+		xz)   PORTAGE_COMPRESS_FLAGS="-q -T$(___makeopts_jobs) --memlimit-compress=50%";;
- 		zstd) PORTAGE_COMPRESS_FLAGS="-q --rm -T$(___makeopts_jobs)";;
- 	esac
- fi
-
diff --git a/sys-apps/portage/portage-3.0.38.1-r6.ebuild b/sys-apps/portage/portage-3.0.38.1-r6.ebuild
deleted file mode 100644
index 636d3faab4a1..000000000000
--- a/sys-apps/portage/portage-3.0.38.1-r6.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20220101
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0
-"
-# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		|| (
-			>=sys-apps/file-5.44-r1
-			=sys-apps/file-5.43-r2
-		)
-		>=sys-apps/coreutils-6.4
-	)
-"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-xz-32-bit.patch
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.41-r2.ebuild b/sys-apps/portage/portage-3.0.41-r3.ebuild
index 7654a8382e76..ffb269c054ee 100644
--- a/sys-apps/portage/portage-3.0.41-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.41-r3.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
@@ -73,8 +73,8 @@ PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
 		|| (
-			>=sys-apps/file-5.44-r1
-			=sys-apps/file-5.43-r2
+			>=sys-apps/file-5.44-r3
+			=sys-apps/file-5.43-r3
 		)
 		>=sys-apps/coreutils-6.4
 	)
diff --git a/sys-apps/portage/portage-3.0.42-r1.ebuild b/sys-apps/portage/portage-3.0.42-r1.ebuild
deleted file mode 100644
index cba50d3d026d..000000000000
--- a/sys-apps/portage/portage-3.0.42-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )
-"
-DEPEND="
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20220101
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0
-"
-# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		|| (
-			>=sys-apps/file-5.44-r1
-			=sys-apps/file-5.43-r2
-		)
-		>=sys-apps/coreutils-6.4
-	)
-"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.43.ebuild b/sys-apps/portage/portage-3.0.43-r1.ebuild
index 42a575287431..29c72df0f733 100644
--- a/sys-apps/portage/portage-3.0.43.ebuild
+++ b/sys-apps/portage/portage-3.0.43-r1.ebuild
@@ -68,15 +68,11 @@ RDEPEND="
 	!<app-portage/repoman-2.3.10
 	!~app-portage/repoman-3.0.0
 "
-# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		|| (
-			>=sys-apps/file-5.44-r1
-			=sys-apps/file-5.43-r2
-		)
 		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
 	)
 "
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 27741e2fdd31..a3d44689c3d1 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,15 +66,11 @@ RDEPEND="
 	!<app-portage/gentoolkit-0.4.6
 	!<app-portage/repoman-2.3.10
 	!~app-portage/repoman-3.0.0"
-# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		|| (
-			>=sys-apps/file-5.44-r1
-			=sys-apps/file-5.43-r2
-		)
 		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
 	)
 "
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index cbaad5750c93..81cc451cb1cd 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 4d6c102b5456..23066f98e414 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -48,6 +48,7 @@ AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02
 AUX ceph-tmpfilesd 29 BLAKE2B 02c5d6c59f6e93d03df3bb304529760824f64895f5bc0eff4a0a311013479e29cd3aa0fe554bbc65941838116d465b7df1ab351e2d80d7a4d1d109e26a7f0f2c SHA512 2d84199c6e57db1c0dd1074d94b899bf04c71ab0b10e91a34a0aa7c6a8136d34310ebe0967dcdde801f5b022502db00a891ce71af10c3ccef4ed396e8d316e15
 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
 AUX ceph.initd-r12 3088 BLAKE2B 371ee28604bef04766b3b13687feb56e076cf4ef23797bdf469db8b85454624ab005304c798c0945bcd4c5c0478ad7d724ccd33074afef39ab939464969e32b1 SHA512 4eeb1d589cd010b39405d1664f077a79d6a8bb8d9693b32390546e14a240f98ba6e4d6281940f482f57e8364339c68b1b02219c0f837f65a738686b00ac9498c
+AUX ceph.initd-r13 3106 BLAKE2B 5ff61b3aae02888f67a86a92f11572957a25ce868587b0f720d19dea30e4ff9c04d1e0ae5ef36e83865f098eeea0d3291d404b4ff91a569c8f30e1258bd3c614 SHA512 9b27141b49a96fd18145a18f97748158bb49b73987cbe33758f183dad2d7aadfa6e5249e714188f593d382d7dfe1807f3b14ebdf6273400260f09378c5958e78
 AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
@@ -62,10 +63,13 @@ DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde9
 DIST ceph-xsimd-17.2.4.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-17.2.5.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 EBUILD ceph-15.2.17-r1.ebuild 10743 BLAKE2B 8435b6bc28e514eaaf0b8180ea704e792e0fbe55336a92d1d074abdfe42cfff6aac7c1afa4d60260c0a5e5e498f2014a51014fa00a373e3e5bf705980b3223b5 SHA512 413f701beaf9b77bb8030f77d712ae63ce83c08eba6b277b692dcf0004f153e0b7db175985f288c60e5566615a4471d7eac04323f8cffc42b261fec8fde03c35
+EBUILD ceph-15.2.17-r2.ebuild 10808 BLAKE2B 374dd84cbd642295fa218c2c027ea0ba90bbe7db6df29c29681726e3bc98639b0b2eaeeec0b1dd38703292437e5aa52e2aab5113fa66d38ce1aa3ba9c6efbb21 SHA512 2f9cb87ca7321e30e1ee34a93a530f31cfe2e0f4f27cb16770924c32026685aaa36a8aae66b98be4fc819db4e51a5a70569ca1cad7541e8d412f29184ba7bac7
 EBUILD ceph-16.2.10-r3.ebuild 12509 BLAKE2B 6af62571a67aa108680e4833dc2ac6d98693c68ea05002201f3b80b1e84b5c92083fb9a4201a62dc7324dfd56a37c3a2f297aea54e6f6e865704d42cad67bd33 SHA512 c5670c9cb1120394a3cdbab87704532cb5c512b56dfe9f45469b7011a5a69ff29a0816c50ddef48fc08e4d2d5b76a27eaffa276fa82e580c9b833856a1248645
+EBUILD ceph-16.2.10-r4.ebuild 12561 BLAKE2B ffe28eb7a041ab299bea49b3bc27cf3e3aff5a5d2ff1d3cf37072ecb6c7c47f546a41c7caecc93f0eec983a891735bf7c23acd8479ae04ba9496eab3df5a272a SHA512 dec2b8e542d64c1f0095b6e4452e4ea5fabf1a2f0b79944662cc7f807c354402349b6d1e30163a3883c0697d8fef33cc3fd1e292e387a123af07ddc14c2574f7
 EBUILD ceph-16.2.9-r3.ebuild 12577 BLAKE2B 32c1e451a0002cefdfcc5244fe89554bb47163500ba10c7126a7f67e99d6ddca11e95c294ea6a66856f8337233761375d5b5f08717b4225bf437503dfebce328 SHA512 925d866c70d05671f7fd0a4e3b79da12810546a516cd1a31c9889ee210134b3343c9d1238fad75393f60f45ee607a7f1a485216be6dfea6d85a0d27a37beb347
 EBUILD ceph-17.2.3-r4.ebuild 12657 BLAKE2B 6af8a2b00f7c0559007c9d68673852621717d1b5608f12c4a2c6342cac21197992788066489b575e8411f0f971d68a505dde54b0d40c49d6d3853269fdfddcd3 SHA512 ca8c3e3db6bd0f5a312d0c855717b68b58f080c24ffc82d4597c6b0753bcb27180927fda330fba24f5d88e6d3030886c260a7f4301990e818ead0a4eae07cf27
 EBUILD ceph-17.2.4-r1.ebuild 12634 BLAKE2B fa7be818a54b12658f08c8019eaf2302d4ddc5bb2c998c2913599e27945e063ee91a75479cc0ff844f41cf7562b62c07b94a2510b6a5f37d4eb4c292a247e82c SHA512 0766547f3d83ae64e0a6a364de0efb817f3a572661348b4a06d2844aa6f8e098223f6d6107023e6b22b5ad9f84c36b2fef9c77fe78f2b641bf88d6f60c17c852
 EBUILD ceph-17.2.5-r1.ebuild 12911 BLAKE2B 71a804495076674fbf896ae183ae5f9f78b7bda78d1ff89d840cf7f1e0283e7c8a121a8f76dcd5a52d5506526a0f6c2d4097a62b593a71a6a1e1703aad73bb80 SHA512 5254fa57beb812408c49dc340f2074cbd7a3bdf876bc24d17c3d7bbc61cf69055cd7335f3880d66d0270686be1c95d41c53a023f4209e5bcc5f2f1d30a7e2793
 EBUILD ceph-17.2.5-r2.ebuild 12955 BLAKE2B b27f597ed8fe7b36039a0ca1b60fa010d09eaceb9b8922c30518f595c02dc5cb62a5f62fad15de6466b6fe6ff47ee1b700935da143fee9ba8e302b09569a87af SHA512 9c1b9e9b07e2024b7ec1ac060603d84695e8d0e2e2c9911f7cef2b2594595e17e8ed5f229c72c3c4568d45c5d022b63fa3b3bcd27b2840a774d51f68db889b62
+EBUILD ceph-17.2.5-r3.ebuild 12976 BLAKE2B cefdf1d48adc5e303fa3d3fafb78af64690347b448f22badb39c77293069d52686ed4e44c92726eb2c13cbaab22c1e32c01b1e729c5c3264da8d364c42163bd3 SHA512 12bdcc07cffe7ef61ad8acd65d9204dd83329fb2e93f13a4f0578225ea18ea4ac9672c2262354ed58e8d57aa3128a64cecdf9950f1d73d98224d3eea54c576e7
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-15.2.17-r2.ebuild b/sys-cluster/ceph/ceph-15.2.17-r2.ebuild
new file mode 100644
index 000000000000..d250506f978d
--- /dev/null
+++ b/sys-cluster/ceph/ceph-15.2.17-r2.ebuild
@@ -0,0 +1,409 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles \
+		multiprocessing
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
+	+system-boost systemd +tcmalloc test uring xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-cpp/gflags:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libfmt:=
+	<dev-libs/libfmt-9:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	pmdk? ( dev-libs/pmdk:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP}] )
+	!system-boost? ( <sys-libs/glibc-2.34 )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[lvm]
+	app-alternatives/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-15.2.15-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
+	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
+	"${FILESDIR}/ceph-15.2.15-snappy-1.1.9.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5400M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_SYSTEM_ROCKSDB=ON
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	distutils-r1_src_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake_src_install
+	distutils-r1_src_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r13" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/ceph-16.2.10-r4.ebuild b/sys-cluster/ceph/ceph-16.2.10-r4.ebuild
new file mode 100644
index 000000000000..d13869019397
--- /dev/null
+++ b/sys-cluster/ceph/ceph-16.2.10-r4.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+LUA_COMPAT=( lua5-3 )
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \
+		lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="
+	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
+	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
+	+radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost
+	systemd +tcmalloc test uring xfs zbd zfs
+"
+
+IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	${LUA_DEPS}
+	${PYTHON_DEPS}
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	>=app-arch/snappy-1.1.9-r1
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-cpp/gflags:=
+	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	<dev-libs/libfmt-9:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/libevent:=
+	dev-libs/openssl:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:3= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	jaeger? ( dev-cpp/nlohmann_json:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	pmdk? ( dev-libs/pmdk:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	rdma? ( sys-cluster/rdma-core:= )
+	spdk? ( dev-util/cunit )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] )
+	!system-boost? ( $(python_gen_impl_dep '' 3.8 3.9) )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+	zfs? ( sys-fs/zfs:= )
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/util-linux
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	jaeger? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+	test? (
+		dev-util/cunit
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[lvm]
+	app-alternatives/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	jaeger? ( !system-boost )
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+	!system-boost? (
+		python_targets_python3_9
+		python_targets_python3_10
+	)
+"
+
+RESTRICT="
+	!test? ( test )
+"
+
+# tests need root access, and network access
+RESTRICT+="test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-16.2.2-cflags.patch"
+	"${FILESDIR}/ceph-16.2.8-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-16.2.0-liburing.patch"
+	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
+	"${FILESDIR}/ceph-16.2.7-string-includes.patch"
+	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
+	"${FILESDIR}/ceph-16.2.9-python310.patch"
+	"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
+	"${FILESDIR}/ceph-16.2.10-flags.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if ! use system-boost; then
+		python_setup 3.8 3.9
+	else
+		python_setup
+	fi
+	lua_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' \
+			-i || die
+	fi
+
+	if ! use systemd; then
+		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
+			| xargs --null sed \
+			-e '/^from ceph_volume.systemd import systemctl/ d' \
+			-i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
+		-i src/CMakeLists.txt
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local mycmakeargs=(
+		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
+		-DWITH_CEPHFS:BOOL=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
+		-DWITH_DPDK:BOOL=$(usex dpdk)
+		-DWITH_SPDK:BOOL=$(usex spdk)
+		-DWITH_FUSE:BOOL=$(usex fuse)
+		-DWITH_LTTNG:BOOL=$(usex lttng)
+		-DWITH_GSSAPI:BOOL=$(usex kerberos)
+		-DWITH_GRAFANA:BOOL=$(usex grafana)
+		-DWITH_MGR:BOOL=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
+		-DWITH_OPENLDAP:BOOL=$(usex ldap)
+		-DWITH_PYTHON3:STRING=3
+		-DWITH_RADOSGW:BOOL=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
+		-DWITH_SYSTEMD:BOOL=$(usex systemd)
+		-DWITH_TESTS:BOOL=$(usex test)
+		-DWITH_LIBURING:BOOL=$(usex uring)
+		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
+		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
+		-DWITH_XFS:BOOL=$(usex xfs)
+		-DWITH_ZBD:BOOL=$(usex zbd)
+		-DWITH_ZFS:BOOL=$(usex zfs)
+		-DENABLE_SHARED:BOOL=ON
+		-DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
+		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
+		-DWITH_RDMA:BOOL=$(usex rdma)
+		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
+		-Wno-dev
+	)
+
+	# this breaks when re-configuring for python impl
+	if [[ ${EBUILD_PHASE} == configure ]]; then
+		mycmakeargs+=(
+			-DWITH_JAEGER:BOOL=$(usex jaeger)
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
+		)
+	fi
+
+	# conditionally used cmake args
+	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
+	use systemd && mycmakeargs+=( -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=$(systemd_get_systemunitdir) )
+
+	if use amd64 || use x86; then
+		local flag
+		for flag in "${CPU_FLAGS_X86[@]}"; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=(
+						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					)
+				;;
+				*) mycmakeargs+=(
+						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					);;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	cmake_build VERBOSE=1 clean
+	cmake_build VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" cmake_build VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_foreach_impl python_install
+
+	python_setup
+	cmake_src_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r13" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sudoers.d
+	doins sudoers.d/*
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" cmake_build VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
new file mode 100644
index 000000000000..93999ca1aac5
--- /dev/null
+++ b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
@@ -0,0 +1,477 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+LUA_COMPAT=( lua5-{3..4} )
+
+inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+SRC_URI="
+	https://download.ceph.com/tarballs/${P}.tar.gz
+	parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-${PV}.tar.gz )
+"
+KEYWORDS="~amd64 ~arm64"
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="
+	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
+	jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq
+	+radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost
+	systemd +tcmalloc test +uring xfs zbd zfs
+"
+
+IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	${LUA_DEPS}
+	${PYTHON_DEPS}
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	>=app-arch/snappy-1.1.9-r1
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-cpp/gflags:=
+	dev-lang/jsonnet:=
+	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	>=dev-libs/libfmt-6.2.1:=
+	<dev-libs/libfmt-9:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/libevent:=
+	dev-libs/libutf8proc:=
+	dev-libs/nss:=
+	dev-libs/openssl:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/thrift:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:3= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	jaeger? (
+		dev-cpp/nlohmann_json:=
+		dev-cpp/opentelemetry-cpp:=[jaeger]
+	)
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	parquet? ( dev-libs/re2:= )
+	pmdk? ( >=dev-libs/pmdk-1.10.0:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	rdma? ( sys-cluster/rdma-core:= )
+	spdk? ( dev-util/cunit )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+	zfs? ( sys-fs/zfs:= )
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/util-linux
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	jaeger? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+	test? (
+		dev-util/cunit
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[lvm]
+	app-alternatives/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+	rgw-lua? ( radosgw )
+"
+
+RESTRICT="
+	!test? ( test )
+"
+
+# tests need root access, and network access
+RESTRICT+="test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-16.2.2-cflags.patch"
+	"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-16.2.0-liburing.patch"
+	"${FILESDIR}/ceph-17.2.0-cyclic-deps.patch"
+	"${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch"
+	"${FILESDIR}/ceph-17.2.0-findre2.patch"
+	"${FILESDIR}/ceph-17.2.0-install-dbstore.patch"
+	"${FILESDIR}/ceph-17.2.0-deprecated-boost.patch"
+	"${FILESDIR}/ceph-17.2.0-system-opentelemetry.patch"
+	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
+	"${FILESDIR}/ceph-17.2.0-osd_class_dir.patch"
+	"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
+	"${FILESDIR}/ceph-17.2.3-flags.patch"
+	"${FILESDIR}/ceph-17.2.4-cyclic-deps.patch"
+	# https://bugs.gentoo.org/866165
+	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
+	"${FILESDIR}/ceph-17.2.5-gcc13.patch"
+	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	lua_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' \
+			-i || die
+	fi
+
+	if ! use systemd; then
+		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
+			| xargs --null sed \
+			-e '/^from ceph_volume.systemd import systemctl/ d' \
+			-i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
+		-i src/CMakeLists.txt
+
+	if use spdk; then
+		# https://bugs.gentoo.org/871942
+		sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local mycmakeargs=(
+		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
+		-DWITH_CEPHFS:BOOL=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
+		-DWITH_DPDK:BOOL=$(usex dpdk)
+		-DWITH_SPDK:BOOL=$(usex spdk)
+		-DWITH_FUSE:BOOL=$(usex fuse)
+		-DWITH_LTTNG:BOOL=$(usex lttng)
+		-DWITH_GSSAPI:BOOL=$(usex kerberos)
+		-DWITH_GRAFANA:BOOL=$(usex grafana)
+		-DWITH_MGR:BOOL=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
+		-DWITH_OPENLDAP:BOOL=$(usex ldap)
+		-DWITH_PYTHON3:STRING=3
+		-DWITH_RADOSGW:BOOL=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
+		-DWITH_SYSTEMD:BOOL=$(usex systemd)
+		-DWITH_TESTS:BOOL=$(usex test)
+		-DWITH_LIBURING:BOOL=$(usex uring)
+		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
+		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
+		-DWITH_XFS:BOOL=$(usex xfs)
+		-DWITH_ZBD:BOOL=$(usex zbd)
+		-DWITH_ZFS:BOOL=$(usex zfs)
+		-DENABLE_SHARED:BOOL=ON
+		-DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')")
+		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
+		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
+		-DWITH_SYSTEM_ZSTD:BOOL=ON
+		-DWITH_RDMA:BOOL=$(usex rdma)
+		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
+		-Wno-dev
+	)
+
+	# this breaks when re-configuring for python impl
+	if [[ ${EBUILD_PHASE} == configure ]]; then
+		mycmakeargs+=(
+			-DWITH_JAEGER:BOOL=$(usex jaeger)
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet)
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
+			-DWITH_JAEGER:BOOL=OFF
+			# don't want to warn about unused CLI when reconfiguring for python
+			-DCMAKE_WARN_UNUSED_CLI:BOOL=OFF
+		)
+	fi
+
+	# conditionally used cmake args
+	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
+	use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) )
+
+	if use amd64 || use x86; then
+		local flag
+		for flag in "${CPU_FLAGS_X86[@]}"; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=(
+						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					)
+				;;
+				*) mycmakeargs+=(
+						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					);;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	# hopefully this will not be necessary in the next release
+	use parquet && export ARROW_XSIMD_URL="file:///${DISTDIR}/ceph-xsimd-${PV}.tar.gz"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+src_compile() {
+	cmake_build all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	cmake_build src/pybind/CMakeFiles/cython_modules
+}
+
+src_install() {
+	python_foreach_impl python_install
+
+	python_setup
+	cmake_src_install
+	python_optimize
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r13" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sudoers.d
+	doins sudoers.d/*
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	DESTDIR="${ED}" cmake_build src/pybind/install
+
+	python_optimize
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/files/ceph.initd-r13 b/sys-cluster/ceph/files/ceph.initd-r13
new file mode 100644
index 000000000000..2d158ad80be3
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r13
@@ -0,0 +1,115 @@
+#!/sbin/openrc-run
+
+# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
+_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
+if [ -r "${_CONFD_FILE}" ]; then
+	. "${_CONFD_FILE}" || exit 1
+fi
+
+: "${ceph_conf:=/etc/ceph/ceph.conf}"
+daemon_type="${RC_SVCNAME#ceph-}"
+daemon_type="${daemon_type%%.*}"
+daemon_id="${RC_SVCNAME#ceph-*.}"
+daemon_id="${daemon_id:-0}"
+: "${rundir:=/run/ceph}"
+: "${user:=ceph}"
+: "${group:=ceph}"
+: "${rc_ulimit:=-n 1048576 -u 1048576}"
+
+pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
+daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
+
+command="/usr/bin/${RC_SVCNAME%%.*}"
+command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
+extra_commands="${extra_commands} reload"
+command_args_foreground="--foreground"
+
+retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
+start_stop_daemon_args="--user ${user} --group ${group}"
+supervise_daemon_args="--user ${user} --group ${group}"
+
+: "${supervisor:=supervise-daemon}"
+: "${stdout:=/var/log/ceph/console/ceph}"
+: "${stderr:=/var/log/ceph/console/ceph}"
+: "${respawn_delay:=10}"
+: "${respawn_max:=5}"
+: "${respawn_period:=1800}"
+
+: "${osd_respawn_delay:=15}"
+: "${osd_respawn_max:=10}"
+
+: "${radosgw_respawn_max:=5}"
+: "${radosgw_respawn_period:=30}"
+
+depend() {
+	use dns logger
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${daemon_type} in
+		mon|mds|osd|mgr|radosgw) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+	local log_dir
+	export CEPH_CONF="${ceph_conf}"
+
+	checkpath -d -q -o "${user}:${group}" "${rundir}"
+
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+
+	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
+		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
+		return 1
+	fi
+
+	if [ -n "${bluestore_osd_fsid}" ]; then
+		einfo "Mounting Bluestore"
+		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
+	fi
+
+	if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
+		command_args="${command_args} --name client.${daemon_id}"
+	fi
+
+	local arg_name arg_val repl_arg_name
+	for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
+		eval arg_val="\${${daemon_type}_${arg_name}}"
+
+		if [ -z "${arg_val}" ]; then
+			eval arg_val="\${${arg_name}}"
+		else
+			eval "${arg_name}=\"${arg_val}\""
+		fi
+
+		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
+			local log_file log_postfix
+			log_postfix=".${daemon_id}-${arg_name}.log"
+			log_file="${arg_val}"
+
+			if [ "${log_file}" != /dev/null ]; then
+				log_file="${log_file}${log_postfix}"
+
+				log_dir="$(dirname "${log_file}")"
+				checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
+			fi
+
+			repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
+			supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
+	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
+	eend ${?}
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 41081f92f1f9..84f64dec5971 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 0d6afaece07e..4028fdd34d7e 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,9 +1,10 @@
+AUX 2.1.7-ppc64-ieee128-compat.patch 6889 BLAKE2B 9214915ed5b1d149927d46f749903fbb9b4d243d993041b8c6db039dcb7a3968a315f211e010ef9373b721336d45daef264d951e7ea1e0aed01818ebccae9d02 SHA512 4e3edbe396d0c1fdb7b286417b2bf7fe114b392e09158b3f5d3e3d1c4844bf0d59263309883363175dacd63194fd0d6a120ace35c83989d0546dae825bbb91bd
 AUX zfs-kmod-2.1.6-fgrep.patch 2183 BLAKE2B b8c9b58cc6d94e9ddeacbe3c5eca9d040f1c6fba84b814c8c553d5c1e15334765d3190286a4ad2298762bc54f66a8b89ef69d115cfbd5a25d928170a1d46a770 SHA512 f65e7ffa8cfd00da7ad6d1fcbf5d61172c52e55ea2630f719b49750692c1c046e8baed0e04cadc841adbd804cf861ec712b0d07dbbcae7c1c3b475326045ae8c
 DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46 SHA512 75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3 SHA512 a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 EBUILD zfs-kmod-2.1.6.ebuild 5486 BLAKE2B 32e4582834c915881847938f42591797e4ba7dff695b3093681de90ed20ebe36d4df78fe8a869a3cc3b285dd65eab15b43a125d2a5cb68379fe22bb5475bb35a SHA512 0eb5ab0d272cb20f0072a442dd6fcedbfc01391ae8ef30c80418495af6116dc82916500f0474f4139ea54e4934d4d1db8a0d45c9bf284c644869f46753dc2b7f
-EBUILD zfs-kmod-2.1.7.ebuild 5487 BLAKE2B 5bee54fefdc88bcc6580070be8ec8695830adf5a10da3e83d9ce99ffdbd0b97b30eebb9696e8c67ea848e28897af839ce18f2369a76d464199b1bd89e8ffeebb SHA512 17dca83c2b22f199d1e62a5ea71af6e26d9f56419a422107795bd896c4ff8b59320c2c12ed9b6e149ac0e1ef95ee4bcf955ec9bc504c8577bb173b508533ab97
+EBUILD zfs-kmod-2.1.7.ebuild 5582 BLAKE2B 48b67e37786fe08ceff7701156d1982ccc602ad4881fc0ca9629f55dac1063db909b747fc2a75b46c545e0abf662f54036e056e4e296749228868b57d343c047 SHA512 c0a54af01573bf4801acfb289332293c3d7c4fcd55f45423e50673f0a27632ce315e6182e5645486baf5102e3d40ae8a65e32011d185b2d6984240488c668c93
 EBUILD zfs-kmod-9999.ebuild 6569 BLAKE2B e058687c1724cae0c0fb33826320a7ae05220efc5156268b3189841c70075d36bbd98d7273c73b68893a6a2577790012b9f7aec324ca0f00f07f7d58d5a90347 SHA512 cc1c71c7141c6ef9ccb522c8f8599d648975e9d066ab58ced971e48155e3c9caf4a597c13166db8c10ed0cd73c8255772b461f2b0f6b32beb6b708c1339755b9
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch b/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch
new file mode 100644
index 000000000000..5613cb8ca9d1
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch
@@ -0,0 +1,217 @@
+From 8324d738fdb3096bd97336476bb399e6c312289a Mon Sep 17 00:00:00 2001
+From: Richard Yao <richard.yao@alumni.stonybrook.edu>
+Date: Thu, 12 Jan 2023 11:06:57 -0500
+Subject: [PATCH] Linux ppc64le ieee128 compat: Do not redefine __asm on
+ external headers
+
+There is an external assembly declaration extension in GNU C that glibc
+uses when building with ieee128 floating point support on ppc64le.
+Marking that as volatile makes no sense, so the build breaks.
+
+It does not make sense to only mark this as volatile on Linux, since if
+do not want the compiler reordering things on Linux, we do not want the
+compiler reordering things on any other platform, so we stop treating
+Linux specially and just manually inline the CPP macro so that we can
+eliminate it. This should fix the build on ppc64le.
+
+Closes openzfs/zfs#14308
+Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
+---
+ .../vdev_raidz_math_powerpc_altivec_common.h  | 44 +++++++++----------
+ 1 file changed, 20 insertions(+), 24 deletions(-)
+
+diff --git a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
+index 46d42c5e241..f76eb47a9c6 100644
+--- a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
++++ b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
+@@ -26,10 +26,6 @@
+ #include <sys/types.h>
+ #include <sys/simd.h>
+ 
+-#ifdef __linux__
+-#define	__asm __asm__ __volatile__
+-#endif
+-
+ #define	_REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N
+ #define	REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1)
+ 
+@@ -142,7 +138,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx 21,0,%[SRC0]\n"				\
+ 		"lvx 20,0,%[SRC1]\n"				\
+ 		"lvx 19,0,%[SRC2]\n"				\
+@@ -172,7 +168,7 @@ typedef struct v {
+ 		:	"v18", "v19", "v20", "v21");		\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx 21,0,%[SRC0]\n"				\
+ 		"lvx 20,0,%[SRC1]\n"				\
+ 		"lvx 19,0,%[SRC2]\n"				\
+@@ -189,7 +185,7 @@ typedef struct v {
+ 		:	"v18", "v19", "v20", "v21");		\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx 21,0,%[SRC0]\n"				\
+ 		"lvx 20,0,%[SRC1]\n"				\
+ 		"vxor " VR0(r) "," VR0(r) ",21\n"		\
+@@ -208,7 +204,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR4(r) "," VR4(r) "," VR0(r) "\n"	\
+ 		"vxor " VR5(r) "," VR5(r) "," VR1(r) "\n"	\
+ 		"vxor " VR6(r) "," VR6(r) "," VR2(r) "\n"	\
+@@ -217,7 +213,7 @@ typedef struct v {
+ 		:	RVR0(r), RVR1(r), RVR2(r), RVR3(r));	\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR2(r) "," VR2(r) "," VR0(r) "\n"	\
+ 		"vxor " VR3(r) "," VR3(r) "," VR1(r) "\n"	\
+ 		:	UVR2(r), UVR3(r)			\
+@@ -232,7 +228,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		"vxor " VR2(r) "," VR2(r) "," VR2(r) "\n"	\
+@@ -245,7 +241,7 @@ typedef struct v {
+ 			WVR4(r), WVR5(r), WVR6(r), WVR7(r));	\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		"vxor " VR2(r) "," VR2(r) "," VR2(r) "\n"	\
+@@ -253,7 +249,7 @@ typedef struct v {
+ 		:	WVR0(r), WVR1(r), WVR2(r), WVR3(r));	\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		:	WVR0(r), WVR1(r));			\
+@@ -267,7 +263,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vor " VR4(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vor " VR5(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		"vor " VR6(r) "," VR2(r) "," VR2(r) "\n"	\
+@@ -276,7 +272,7 @@ typedef struct v {
+ 		:	RVR0(r), RVR1(r), RVR2(r), RVR3(r));	\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vor " VR2(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vor " VR3(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		:	WVR2(r), WVR3(r)			\
+@@ -291,7 +287,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
+ 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
+ 		"lvx " VR2(r) " ,0,%[SRC2]\n"			\
+@@ -312,7 +308,7 @@ typedef struct v {
+ 		[SRC7] "r" ((OFFSET(src, 112))));		\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
+ 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
+ 		"lvx " VR2(r) " ,0,%[SRC2]\n"			\
+@@ -324,7 +320,7 @@ typedef struct v {
+ 		[SRC3] "r" ((OFFSET(src, 48))));		\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
+ 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
+ 		:	WVR0(r), WVR1(r)			\
+@@ -340,7 +336,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
+ 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
+ 		"stvx " VR2(r) " ,0,%[DST2]\n"			\
+@@ -362,7 +358,7 @@ typedef struct v {
+ 		:	"memory");				\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
+ 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
+ 		"stvx " VR2(r) " ,0,%[DST2]\n"			\
+@@ -375,7 +371,7 @@ typedef struct v {
+ 		: "memory");					\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
+ 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
+ 		: :	[DST0] "r" ((OFFSET(dst, 0))),		\
+@@ -400,7 +396,7 @@ typedef struct v {
+ 
+ #define	MUL2_SETUP()						\
+ {								\
+-	__asm(							\
++	__asm__ __volatile__(					\
+ 		"vspltisb " VR(16) ",14\n"			\
+ 		"vspltisb " VR(17) ",15\n"			\
+ 		"vaddubm " VR(16) "," VR(17) "," VR(16) "\n"	\
+@@ -412,7 +408,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vcmpgtsb 19," VR(17) "," VR0(r) "\n"		\
+ 		"vcmpgtsb 18," VR(17) "," VR1(r) "\n"		\
+ 		"vcmpgtsb 21," VR(17) "," VR2(r) "\n"		\
+@@ -434,7 +430,7 @@ typedef struct v {
+ 		:	"v18", "v19", "v20", "v21");		\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vcmpgtsb 19," VR(17) "," VR0(r) "\n"		\
+ 		"vcmpgtsb 18," VR(17) "," VR1(r) "\n"		\
+ 		"vand 19,19," VR(16) "\n"			\
+@@ -478,7 +474,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		/* lts for upper part */			\
+ 		"vspltisb 15,15\n"				\
+ 		"lvx 10,0,%[lt0]\n"				\
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
index d12dfd611acc..b996ea790d4b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.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
@@ -26,7 +26,7 @@ else
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+		KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
 	fi
 fi
 
@@ -62,6 +62,9 @@ DOCS=( AUTHORS COPYRIGHT META README.md )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.6-fgrep.patch
+
+	# https://github.com/openzfs/zfs/issues/14308
+	"${FILESDIR}"/2.1.7-ppc64-ieee128-compat.patch
 )
 
 pkg_pretend() {
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 46945ef2b306..9159e0968924 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,13 +3,14 @@ AUX 2.1.5-dracut-zfs-missing.patch 309 BLAKE2B e66e700757aa6498b71d714c13e29e671
 AUX 2.1.5-r2-dracut-non-root.patch 1823 BLAKE2B b6954c1648742cb19b1cea5709bdba78477731232bfd6a180f2b2aa179ba2e10ac968af6658fc9fd9a7a03127098c7e4401f3ad803e603d4e114d995b370da3d SHA512 33b3244de91f3d51ef2c2eff2ea4515890b7fa9b39a077b4034f770772077e75e6c5db187c76aa19dd2fb60dac91de35d70fbd84be3704bb950bbf8d4656c29a
 AUX 2.1.6-fgrep.patch 2183 BLAKE2B b8c9b58cc6d94e9ddeacbe3c5eca9d040f1c6fba84b814c8c553d5c1e15334765d3190286a4ad2298762bc54f66a8b89ef69d115cfbd5a25d928170a1d46a770 SHA512 f65e7ffa8cfd00da7ad6d1fcbf5d61172c52e55ea2630f719b49750692c1c046e8baed0e04cadc841adbd804cf861ec712b0d07dbbcae7c1c3b475326045ae8c
 AUX 2.1.7-dracut-include-systemd-overrides.patch 1749 BLAKE2B e88570b8f29d882f43a114837f94572a91fc317008ebb02f9d5df9e5a8ba21b5b18a2f48099e7bb1e42c40a9b25af991070b77c11a07d0c194e31dcdf003e9c4 SHA512 0df9068d59cddfa5c7dafb2fcb0f25c700ef48a4e461c07ed6edca57c5d26443d3904bb61131a7b731fd88f2d85eb091c9397daf3198addcc16e478acf4f85dc
+AUX 2.1.7-ppc64-ieee128-compat.patch 6889 BLAKE2B 9214915ed5b1d149927d46f749903fbb9b4d243d993041b8c6db039dcb7a3968a315f211e010ef9373b721336d45daef264d951e7ea1e0aed01818ebccae9d02 SHA512 4e3edbe396d0c1fdb7b286417b2bf7fe114b392e09158b3f5d3e3d1c4844bf0d59263309883363175dacd63194fd0d6a120ace35c83989d0546dae825bbb91bd
 AUX 2.1.7-systemd-zed-restart-always.patch 919 BLAKE2B db72605abfeac766c297fdb617b4dc5e89de949770d407cd206da8e46b6abab6c64b35967bc94c5b35df819dbace12b5e425cb38fc93b4daddef32fceec395b3 SHA512 9070ee16494362e3b7aa8dfe5b47661efbb5cf65ea32e625bd3a7aa5cc0634fb3751e2e9859b7380e0975bbde3294fb2b718444f60309f7cb8c10afabcce3483
 DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46 SHA512 75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3 SHA512 a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 EBUILD zfs-2.1.6.ebuild 9268 BLAKE2B 34c2071a754fccc4bb6f5e3fbf4b08c232c439dc0185f46adb8ffbdd202a749db4a5432cc8d0ee0e8d25866b594bd2c56f50911886d406cf7fd9a27e511aa6dd SHA512 46d39812ac6b53f7b18592c969bcea0a484f2a81cdcaab165be980c65669c9fae04db6b3c5e7fd341ee6dedd61a789e1faebf31d146bfb6e11e25f9426a845e1
-EBUILD zfs-2.1.7-r1.ebuild 9403 BLAKE2B a28e60b915ba7b1573b56cf8d3fe7350d20c2888c051e6372c96889e73775ec86bc4f2f2fd2a757619099a1e47c57089fb04a598ca40d23ce32a08a4be7f8921 SHA512 a03f38c35ceae601c6ea1347d6ea38b0c0436369112aab81224c270660800a3a110f16f5758d09a364d64714a1b0365cd92b414bb97109063406afc8524bbec0
+EBUILD zfs-2.1.7-r1.ebuild 9498 BLAKE2B 04f215c957ce197dc203446757c4cc29f0580dfea04b839a46416b1dda26afccf31f8e53e03c776a03eecacbfb0d4f91073262ed85ec70dfe9620b2224ff5b63 SHA512 e27589d8d3b2f6ec805ee8d8033d3c1c3db7760f75bea8bbed81a8f3c81828513f9ae1ceb73f7569600b8807a5c62e82f98790d1f470cb1f181531aebe45302f
 EBUILD zfs-2.1.7.ebuild 9271 BLAKE2B aa605c85b5f99bf557fbbdaaf3c0326d17ba27dae43b9c244afa24a86d95a23e67ac59e0a378c40cb642a2bab76fd0b7cae29c50d3d8c715fa840b55f1d164d6 SHA512 0d99aacb7b4a4acbcc29a93667ddece0c06d1373d084530df11d126bce6f3c992a93d523ce1b142ae9574c392523aeb26fe51acdc505985ac187ffaa4c3db5c2
 EBUILD zfs-9999.ebuild 8930 BLAKE2B e6afef604bc8797943eb9c8c01c2f5b621acb2ff682a58eb19773bb66b5f10941321203ed3368dbaa6941396c566da7de4df30368df0042a9b68f72b0136d72c SHA512 8696b3b6d389b39b8d6273daad62e3f2d46abf25872e4e050d3f7c5155cb4f790f0f55ff6b341d0f174e6f46dd3dd5a7d9547844cf3ee5e3b23cd29a2e9a71bf
 MISC metadata.xml 2205 BLAKE2B 82e20a6f5906b8cbbc6eb6e9520cf4e4213ce9cba2b056df5d5db0d4deaa4a20822a88e26286446d105326a8f61c807047a0e1e64494faac48d8ed5708807c02 SHA512 222981f945e98ddef646c593cbc8889f3526af4901c28ab5775ba760ca7d3aff3129b2699e8b7337b59fd33cbba388915cb5b2dc09674432c606f41ff27dbd9b
diff --git a/sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch b/sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch
new file mode 100644
index 000000000000..5613cb8ca9d1
--- /dev/null
+++ b/sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch
@@ -0,0 +1,217 @@
+From 8324d738fdb3096bd97336476bb399e6c312289a Mon Sep 17 00:00:00 2001
+From: Richard Yao <richard.yao@alumni.stonybrook.edu>
+Date: Thu, 12 Jan 2023 11:06:57 -0500
+Subject: [PATCH] Linux ppc64le ieee128 compat: Do not redefine __asm on
+ external headers
+
+There is an external assembly declaration extension in GNU C that glibc
+uses when building with ieee128 floating point support on ppc64le.
+Marking that as volatile makes no sense, so the build breaks.
+
+It does not make sense to only mark this as volatile on Linux, since if
+do not want the compiler reordering things on Linux, we do not want the
+compiler reordering things on any other platform, so we stop treating
+Linux specially and just manually inline the CPP macro so that we can
+eliminate it. This should fix the build on ppc64le.
+
+Closes openzfs/zfs#14308
+Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
+---
+ .../vdev_raidz_math_powerpc_altivec_common.h  | 44 +++++++++----------
+ 1 file changed, 20 insertions(+), 24 deletions(-)
+
+diff --git a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
+index 46d42c5e241..f76eb47a9c6 100644
+--- a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
++++ b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
+@@ -26,10 +26,6 @@
+ #include <sys/types.h>
+ #include <sys/simd.h>
+ 
+-#ifdef __linux__
+-#define	__asm __asm__ __volatile__
+-#endif
+-
+ #define	_REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N
+ #define	REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1)
+ 
+@@ -142,7 +138,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx 21,0,%[SRC0]\n"				\
+ 		"lvx 20,0,%[SRC1]\n"				\
+ 		"lvx 19,0,%[SRC2]\n"				\
+@@ -172,7 +168,7 @@ typedef struct v {
+ 		:	"v18", "v19", "v20", "v21");		\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx 21,0,%[SRC0]\n"				\
+ 		"lvx 20,0,%[SRC1]\n"				\
+ 		"lvx 19,0,%[SRC2]\n"				\
+@@ -189,7 +185,7 @@ typedef struct v {
+ 		:	"v18", "v19", "v20", "v21");		\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx 21,0,%[SRC0]\n"				\
+ 		"lvx 20,0,%[SRC1]\n"				\
+ 		"vxor " VR0(r) "," VR0(r) ",21\n"		\
+@@ -208,7 +204,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR4(r) "," VR4(r) "," VR0(r) "\n"	\
+ 		"vxor " VR5(r) "," VR5(r) "," VR1(r) "\n"	\
+ 		"vxor " VR6(r) "," VR6(r) "," VR2(r) "\n"	\
+@@ -217,7 +213,7 @@ typedef struct v {
+ 		:	RVR0(r), RVR1(r), RVR2(r), RVR3(r));	\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR2(r) "," VR2(r) "," VR0(r) "\n"	\
+ 		"vxor " VR3(r) "," VR3(r) "," VR1(r) "\n"	\
+ 		:	UVR2(r), UVR3(r)			\
+@@ -232,7 +228,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		"vxor " VR2(r) "," VR2(r) "," VR2(r) "\n"	\
+@@ -245,7 +241,7 @@ typedef struct v {
+ 			WVR4(r), WVR5(r), WVR6(r), WVR7(r));	\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		"vxor " VR2(r) "," VR2(r) "," VR2(r) "\n"	\
+@@ -253,7 +249,7 @@ typedef struct v {
+ 		:	WVR0(r), WVR1(r), WVR2(r), WVR3(r));	\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		:	WVR0(r), WVR1(r));			\
+@@ -267,7 +263,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vor " VR4(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vor " VR5(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		"vor " VR6(r) "," VR2(r) "," VR2(r) "\n"	\
+@@ -276,7 +272,7 @@ typedef struct v {
+ 		:	RVR0(r), RVR1(r), RVR2(r), RVR3(r));	\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vor " VR2(r) "," VR0(r) "," VR0(r) "\n"	\
+ 		"vor " VR3(r) "," VR1(r) "," VR1(r) "\n"	\
+ 		:	WVR2(r), WVR3(r)			\
+@@ -291,7 +287,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
+ 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
+ 		"lvx " VR2(r) " ,0,%[SRC2]\n"			\
+@@ -312,7 +308,7 @@ typedef struct v {
+ 		[SRC7] "r" ((OFFSET(src, 112))));		\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
+ 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
+ 		"lvx " VR2(r) " ,0,%[SRC2]\n"			\
+@@ -324,7 +320,7 @@ typedef struct v {
+ 		[SRC3] "r" ((OFFSET(src, 48))));		\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
+ 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
+ 		:	WVR0(r), WVR1(r)			\
+@@ -340,7 +336,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 8:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
+ 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
+ 		"stvx " VR2(r) " ,0,%[DST2]\n"			\
+@@ -362,7 +358,7 @@ typedef struct v {
+ 		:	"memory");				\
+ 		break;						\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
+ 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
+ 		"stvx " VR2(r) " ,0,%[DST2]\n"			\
+@@ -375,7 +371,7 @@ typedef struct v {
+ 		: "memory");					\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
+ 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
+ 		: :	[DST0] "r" ((OFFSET(dst, 0))),		\
+@@ -400,7 +396,7 @@ typedef struct v {
+ 
+ #define	MUL2_SETUP()						\
+ {								\
+-	__asm(							\
++	__asm__ __volatile__(					\
+ 		"vspltisb " VR(16) ",14\n"			\
+ 		"vspltisb " VR(17) ",15\n"			\
+ 		"vaddubm " VR(16) "," VR(17) "," VR(16) "\n"	\
+@@ -412,7 +408,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 4:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vcmpgtsb 19," VR(17) "," VR0(r) "\n"		\
+ 		"vcmpgtsb 18," VR(17) "," VR1(r) "\n"		\
+ 		"vcmpgtsb 21," VR(17) "," VR2(r) "\n"		\
+@@ -434,7 +430,7 @@ typedef struct v {
+ 		:	"v18", "v19", "v20", "v21");		\
+ 		break;						\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		"vcmpgtsb 19," VR(17) "," VR0(r) "\n"		\
+ 		"vcmpgtsb 18," VR(17) "," VR1(r) "\n"		\
+ 		"vand 19,19," VR(16) "\n"			\
+@@ -478,7 +474,7 @@ typedef struct v {
+ {								\
+ 	switch (REG_CNT(r)) {					\
+ 	case 2:							\
+-		__asm(						\
++		__asm__ __volatile__(				\
+ 		/* lts for upper part */			\
+ 		"vspltisb 15,15\n"				\
+ 		"lvx 10,0,%[lt0]\n"				\
diff --git a/sys-fs/zfs/zfs-2.1.7-r1.ebuild b/sys-fs/zfs/zfs-2.1.7-r1.ebuild
index 219f1c6e1d88..c17785b32c14 100644
--- a/sys-fs/zfs/zfs-2.1.7-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.1.7-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
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/${P%_rc?}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+		KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~sparc"
 	fi
 fi
 
@@ -113,6 +113,9 @@ PATCHES=(
 	# systemd fixups
 	"${FILESDIR}"/2.1.7-dracut-include-systemd-overrides.patch
 	"${FILESDIR}"/2.1.7-systemd-zed-restart-always.patch
+
+	# https://github.com/openzfs/zfs/issues/14308
+	"${FILESDIR}"/2.1.7-ppc64-ieee128-compat.patch
 )
 
 pkg_pretend() {
author	V3n3RiX <venerix@koprulu.sector>	2023-01-13 05:48:01 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-13 05:48:01 +0000
commit	4bc834b03b9438dcfd45780f31a02994c24608ba (patch)
tree	1ee84a24bd250533fbdadfa949f438db20ba98aa
parent	175512fa7c74d0e48a7a1b40a6e456435af0481b (diff)