gentoo auto-resync : 07:02:2023 - 21:26:27

269 files changed, 750 insertions, 4039 deletions

diff --git a/Manifest b/Manifest
index 6f69b3c393c8..15876f8bba3f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29424 BLAKE2B a919e74b4ec3f971cd128ebece524a8cc5c89afc9dcf7f4ba8e41d2a795b02e6573274b2e7c1ff9b86403f91aefb683f2dc5bec72c99b0e707cad21a691292fa SHA512 77518f4e057fa46452c0168ceab28ea33a97d954bd3da650beed0992bfa4de676fb7ab9b061c39780ea080e8aeab9021121a05965b5cc82ca93158fe9808aab7
-TIMESTAMP 2023-02-07T14:43:25Z
+MANIFEST Manifest.files.gz 29420 BLAKE2B 54d57557209eddd2dd84dfb59cd70b820cb0da487470117c9494d175540fdfc106b55c129f6f62b24f24f4bd8febf8df81b7242ee75940357c7c010cb79d2a65 SHA512 4a4e52f9293d59ac91a76203c05ddee9b1d3e983ef6a6b09998b926bf00ae453ed4c79f5b1235e3c24ecfbf9cdcf56e7d092e4ce73cf1d2077b405ee35ed724a
+TIMESTAMP 2023-02-07T20:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPiY41fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPitxBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBfQw//VN1krmkN3rpUlkWEI/jw+z4cLlKYiLJy5R5v7CN/29bRrV0XhunwL9Me
-6cuu3Y1gnF7WU8NuSS9iIsdkVYUGsAvQ/86oUolj/qJ3aovEkHpbjqh9Y2+1eHJ+
-ZzZRHsoWA/sztqZ6fvnZyWOltF4r+SD9k84ZKFY3QagxKeLnIewE+G7MTIkRGUXL
-liRp2jn/nHkWWH2bohlSUqp99Z0HtHQ4wIc3c9hK7h3+Fe4TD22p216Q6Jx7Hs2z
-t6VY+0eZVfl2zoDNnQXWyEb10GOo4Dr2NCi/3WnKX54RtRD+/if/JMTobSdxvnok
-RO09KcwxBumrCJvlTHwDmY2lSvXajNcpl8W3ihdccZmnUHTD2ljyGcuzq0H6Dj+b
-4vnAjVamwl0U4gnEiDflX/btef47y/G83jPKSiILGjEfeIQQpn2LBS4S3i6coyjG
-CSTSyplCotBtFqDt9jJSQKQ5iykqQg23zanpgl9eVchzqS6yzjwj3shP7cYUHBsx
-OnRlUUwkhSF+bzjnoMTdW5D2PYHCxNjbse59gEgAXgIas6lNvB+DH3EIdvqZawTW
-fmpQGSxgdRb+mTRvSU/P87qDlPHsuRSwkpa5Z1rojpLiMWi6LG/SFAE/Zki9YHFP
-SUIgA3diqbH6Fik14l2T5VRjA1dA7/bfEy8Rbj1U92yp1qRf7y0=
-=rlK3
+klARKA/8DBDA9s93B9aBJp8V+Ajvbs9cvvh8cNeYolRO6vrpxSYRnix17Iom9C4p
+MXtiu+omFugAn1gEB6iJBQiUnjTWZkCYN9CuGiuy6BqRBaH+doL9ukKTHRkQqrVa
+YPAox3RvSW6AxFpPK/GUmnW3Wo6XK35LCyeBeTASWpXtNOURqc73OrllMCWL/bFv
+QovhMn+Wr1Yvr00FN9sItxOOpLLyRMrdCHj/Ujo+Ab8qwaeWOYpOxtcL/avOxubV
+OB/SMYmleHmrjciYyOxpn3yuq/sHsmntaVye8cBgTtFT2KYjhmnzNC+mltGn7QJK
+5KRdHTTsancFbdH1eHvKd82bectg1T4D3whyqzA4KFLACeX08aqIX3D4GCf04ab9
+SdbGLOM9wwZUt/GQNw7+KK4ZzAuRatNPMhgRMHShNDc0mq8ZHTFseTvf7vMh75vQ
+GWOmvB/YlOwnInq+2OpaECUc5W8YAiPqXz1gggUNEKFWuYn5NHosCfQm3XFdAZ2b
+8HHqrCuIXQDrGFAgUdBeViWpFUqhTxIxAc6Cxq+Q2ytkp9cEjtyaC7f6LpJMy8Tp
+MHIchtJorFdi7QxhB13sfJlOv8YGFPhvZNnElRIXpewqrXplcUcnxyk7UMFI4IQL
+ev5ePI/RxBiz8q8JRYB3pDqtplfXEpkr35wWSYBB+/gYjKrtkzk=
+=3i52
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7cfd90d9299d..b722f0c3f6c3 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b944aa11723d..f85da858ff4c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index a238fe4d1432..ae46b547de9f 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -4,6 +4,6 @@ DIST yubikey_manager-5.0.0.tar.gz.sig 310 BLAKE2B 9f561511320dca89c2d757e079ad7b
 DIST yubikey_manager-5.0.1.tar.gz 158829 BLAKE2B 082b7405a6b8049c0086126c8287ab66f5028b121da4aeae81939683ed65cef1a7c59bf545b5e768b18643bd6c0ee759b2897673870344d8f7ab5217413c1a0d SHA512 2e798f8475e52c9091f5cd6ebbd5937eb3f14c49e9c2c9c7eda09c095ac3a1c80065e14f8e9c827c1eee8914ce3c3e21dbb2820a6ac8cefed1306d409cc6a0fc
 DIST yubikey_manager-5.0.1.tar.gz.sig 310 BLAKE2B c12b2c6f09be26a3df394cc296fbe28db560f31864a5b46d18021d672947c0d929b56be5cd10fd0347e4bcdeb988a242780b58565eb64163b125752756e5dda1 SHA512 876c47c2b22efd58f801f3bf7110c1896f425090d2454db4eb8214442b5a909b75f6fcf8e581c97806e488bfc6fb306e92274ce1b29be9e3240813944155478f
 EBUILD yubikey-manager-4.0.8.ebuild 1095 BLAKE2B 0b6862be15f6c8cd24b76a5318c7b3cf741b205faaf48266c82e56d8c85d1a56c4a80390502d371cf57fe952ddccca55a7aa255d45678463657ccd1db1db5384 SHA512 4581fa2362c4be50b10ff50345d488d8c9a75bc47b5139e85217ccc49631e629ca5a72d59ad3ef5d7ff31bd437306fcbaca215c8ede657d5481c697feee66d78
-EBUILD yubikey-manager-5.0.0.ebuild 1652 BLAKE2B 501bdc5db68b0d3ed4b5775fb4e6e7a1c9217fc96ad128c7aab2c7bd60f89ec9f296b8b97ebbd3aa25329392c6a5333ecc7503e334584b5902d6006f753ff97c SHA512 92d8cc3133a2383684c43d6dae9d5c6d5677974fa5177a29b30b2c489eec987b1b1be7af7d32b0efb07f5d077ec97ad87512b341ce7d4319834c69a9112cfaa2
+EBUILD yubikey-manager-5.0.0.ebuild 1650 BLAKE2B 3c2057f0864a5333762264caf171df5e449f0ac9b38761fab4a8f9ce81e248b855947648df14c9c01b73ea046f73d01d97c69b57f9e111cebcee698af153b79e SHA512 1ed2351a35420a7be3c659bbf4ce99aa3db7108468032ed742e8a88efff39ae157337e1ff02cb35672a930839e17362c722e767078b2acb4b729cc501884d3d2
 EBUILD yubikey-manager-5.0.1.ebuild 1652 BLAKE2B b2017d05188a3ba7819122857b04938f212433e4bd26796f157dafe3dcca0afaa18a247db0c4e081029c2199622101721a4e5314b22c9b097caa002ec97aef28 SHA512 ee9d0bae6493669be98da4c8d6ff1775da00f8f41ca35edc947f6d8c80433556e8c62b4d4d68963c07ab55f0e89bcb2974f100f95e200d165e628074b8e8391b
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.0.0.ebuild
index fa79ff3a82c2..34d4eb05c3cf 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-5.0.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-5.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="ssl"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/yubico.com.asc"
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 83a3152132e0..111fae202cf9 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index fefd1703aac6..057f245f1458 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,7 +1,5 @@
 AUX texmaker-5.0-unbundle-hunspell-singleapp.patch 1886 BLAKE2B 62c66e1e2868f40b243caecaf3f61a283355427a96aa51934e5302e42cb8ee1d816ad080e13b7bb281d1402e032fbb7eac34fd83a7e876856a6d87ad64adc2a0 SHA512 cb944695a1661b067aef0e45dc6dac8cf7d6f589c7f69be49cf7bad2c51899e0cf3f4ed0881899c8185af10f5e36523a6be0a335f6b7668240fb0ec9ae4ca404
 AUX texmakerx_my.pri 128 BLAKE2B 2821eff5f67ac93334518b84b7e1a9b8157de8be13b3d6e801f57ce9937e5586ddbc34fc5ace9706419b79472d660860c36c35a7ae216cea8ff59d54f8b8e8a8 SHA512 ce03623e219b43eca4bcd07b78566d55af78f41483a2659479a9118ffd1a987b77e38c32fa3a9ff2b35556191b708f198668956181e01272f2bc39a828f9277e
-DIST texmaker-5.0.3.tar.bz2 15783226 BLAKE2B e023b79a49629f70da234c2194230891da755ce18d0a81405f25d08825f13259f84cb5e7960ec3c2d182179e1695ba6f5b7145a2bd03e0cd0b95723ea88cd456 SHA512 fed09b1ac628f4a8cab24257f2ca35093f20a82d1a3b8c38d12878ff94f0933b7449e5ba651831612b62417426396327ea8ba64e830fe0537757abe65bcd5284
 DIST texmaker-5.0.4.tar.bz2 15812468 BLAKE2B ad252827c7db90ad20de5ca59958124714b7abe660998ef21b983a7888831aaa12fedc018a764ad8898780b18ca97b44145afe548817a867f74b407f0a2c9399 SHA512 34ff5773358c2fffbc9e7e61028cd74eef231152e3483531b66cb0d907dd8f70a4e8b6d6ea09b0b11387b592f6d1676ba8a1e737b26c86a45b16882e53edff1f
-EBUILD texmaker-5.0.3.ebuild 1702 BLAKE2B 8c466b9622d87fff0108b6190c2897e11244596f42e5b697870beba0ab91d40d51609f01f04be227648b3c4e0d35d232692495fbdbcc5434fd46d48d18e77f42 SHA512 046405bd24597bed2c1b8c4bed1800e2d16858a8caed0dafba888dcf10adc214421527527e9c20d5934be9e0dfefe96c90ae43c761374f7bbc439174fa1aec8f
 EBUILD texmaker-5.0.4.ebuild 1702 BLAKE2B 8c466b9622d87fff0108b6190c2897e11244596f42e5b697870beba0ab91d40d51609f01f04be227648b3c4e0d35d232692495fbdbcc5434fd46d48d18e77f42 SHA512 046405bd24597bed2c1b8c4bed1800e2d16858a8caed0dafba888dcf10adc214421527527e9c20d5934be9e0dfefe96c90ae43c761374f7bbc439174fa1aec8f
 MISC metadata.xml 256 BLAKE2B 996b2fc907c7c3fb48906fd417b3be2c087580c651e473c5260db5eb04f8b7e50516b761fe4b2f62205702948ef3fe1fb49e1fed4aae2adce25b13c322d11eda SHA512 abc5e4223fb75e11ffe02e32b37e4cdee62f27413641a9279f22382882a06f62eca81798f1f7cdba7e09d439c0cdd0ab816ca1dbd5fab3b561d3f05cde74b6c7
diff --git a/app-office/texmaker/texmaker-5.0.3.ebuild b/app-office/texmaker/texmaker-5.0.3.ebuild
deleted file mode 100644
index d9bad6e2567c..000000000000
--- a/app-office/texmaker/texmaker-5.0.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="https://xm1math.net/texmaker/"
-SRC_URI="https://xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	app-text/hunspell:=
-	app-text/poppler[qt5]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtlockedfile
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-	app-text/psutils
-	media-libs/netpbm
-	virtual/latex-base
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0-unbundle-hunspell-singleapp.patch"
-)
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	find singleapp hunspell -delete || die
-
-	cat >> ${PN}.pro <<- EOF
-	exists(texmakerx_my.pri):include(texmakerx_my.pri)
-	EOF
-
-	cp "${FILESDIR}"/texmakerx_my.pri . || die
-
-	sed \
-		-e '/^#include/s:hunspell/::g' \
-		-e '/^#include/s:singleapp/::g' \
-		-i *.cpp *.h || die
-
-	DOC_CONTENTS="A user manual with many screenshots is available at:
-	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
-
-src_configure() {
-	local myeqmakeargs=(
-		${PN}.pro
-		PREFIX="${EPREFIX}/usr"
-		DESKTOPDIR="${EPREFIX}/usr/share/applications"
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-	)
-	eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	readme.gentoo_create_doc
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ecb49dc281fa..ce5b2d727e91 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 3bfa21328f45..12e56d30185c 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,3 @@
-DIST sigil-1.9.10.tar.gz 25263060 BLAKE2B ef8d6b5552689f0501971563b429efa050456826ee85dbf524ecb1c1931506de95909e3443bc259353c012b3e4a2b6ce3299f20af8e65d07324818a8f208c2a8 SHA512 e328d8e207cff1dc007391c246792c3d53f7b9f078dd87a61088a61a5a192ed85802057b0f2d61b14bcac6094bb1ac2ff74a5096b54d9b82f0c6b2bef7eceb1a
 DIST sigil-1.9.20.tar.gz 25139664 BLAKE2B ca0a8ba5ec9b76ea4016766872e7a70d839c2b3f24a658e90e619fd2feb01de74e05e30cdcf53c79ce92196c380da1d348ec2776f77060b18d2c664ff8171c6a SHA512 07aff142f65084b7900b25b089fca1d9a36022e690acaf0db3c7b2eb310a847834baff42884e73bbe6b31ff2dd7f73e76819c5c7a4292578fbea2edcebec5ad1
-EBUILD sigil-1.9.10.ebuild 1902 BLAKE2B 850c226eab6f19c93def670805eba832323731c7f5d0554c3ab60477d82b922752965d28beb6a93d860c512d3cbd07f22b73235aec6f613e9127d6f136aca859 SHA512 9bc552800e44ea026c5679959f5a4f39ce411052ca66b4f4118a46895a8bdb4f63d3327ff7ec82b517a8e6fd1cc1aac85fc8995c09c3f2048be1529e62d4b79a
 EBUILD sigil-1.9.20.ebuild 1902 BLAKE2B 850c226eab6f19c93def670805eba832323731c7f5d0554c3ab60477d82b922752965d28beb6a93d860c512d3cbd07f22b73235aec6f613e9127d6f136aca859 SHA512 9bc552800e44ea026c5679959f5a4f39ce411052ca66b4f4118a46895a8bdb4f63d3327ff7ec82b517a8e6fd1cc1aac85fc8995c09c3f2048be1529e62d4b79a
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-1.9.10.ebuild b/app-text/sigil/sigil-1.9.10.ebuild
deleted file mode 100644
index 8bbe018eb356..000000000000
--- a/app-text/sigil/sigil-1.9.10.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="tk"
-
-inherit xdg cmake python-single-r1
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/libpcre2:=[pcre16]
-	$(python_gen_cond_dep '
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]')
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/dulwich[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DTRY_NEWER_FINDPYTHON3=1
-		-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-		-DPython3_LIBRARY="$(python_get_library_path)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		-DINSTALL_BUNDLED_DICTS=0
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DUSE_SYSTEM_LIBS=1
-		-DUSE_QT6=0
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3cf7b4457b66..a78e19a8bf26 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index cd726983bbb1..8d0260c9ea2f 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -12,6 +12,5 @@ DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4f
 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb
 EBUILD abseil-cpp-20200923.3.ebuild 2020 BLAKE2B 20fb7a39dae86e38fd0b5c880fd6538228d86e43b712c483f5a7d84001359250210515dd087a6dfbac7d3e30304c99946db0ac2c39a0cfe06ebc4eeb9cdbb51a SHA512 9a882710be7af653e842f17e6f29767be7cc478e9511c74a9fdda7e36503de9a33036c96812382bf1a1bd0f8ce3b8a3fd27b9d576a1ea94c2caaf6d82ab5507e
 EBUILD abseil-cpp-20211102.0-r2.ebuild 1843 BLAKE2B 5c903bb664efc37c0177bf909f4543fa0ac4eb2f307137408391772aa7e518f67910140aaf74f2e1daa74fa0756692f4261297ca21ffcc4bbbbc6176cdf98863 SHA512 a3685940cbeada6195b52eb22d715752061d08c9eba52e8ae19f09f698c2dfe64ee5d17e03fb56e47fb88460e3e58682d4fb4fb65cdb7b8b5e236185b6eb87ca
-EBUILD abseil-cpp-20211102.0.ebuild 1603 BLAKE2B 2a763ff94f505397b81ecc982d467b14108f2ad5a7b2b9737b6b9a11576618b04d2f098006c38fd943ae50c11ed77dd7eeab21dd5cef81d6ce921c33b8985835 SHA512 b719d3333fdc9e72cff8309370e4aba794279951d01583f82b62b87805cd3a3a1e01d1ae12fc07203f693a36dcc3659135d292f2ca548f90624ad43ccf02cbe1
 EBUILD abseil-cpp-20220623.1.ebuild 1693 BLAKE2B ea429df2acd8275402b7f2da010d17e6d5cd2894ab60f8debaba193c6dedfa8c297b7f6fede7587d68983525901ce19c3b6c2a90a34368d2480b18186aabc384 SHA512 6f6eb55ac69a254f40358458a9eebcfb1dd16dca3dde39d8fb12d894df9587ca3145542910cdbfa8d61616318ae9ef5cb4ee7f54eeb54068c392bf5d6b556a78
 MISC metadata.xml 439 BLAKE2B c4a87701635b1b903c2461acca126d15edb4f15cbb8dd9f353bcc71730c85478fd815e1f9c1f6ff8082360777a6e11042a01e417167c192b41f72b67e193d41f SHA512 16489f072408026da8f5da445185233f54a7c29761fa835a8388099acb8a6e3685e7db108fc4a3daa3430bcf6cb61d2e5d03c2e0e25d0f42f6da23e5dbcd134e
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
deleted file mode 100644
index b313358d9c30..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1
-
-# yes, it needs SOURCE, not just installed one
-# and no, 1.11.0 is not enough
-GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
-GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz"
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
-
-LICENSE="
-	Apache-2.0
-	test? ( BSD )
-"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( sys-libs/timezone-data )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# un-hardcode abseil compiler flags
-	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
-		absl/copts/copts.py || die
-
-	# now generate cmake files
-	python_fix_shebang absl/copts/generate_copts.py
-	absl/copts/generate_copts.py || die
-
-	if use test; then
-		sed -i 's/-Werror//g' \
-			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
-		-DCMAKE_CXX_STANDARD=17
-		-DABSL_PROPAGATE_CXX_STD=TRUE
-		$(usex test -DBUILD_TESTING=ON '') #intentional usex
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index 3244f859acef..e6a7be7acad3 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -5,6 +5,6 @@ DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34
 DIST antlr-cpp-4.11.1.zip 534105 BLAKE2B acf854bb8f10f8afdb8df9aa1fa92176edc66bfe3e33ca4b57e138e29f7d8512dc0a31aee057e5997ca9e37ca7934c459ef725e831d34166c189a2ed7e6fbc51 SHA512 47a4f714cf195e454b4f66cace58f6dbaa144f44c25594735fc91b37289e9b3c8b5259c03925316754d3eb33af3e0b3d3fb0c5c9aef818b239799e4f1fb49ce6
 DIST antlr-cpp-4.7.2.zip 1494927 BLAKE2B 007aac6655dc3c4e3a0c2073ca9c8c016b46bdf97dca4494d4ea2c44d27a458bfbb09811b3beb0aec1ce2873c3b62ad6789c6a9e3e7ddc62cde51c8357e9123b SHA512 3298b83a06ddd8d8852462401e46fe2eb83d20af4ba14c722cb31b33d929d1c5a4ffb694ee084495a4ae26ed3246b6781ca6045d11253c94efc09729fa001090
 EBUILD antlr-cpp-2.7.7-r2.ebuild 1875 BLAKE2B 68b0add6d2f97edb9f678307e71227f5c6543e61d76f4a50e9bb424039c909a7654c6b25a8b81c1c89c061f5bedce76c19f0a84997127ac2486e612f85c76edf SHA512 16793b8dd3c3bfbdfb928bf286a6c665823cae7c47c6e32ea41a6646b8dbe779747caaaa2acd072e696790ff201a9e380e156d4d33768d895fac923ec36d399d
-EBUILD antlr-cpp-4.11.1.ebuild 618 BLAKE2B 536bb15edb26058806fde422c18b0092b957f22c376138c54c05edd9f3fafb675f1262e2e40351b4f33380e4494784115a7f6960eec42c78b8563d2924fbc84a SHA512 ebf8e551f3f685eaa62a279c4dfc88ef946591a12f74e4d34315e450a2299a45be15339e3baaafb220229a915b380346f84a287daac978dcf7e21d762f78bcd7
-EBUILD antlr-cpp-4.7.2.ebuild 636 BLAKE2B 871b5616e3c8286e79e43448e99dc795e82e6e88717bc9f457b993093e930f173227485836132738d45963bc83fdb776375ce1221b82c4164cdd4bfa5714efb9 SHA512 73c8d0dbf898eb7086b290f86c82055b203cc6f5d3bbf389fb4c4921d3527ecb7acbe71908217405d75deeec65611e9b941b423349c0661734456342420ce826
+EBUILD antlr-cpp-4.11.1.ebuild 615 BLAKE2B a24dfe94309dc05239e35484ed30fe65a729d9151b29c29dbf78bd4874d41d389479e4a1d93702f8d7eb7c8d3301bdf7068507de97dc38eb2f04505ccd5a6ec9 SHA512 38e36d6993e165a77b284a9b09d507711467c6d72fc559643053ad5fb5c0d12e59358bb1edbcc014ba0ebfe418b7d606ef7cd47e48571a4ba020f2107af1061a
+EBUILD antlr-cpp-4.7.2.ebuild 636 BLAKE2B 6619b1f2bd1d9c80d1a61c941ecc064ffe04d135f92f10e73168ec01c14d2808e241041dadc6de68998f7c888c051f2eb8845465ed0d24cf908013cabadb8671 SHA512 2a3d30ff3f97fd8f2e2895476c59fe536f80f693b77a570bfff84da34f9a74780d6589f74750d413df6c854b00f360f65c4c46be04a74396b20bdf9e813e045e
 MISC metadata.xml 314 BLAKE2B 44614e69318b15302910048bed9f1a4acd92a1eb737e1861563d855aeec4e6f8f1a201f0bcbc039420a820e17f15d7deef68fb54b104d0c621def437c0457da3 SHA512 d03626431b434fe0b4fbbaaf7c860fd55390a1511c1f93f95747cc6a058795f166b73846b038bba3e843b6afdde2655ac3b7776a33276230efbaaa6d7b469d84
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.11.1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.11.1.ebuild
index f184f2fc1c2c..242d1a1613f1 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.11.1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.11.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
index 674acf4c9f29..52506025d51d 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 73409a5e9b90..ac6158933ac3 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index a04719fcdf47..8c13ddef4521 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -5,5 +5,5 @@ DIST pgrouting-3.2.1.tar.gz 5940439 BLAKE2B 01f4ec19d4cee9165a5aca946935cf4786a4
 EBUILD pgrouting-3.1.1.ebuild 1084 BLAKE2B 92383977229671f04aec4e327eb4c28fbf666af880bc4802520a13d2b999404defaf1d04fd0aca694b135ffea31d256ede5ffd957357d63aaecf17290c1a633d SHA512 1ae8d7815390459a1ecb555ad6be1a9420ad63fdd3402d34b0be9ee6e44eeb4b40f393f270c72fb6e1ccb64ad8d71566d996948f70fdb6d34720053b41e59996
 EBUILD pgrouting-3.1.2.ebuild 1050 BLAKE2B 6ede8aa0bae0531871ec90516e933fa254d682ef42350b1c2ebae0f06c52d3463701bb0d5db20f32d21fdf655e74678187bf509a546ca800ed95fdbbda180811 SHA512 7d215dddf2ae2ef04f55961d9efa9385c908e986db250717b1d21baf516cf49513f8898d8522b3f729a50b2cad21a0f1135f05ba96a681202712182a9b6988fd
 EBUILD pgrouting-3.1.3.ebuild 1050 BLAKE2B 6ebcd194d005e86d945055cb24ce19a4b2d07d147ea901d5b5c229fb15fe2231651ed8fd326eebca75574f14d5b7a082eaf52d0573ca16302b5c2e11fe8e37a9 SHA512 d6da55f43c56c2311a9ca2db52c8704d7024fdee023870f52188a98e260cc5db7dc26cef8fd1fd74594b13fd13c99f47d352f7c4ce5745b1de29158b2855cb84
-EBUILD pgrouting-3.2.1.ebuild 1050 BLAKE2B 4ce80f5455559dc2b4f294e223a9392d70bd407575b3bbe4ca0e60ce390dbc1c90ff6b86673537ac155ebd491711d911d2289cebf6b67281fe396b80d873e89a SHA512 30f61740c1252ce34c424210048bf0482fbacd681cd22c05cff7db6d926bf4e13dacac198a8cb10aad9e13b92ad78d68143649a40411600d1f5738cdd042070a
+EBUILD pgrouting-3.2.1.ebuild 1048 BLAKE2B 747b291c7d84f2e21f22314f39ee2d6ba0a4e11ca2024e80319720949ba817558f6a612b445bda311758d262497a7fdea4a245ca8270595533f6ddb5a2a01bc7 SHA512 66e52ebbb4a33512ba23a43cfe1dfb52cb8efa62a6ef21edc14ab604fc4d2cf4cbc419970e97ce3b8841f243a40f09839bb537c72da6f33b41f80dea1d10e31a
 MISC metadata.xml 375 BLAKE2B e6c25b3d8331162daad5c8cf73b35340bb5092e219d0300be1aa2b36f6d73044b7ddb883cf15e633f8837ef12716a779bfc968112cba418dfed9d106a86ce076 SHA512 b01c3c837b862519087f831bf7ab7de2add4a6fee5b8c7e78b551fe6c4bed59d3f30e7871defe16c25271fdafa5e1d8bc6da250ed22bd1f2476e05fcd3a3d7d0
diff --git a/dev-db/pgrouting/pgrouting-3.2.1.ebuild b/dev-db/pgrouting/pgrouting-3.2.1.ebuild
index 8af2d50b21c9..60913caa8328 100644
--- a/dev-db/pgrouting/pgrouting-3.2.1.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e1657cf2389c..2b4b2d5ae230 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 2f2ac92d69e6..d488b00fea2e 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -5,5 +5,5 @@ DIST swipl-9.1.2.tar.gz 11827220 BLAKE2B e4bf40d1b4d0c48af5e630728208ca849b9a3d0
 EBUILD swi-prolog-8.4.1.ebuild 3177 BLAKE2B 2c3984b0a9aff83643922c5d8ad4beaab21a6ddcf6cd4090e23ad4a770d104e6d3f2f75c9d4bf910e720e23eb5e1f73ae999c5dc7012c2b0ddd660171478f9c2 SHA512 488763c483a760a468319742bca8df6135dbb8f754176dfc21b337d051c48f42d7ceddb210bddaaa3a599d5b162a474694bfbb8a68f16d146496d1d087ec9c29
 EBUILD swi-prolog-8.5.11.ebuild 3191 BLAKE2B 4a7e883cb444a54f71acd8fa37bdef88b900c0dcaa948a9429ea1d320cb650c1fa381a0780570f69e96eeb341f20d54ec4715700aa645255c5d140c6dcc798bd SHA512 efb05a84a5876bda9c55970f98b3a0195fa34a495e1c7b16d6058d18c9ac1091e01e975f0fc00d3416b84bcfdc086268e5e3c206fdbcf49e546a921bcbf47785
 EBUILD swi-prolog-8.5.12.ebuild 3249 BLAKE2B a0fee95fa73564d28ca8fdba9293ab89d6abb64c029f9166a181aee4c4adf0afba0bda99cac671b1b61c564f0cb4fac2cc8941010e38384cc63dfdef37fe82da SHA512 df2624efb0fc37a7a445860c62599bbc615eb4b3e90b172b0721985be178e851e0ff81ee0c8dd1adab061a122ab9bdd5408b0d5be13e821ca73e14bc1c5fd847
-EBUILD swi-prolog-9.1.2.ebuild 3908 BLAKE2B a5675a9fc7e275280f914a5a32d88ac05308667a3fa683e19d12ebb0cb7060152a1142416a4851548c0c0b5894341116ec0010e9ec41b85f28eb7d8923b4fe63 SHA512 f2069e7488df16ec00b050f75b230611c6241068351ea32704d293bd989462f9649563e9834d6ce4ec17130fedbedaa84c049703c41335e31039125c6b55a597
+EBUILD swi-prolog-9.1.2.ebuild 3906 BLAKE2B a5516b51984baee69a69d22466a78b1cefd17d872a6928c53b9f5b2b7d2a708bb0cf7d8446b54d80598006df6cd693cd044e3b8d5f09caad96214ed80d1a4038 SHA512 3e70f0d51650b829b7c442c80cbe6a069cf72bc7447cbdece7923ef8e5ae0e38418836dc136bde166f4a6ee6ff89a6490411aaedf5be1d61f9c2978773c3ba6f
 MISC metadata.xml 835 BLAKE2B 74eb565d22c6f7767dcb593fddff34fefff136f81558f674d62ce259d0988b15294c9947fff4b594e800108906a7f024c36c0b52d2ce090e86da0cb88cde163c SHA512 5f337a4020d75a08af811b76661c6e0206be0765f3a3a467947465217676665c5ba8f19d1914435d072e1d12383405801696342259984e2a0e72e80ad5073dd6
diff --git a/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild b/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
index e7f92df2f131..5449898d6a02 100644
--- a/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X archive berkdb +cli debug doc +gmp gui +ipc java minimal odbc pcre pgo qt6 ssl test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 58d54c2ae3f9..c00b86d42453 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 5c1a0a583606..c9f5ec957d89 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,8 +1,5 @@
 AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
-AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
-DIST leatherman-1.12.8.tar.gz 815817 BLAKE2B b0844527a470c0e54983d49abc84a7331a07f3cac76919f56e58a01d60b794e422f3ef8342e046c483a83c428d2c80ff8e8d6b71375f45ddb03a5721e63c7aef SHA512 c6096a7c0e95fb43c6998f26e8f28157f46b78af4eaf2caaa1caae832d2f23aa7591e3a29a17f24bc9b993421645d37d44249fd8cae15a3d18b40d614acd23ad
 DIST leatherman-1.12.9.tar.gz 816107 BLAKE2B 1c2e50767585a30da40fdacde0aa8655cefc2a41cadd24a7689be5da0afcbe8627293d37780442873907996f01401b46340a3d7be5d9b2a65b2f87191daca6c3 SHA512 e69f2b0c04a1cbd20e097abcc020e7b27fb74f168207fcbcffce9fd0edd1760acc75d5c5f645d3a798f106e129ce73e512f0c11699733475b290dfc876de0565
-EBUILD leatherman-1.12.8.ebuild 1265 BLAKE2B fd240363bc78ddc11c796b2939ad4a4e3b9860bf4f75a0e78a8db284b90bd7d0803595758088b251a05a103a2f00e520f7c82708325b8a32bdd66b28f24b0367 SHA512 60a39204ad1f5a934407532f456008265b39299f1c0d29bb373a99fa279457de4f74cc9841c20fe13848918e4add4e8f6612fd42aa2271626a5aa6392b90134b
 EBUILD leatherman-1.12.9.ebuild 1272 BLAKE2B 203a4934e6a2fc4d650e18b9098796b0b3c42127c0bb289b14748d6cdbe308fc4172b053640b4c75b7141a1fcf08b79ca6285be148b5297917dc0a16b42fadc1 SHA512 616ba5f626163adeab958343ddc1d7c11473fe898b6a841d0a6b3a8d878baf084f3fee80d2721c99815e84fb4da3aa6b8fd46e0a2e2a16ae38d6987835816eb7
 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2
diff --git a/dev-libs/leatherman/files/shared_nowide.patch b/dev-libs/leatherman/files/shared_nowide.patch
deleted file mode 100644
index 4f5f67045fb6..000000000000
--- a/dev-libs/leatherman/files/shared_nowide.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt
-index ff9dba6..5d1b9ce 100644
---- a/nowide/CMakeLists.txt
-+++ b/nowide/CMakeLists.txt
-@@ -1,7 +1,5 @@
- find_package(Boost 1.54 REQUIRED)
- 
--add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")
--add_leatherman_headers(../vendor/nowide/include/boost)
- if(WIN32)
-     add_leatherman_library(../vendor/nowide/src/iostream.cpp)
- endif()
---- leatherman-1.10.0/execution/CMakeLists.txt~	2020-06-03 10:30:05.027479897 +0100
-+++ leatherman-1.10.0/execution/CMakeLists.txt	2020-06-03 10:30:18.871483297 +0100
-@@ -1,4 +1,4 @@
--find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
-+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
- 
- add_leatherman_deps("${Boost_LIBRARIES}")
- if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
-@@ -10,7 +10,6 @@
- add_leatherman_includes("${Boost_INCLUDE_DIRS}")
- 
- leatherman_dependency(util)
--leatherman_dependency(nowide)
- leatherman_dependency(locale)
- leatherman_dependency(logging)
- leatherman_dependency(file_util)
---- leatherman-1.10.0/file_util/CMakeLists.txt~	2020-06-03 10:30:05.031479898 +0100
-+++ leatherman-1.10.0/file_util/CMakeLists.txt	2020-06-03 10:31:04.550494516 +0100
-@@ -1,9 +1,8 @@
--find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
-+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
- 
- add_leatherman_deps("${Boost_LIBRARIES}")
- add_leatherman_includes("${Boost_INCLUDE_DIRS}")
- 
--leatherman_dependency(nowide)
- leatherman_dependency(locale)
- leatherman_dependency(logging)
- leatherman_dependency(util)
---- leatherman-1.10.0/logging/CMakeLists.txt~	2020-06-03 10:30:05.035479898 +0100
-+++ leatherman-1.10.0/logging/CMakeLists.txt	2020-06-03 10:30:19.092483352 +0100
-@@ -4,7 +4,6 @@
- add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
- add_leatherman_includes("${Boost_INCLUDE_DIRS}")
- 
--leatherman_dependency(nowide)
- leatherman_dependency(locale)
- 
- if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
---- leatherman-1.10.0/tests/CMakeLists.txt~	2020-06-02 23:24:17.146002133 +0100
-+++ leatherman-1.10.0/tests/CMakeLists.txt	2020-06-02 23:26:17.780054923 +0100
-@@ -1,8 +1,8 @@
--set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
-+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide)
- if (LEATHERMAN_USE_LOCALES)
-     set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
- endif()
--find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
-+find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
- 
- include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS})
- add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS})
---- leatherman-1.10.0/util/CMakeLists.txt~	2020-06-03 10:05:44.277172451 +0100
-+++ leatherman-1.10.0/util/CMakeLists.txt	2020-06-03 10:06:52.969185017 +0100
-@@ -1,10 +1,8 @@
--find_package(Boost 1.54 REQUIRED date_time chrono system)
-+find_package(Boost 1.73 REQUIRED date_time chrono system nowide)
- 
- add_leatherman_deps(${Boost_LIBRARIES})
- add_leatherman_includes("${Boost_INCLUDE_DIRS}")
- 
--leatherman_dependency(nowide)
--
- if(WIN32)
-     set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")
-     set(PLATFORM_TESTS "tests/windows/environment.cc")
---- leatherman-1.10.0/file_util/src/file.cc~	2019-12-14 20:46:29.000000000 +0000
-+++ leatherman-1.10.0/file_util/src/file.cc	2020-06-02 22:42:45.100963441 +0100
-@@ -1,6 +1,6 @@
- #include <leatherman/file_util/file.hpp>
- #include <boost/nowide/fstream.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/filesystem.hpp>
- #include <sstream>
- #include <leatherman/logging/logging.hpp>
---- leatherman-1.10.0/util/src/environment.cc~	2019-12-14 20:46:29.000000000 +0000
-+++ leatherman-1.10.0/util/src/environment.cc	2020-06-02 22:42:45.101963441 +0100
-@@ -1,5 +1,6 @@
- #include <leatherman/util/environment.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
-+#include <boost/system/error_code.hpp>
- 
- using namespace std;
- 
---- leatherman-1.10.0/util/tests/environment.cc~	2019-12-14 20:46:29.000000000 +0000
-+++ leatherman-1.10.0/util/tests/environment.cc	2020-06-02 22:42:45.103963442 +0100
-@@ -1,6 +1,6 @@
- #include <catch.hpp>
- #include <leatherman/util/environment.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- 
- using namespace std;
- using namespace leatherman::util;
diff --git a/dev-libs/leatherman/leatherman-1.12.8.ebuild b/dev-libs/leatherman/leatherman-1.12.8.ebuild
deleted file mode 100644
index 06e7e264bf51..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-
-RDEPEND="dev-libs/boost:=[nls]
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/portage-sandbox-test-fix.patch
-	"${FILESDIR}"/1.12.2-shared_nowide.patch
-)
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DLEATHERMAN_ENABLE_TESTING=$(usex test)
-		# We depend on Boost with nls, so this is always true
-		-DLEATHERMAN_USE_ICU=ON
-
-		-DLEATHERMAN_SHARED=$(usex !static-libs)
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
-}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 07338bb32a54..3698b6661f03 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -8,17 +8,18 @@ AUX openssl-3.0.7-x509-CVE-2022-3996.patch 1126 BLAKE2B 9d873e4e63417a4e25b764e1
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
-DIST openssl-1.1.1q.tar.gz 9864061 BLAKE2B fc8fd6a62dc291d0bda328a051e253175fb04442cc4b8f45d67c3a5027748a0fc5fb372d0483bc9024ae0bff119c4fac8f1e982a182612427696d6d09f5935f5 SHA512 cb9f184ec4974a3423ef59c8ec86b6bf523d5b887da2087ae58c217249da3246896fdd6966ee9c13aea9e6306783365239197e9f742c508a0e35e5744e3e085f
-DIST openssl-1.1.1q.tar.gz.asc 833 BLAKE2B 9311abf47469c3802a84dc9b7427a168ba7717496960e6f84b04e4d9263dea1168493082937a06bcb6ef4169b2ed9b2f36084bbac15b5f7ca5b4c41041c4bab6 SHA512 03a41f29d1713c47bb300e01e36dbd048074076a6a3b9913e2fc9a1b56b726c038978f99e86f9a3e4ea39f72bd82a15965842f6d94210fa9d3474f6f0f68559e
 DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb SHA512 2ef983f166b5e1bf456ca37938e7e39d58d4cd85e9fc4b5174a05f5c37cc5ad89c3a9af97a6919bcaab128a8a92e4bdc8a045e5d9156d90768da8f73ac67c5b9
 DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca SHA512 aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6
+DIST openssl-1.1.1t.tar.gz 9881866 BLAKE2B 66d76ea0c05a4afc3104e22602cffc2373e857728625d31ab3244881cafa91c099a817a09def7746bce4133585bfc90b769f43527e77a81ed13e60a8c2fb4d8d SHA512 628676c9c3bc1cf46083d64f61943079f97f0eefd0264042e40a85dbbd988f271bfe01cd1135d22cc3f67a298f1d078041f8f2e97b0da0d93fe172da573da18c
+DIST openssl-1.1.1t.tar.gz.asc 833 BLAKE2B fc5e7069268e987a20241dfc4f080529c6e95e217c198568b09c833e390e68b25a604a5d3ec29c6a64b9dee9d42199fd3647214e536ba2f7b8b4e57aa4cba680 SHA512 1232a94fce991d62f008ae6d3d9b6fe68cb6378fe07450feb17a58eb2417fb385ffcb7e6b74eb683134be9ff6ccf6efa183f37f4dd521614fd5aeaddf000b90b
 DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45fe951ec094041e23fb5e619133b7ebbfe31cd8203969c9d8842b8cbc10ec58da67cc181761a11c1cfdd0869df9a SHA512 6c2bcd1cd4b499e074e006150dda906980df505679d8e9d988ae93aa61ee6f8c23c0fa369e2edc1e1a743d7bec133044af11d5ed57633b631ae479feb59e3424
 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1
+DIST openssl-3.0.8.tar.gz 15151328 BLAKE2B e163cc9b8b458f72405a2f1bde3811c8d0eb22e8b08ff5608ec64799975f1546dcdce31466b8a1d5ed29bc90d19aa6017d711987c81b71f4b20e279828cf753a SHA512 8ce10be000d7d4092c8efc5b96b1d2f7da04c1c3a624d3a7923899c6b1de06f369016be957e36e8ab6d4c9102eaeec5d1973295d547f7893a7f11f132ae42b0d
+DIST openssl-3.0.8.tar.gz.asc 833 BLAKE2B 1949801150e254e9be648f33014a4a16f803b42ca5a302c3942d377013e983e0ea0cca8aed594e3f9ecde26c6e31d222581e991af5fae6cd451d7ee83541f4bb SHA512 e1c04f1179aded228b39005fd9e9f6f75aedafb938b77ac58c97a00973eb412d93b92ad1c447332a5d96850b62b01093502928e6c190bdd0234a94c4e815d2a6
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
-EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee
-EBUILD openssl-1.1.1s-r2.ebuild 10206 BLAKE2B 4e43400cac00ea82f93fc09c9fdefea349869a786cf55e8e041155d0846fddbe8df917e0d67b97ff0755e772dc9eada253d4b65a9886762d375ed66ceca193aa SHA512 c68b59e03c8e0551334fdb35f12ad0d4b13a09b4108d364fe4d0ea4962788527404db46287662f8179c56b924137e183e8c956bacfe5e4239c89ad36f2c34967
 EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba1542ede77d5038f6cc9a5f42abd27c0fccb5d713afb408d6092caf8c0b774a96dadda918f07900be0c7f4f76fbd47a SHA512 72fe25bc58d23ba2a31cbf137a179ae8477a084fbf1ada28cd878fd1958dce891ee3b8fba7d31ab10e623f202b49d96779d6e03f9761c73c77c6d5d8a25dafd3
+EBUILD openssl-1.1.1t-r1.ebuild 8202 BLAKE2B e3c62a1e2c85b7b05d14488039c7d82c854695d0e33f77f8f6118f8f90bdae2acb86b9340a68428b56e32ca508d012c3f0f2a8e71ddcfd1e980aa154bf3284bc SHA512 b9d5de4c79aadef60991ea32817ae8742a1845b4611239a76b7ba60cdbf168954c3f53eea0b4c513d60a6131de21b6d461b7e131b6544e043f04d9b82c9c71cf
 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47
-EBUILD openssl-3.0.7-r3.ebuild 9629 BLAKE2B 5d5ef06f069611f6bc080e33ea36402071d8fd3622d855c6920a884f5c2ee20a954507bb891ab200290775644d9c95bf8ff783587a0415d416c2d21a92bbb629 SHA512 f0a52f53d650b57aed596d48f2689bdd5c71d56eb8047d38a42835864048d5c4abbd40fb2fa659350779995bf7a77489baf5f176bcdca1975704b744a754f95a
-EBUILD openssl-3.0.7-r4.ebuild 7727 BLAKE2B c42230949b7f9b9361e375710e898fb4f26512de2315c9e1c8f3e445ee694186ece3e367980ae53e006031f0d88e50a13cd0cbc33fe02ee4e9bc8007e0ba5640 SHA512 68d5e6b983bfebf8bca973ba949222ab98cf00345b62c2c2fa39845dadbe2d94c2a1e5e766d02010cabea902016dc2cc003deb700170e801cea865f9effb93c2
+EBUILD openssl-3.0.7-r4.ebuild 7732 BLAKE2B ebbf524b08f3fb540b4760ef3083b1df2f4fcb6d2c80c5049299713195e9f8ca1f6b9bda67cb2ea8471fefff9f80928934115480dd89affa867ccb57906b2967 SHA512 b7a21e2082fd7609c0473ce2231b9f58e7cfcc303606b5a1c60c4a772857edfde59150f31362ec967e029ee506bfbc924e6b431a65cbf08f486157515fb71027
+EBUILD openssl-3.0.8.ebuild 7674 BLAKE2B c26514f661fb476b5441d5a0254543baa0e4c4afa107bd4494f44b4b672e4d6790c45568c834ca3fd9927802febd104365797668178fe337771efbb13d58ba84 SHA512 99a1ffcca5e0b108eeff975d1c54fd59ad64e2e551d20f83474753fb6df417a4ebe49a67c1f7813ff6204033d5ad1ac50073e9bfd0ffa0c7f7205c050e000c4f
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-1.1.1q.ebuild b/dev-libs/openssl/openssl-1.1.1q.ebuild
deleted file mode 100644
index 9182cb8af7f9..000000000000
--- a/dev-libs/openssl/openssl-1.1.1q.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-	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 ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssl )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	# General patches which are suitable to always apply
-	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch # bug #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-	"${FILESDIR}"/${PN}-3.0.5-test-memcmp.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# - Make sure the man pages are suffixed (bug #302165)
-	# - Don't bother building man pages if they're disabled
-	# - Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (bug #141906)
-	sed \
-		-e "1s,/usr/bin/env,${BROOT}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		${ec_nistp_64_gcc_128}
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl sslv3 ssl3)
-		$(use_ssl sslv3 ssl3-method)
-		$(use_ssl asm)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl tls-heartbeat heartbeats)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
-	dodir /usr
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*}
-		d=${d#./}
-		m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# Fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m}
-
-		# Locate any symlinks that point to this man page
-		# We assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-
-			rm -f ${d}/${s}
-
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1s-r2.ebuild b/dev-libs/openssl/openssl-1.1.1t-r1.ebuild
index e9c80f3f1ea3..94cbd598ce40 100644
--- a/dev-libs/openssl/openssl-1.1.1s-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1t-r1.ebuild
@@ -16,8 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	#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 ~x86-winnt"
-	KEYWORDS=""
+	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 ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
@@ -33,7 +32,7 @@ BDEPEND="
 		sys-devel/bc
 		kernel_linux? ( sys-process/procps )
 	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )"
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
 PDEPEND="app-misc/ca-certificates"
 
 # force upgrade to prevent broken login, bug #696950
@@ -99,19 +98,6 @@ src_prepare() {
 		rm test/recipes/80-test_ssl_new.t || die
 	fi
 
-	# - Make sure the man pages are suffixed (bug #302165)
-	# - Don't bother building man pages if they're disabled
-	# - Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
 	# Quiet out unknown driver argument warnings since openssl
 	# doesn't have well-split CFLAGS and we're making it even worse
 	# and 'make depend' uses -Werror for added fun (bug #417795 again)
@@ -232,34 +218,10 @@ multilib_src_configure() {
 		threads
 	)
 
-	CFLAGS= LDFLAGS= edo ${config} "${myeconfargs[@]}"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
+	edo ${config} "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-
 	emake all
 }
 
@@ -268,10 +230,12 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
-	dodir /usr
+	emake DESTDIR="${D}" install_sw
 
-	emake DESTDIR="${D}" install
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl install_docs
+	fi
 
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs. But this is due to a failing in the openssl
@@ -293,38 +257,6 @@ multilib_src_install_all() {
 	# Create the certs directory
 	keepdir ${SSL_CNF_DIR}/certs
 
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*}
-		d=${d#./}
-		m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# Fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m}
-
-		# Locate any symlinks that point to this man page
-		# We assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-
-			rm -f ${d}/${s}
-
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
 	# bug #254521
 	dodir /etc/sandbox.d
 	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diff --git a/dev-libs/openssl/openssl-3.0.7-r4.ebuild b/dev-libs/openssl/openssl-3.0.7-r4.ebuild
index 38e487d6d1f6..8e3b2c022af1 100644
--- a/dev-libs/openssl/openssl-3.0.7-r4.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7-r4.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
 	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86"
 fi
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/openssl/openssl-3.0.7-r3.ebuild b/dev-libs/openssl/openssl-3.0.8.ebuild
index 4c45fff5299e..4b7932289c61 100644
--- a/dev-libs/openssl/openssl-3.0.7-r3.ebuild
+++ b/dev-libs/openssl/openssl-3.0.8.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
 	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86"
 fi
 
 S="${WORKDIR}"/${MY_P}
@@ -40,7 +40,7 @@ BDEPEND="
 		sys-devel/bc
 		sys-process/procps
 	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )"
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
 
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
@@ -50,10 +50,6 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/openssl/configuration.h
 )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-x509-CVE-2022-3996.patch
-)
-
 pkg_setup() {
 	if use ktls ; then
 		if kernel_is -lt 4 18 ; then
@@ -116,19 +112,6 @@ src_prepare() {
 		rm test/recipes/80-test_ssl_new.t || die
 	fi
 
-	# - Make sure the man pages are suffixed (bug #302165)
-	# - Don't bother building man pages if they're disabled
-	# - Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
 	# Quiet out unknown driver argument warnings since openssl
 	# doesn't have well-split CFLAGS and we're making it even worse
 	# and 'make depend' uses -Werror for added fun (bug #417795 again)
@@ -214,36 +197,15 @@ multilib_src_configure() {
 		threads
 	)
 
-	CFLAGS= LDFLAGS= edo perl Configure "${myeconfargs[@]}"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile \
-		|| die
+	edo perl Configure "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
+	emake build_sw
 
-	emake all
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
 }
 
 multilib_src_test() {
@@ -253,10 +215,15 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
-	dodir /usr
+	emake DESTDIR="${D}" install_sw
+	if use fips; then
+		emake DESTDIR="${D}" install_fips
+	fi
 
-	emake DESTDIR="${D}" install
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
+	fi
 
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs. But this is due to a failing in the openssl
@@ -278,38 +245,6 @@ multilib_src_install_all() {
 	# Create the certs directory
 	keepdir ${SSL_CNF_DIR}/certs
 
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*}
-		d=${d#./}
-		m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# Fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m} || die
-
-		# Locate any symlinks that point to this man page
-		# We assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-
-			rm -f ${d}/${s}
-
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
 	# bug #254521
 	dodir /etc/sandbox.d
 	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 6ec54ea0916d..d93758b2d8cc 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,5 +1,3 @@
-DIST sdformat-9.7.0.tar.bz2 699483 BLAKE2B a7f831fa42cc6371afaee47876bee5d2b8e9ef3b05a9fa8281e1746d0b038fb75b0f96d5e84b615b114a25424de65be08dbea052a53813d01b07ca8a1c0d08b9 SHA512 8b05dfaa47dea7cf55dafbed828b3c361f1c13f368fd4ac50cd35c1be859e401bdbd500a79286f7b8b0e6bac04f92a4c406e910a22aa1a9583aa8ffb660c1f89
 DIST sdformat-9.8.0.tar.bz2 706107 BLAKE2B d4880b8b26bc792f7932f92238fea9e583284fb95fd139da2755590f795bf8f00d2087b949ff44df7c04f7e3e81218f7a7f5643c65164e7805b76626ac13de4b SHA512 090e654f442c26d0a930960fa603ab5e58a28d8cef276ea75f4f63cad29c249c90045e76a2e081b2f90bc569b80abee086efe7598c138fd81b387535debf7e6c
-EBUILD sdformat-9.7.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
 EBUILD sdformat-9.8.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/dev-libs/sdformat/sdformat-9.7.0.ebuild b/dev-libs/sdformat/sdformat-9.7.0.ebuild
deleted file mode 100644
index 4a78444096c6..000000000000
--- a/dev-libs/sdformat/sdformat-9.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/9"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:6=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# get rid of default flags
-	sed -i -e '/_FLAGS_RELWITHDEBINFO/d' cmake/DefaultCFlags.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_INTERNAL_URDF=OFF
-		-DUSE_EXTERNAL_TINYXML=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index cbb239b342f3..efc39c757ddf 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -5,7 +5,9 @@ AUX simdjson-1.0.0-install-tools.patch 933 BLAKE2B 1464f6eba0bc747dc24fc94ceebef
 AUX simdjson-1.0.0-tests.patch 383 BLAKE2B dc3dcbc08ec78608a94e5d04ff217a774e1c41d45f8c0c0135a52bdb2e217bf15cf9b16b35f9dbf77fc84353f904bdeaa25bf7068e93a452203dd7e9b3e40932 SHA512 95e6d933c0b673b26496aada4bca7dddd386617733dc23b15e6bd7f8275a24c206d149e95159985941257b49ae633dc8c340bec034595f3f781ed81accc5f9d9
 DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
 DIST simdjson-3.1.0.gh.tar.gz 1632837 BLAKE2B c7df7d500753c0fc23637b81e5fa2b01617d1ed24b388054b94cd877d4b9a21cc7495f3a98910600aa9e659a3d734ed6abcc9ba2f6f1f497cbadae313af02d9b SHA512 839b96c17c40274080b2543a78845bae6e7784a53374c0935674e52283ba1cda9dc55ac910641644eb55b8413b02156205153d95619a06ed8bb054429b992051
+DIST simdjson-3.1.1.gh.tar.gz 1633897 BLAKE2B a2bc394bfbf7916bc7743d3891b84eb3743cce2998242ecb427a7a3357986ea90c6ee546c3048aeb5629c9475f9ce862038f349ced51f684d199441632cca7ef SHA512 fb7d0963236c8fa692bf6c4ed2a66da5b29632c02e357894e0d5c604467e82f9a56cc7e8229769d9e401ed5bf5dfb25ae46f40fbe68605cedf58d763d03af93f
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-3.0.0.ebuild 1963 BLAKE2B a05d5f1aa3b2cc2b0275c591436eab6ffc22940d02a6f23444880f4b6904aae69fc6b2a0f712991cc54c66270bb525c80fa35216314c6acac134349170c764b3 SHA512 0da58455e1442d1753e5502f32e352a825a6f27f1303e6641e7f1f5a4d96efbf9d0445d659143df8ed05e0ca57f0be01d5df92a2f9b8823d9a7375395d8d484a
 EBUILD simdjson-3.1.0.ebuild 1964 BLAKE2B 6780f23d612f127d7e0cb9a08f6563968425167a728678c59a400e69fa1834aef8d911b8629f1ddbeb6c6e0e86456326919a140f892e45a79bd303d5421a7a5f SHA512 3664b50dfd7dbd2ddd137a8078b8f181c1d67dad964f2240784fa2ff94c47e73024ecc3db5c1d8075edec04005b4d3a590dc2b57ff07c7b1324f93cc4065c2cd
+EBUILD simdjson-3.1.1.ebuild 1964 BLAKE2B 6780f23d612f127d7e0cb9a08f6563968425167a728678c59a400e69fa1834aef8d911b8629f1ddbeb6c6e0e86456326919a140f892e45a79bd303d5421a7a5f SHA512 3664b50dfd7dbd2ddd137a8078b8f181c1d67dad964f2240784fa2ff94c47e73024ecc3db5c1d8075edec04005b4d3a590dc2b57ff07c7b1324f93cc4065c2cd
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-3.1.1.ebuild b/dev-libs/simdjson/simdjson-3.1.1.ebuild
new file mode 100644
index 000000000000..8ccb08ef4676
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.1.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+	virtual/pkgconfig
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 3c85697ead9b..54fcfe7fafa3 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,8 +1,5 @@
-AUX spdlog-1.9.2-fix-clone-test.patch 422 BLAKE2B adf5104879b3ffae5658b8cc38d78b56e9c330c59add082a4604372ba45822512774a331995634915bdf3514ed4cf74d5e8171835cea3e8dbd9bae33177ebfdf SHA512 e66801855e2856f5195644eb31b3f53fee62164df9883d66289c6bfefff1c1c7e7d4aea320b0cd510ab5a656b415886ab2fe2686047d77f33cde4f997569b2c9
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
-DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666
 DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
-EBUILD spdlog-1.10.0.ebuild 1032 BLAKE2B 43eafd7e957baa38fe0fe042766191f24ec64f97d427aec80610e2b72d42bf76263186cc97eaa90f6cc7a07e6aea2eb9a07d39acf798b35a33be24f7894b6f17 SHA512 2680771023048613ac13764e251c1a251909406bdade4edb760d11ffdae3439b66438b5ffea30e6bc0d7241d1815d6ad35f8e9341eee62b8c00904ee6c27a940
-EBUILD spdlog-1.11.0.ebuild 990 BLAKE2B af6c0be4ca6896965a110c07354eefa3f512e31a6332622edc97e3e0e72d8936415434c25fad184b469f768af611d1c1c29e8b2448bd642366afe5e271bb9ea7 SHA512 71a296a8d3914289e956f41b6b0d1bec5dab65d1f7256d23adbc163877501246d56d22824d21047212a850b19e5cfb8305601f3109897b86a39cad406846d30b
+EBUILD spdlog-1.11.0.ebuild 984 BLAKE2B 42706c859cdbd3881eefb78d584bc718a5fde7f85fb2b603aac763e729a005f9f606402c28372fe72dabbaa0f37b24f34d34aa79d3fbb84a817a08c918e20f7d SHA512 3a7f1b1dc5469e0ea9b38c8375aa99a701235a3081753f49dee0d1fbed9ca008cc5192b170343217dc371c4d485e72fd57252be8401beed1db11fb172d3a0ee6
 EBUILD spdlog-9999.ebuild 990 BLAKE2B af6c0be4ca6896965a110c07354eefa3f512e31a6332622edc97e3e0e72d8936415434c25fad184b469f768af611d1c1c29e8b2448bd642366afe5e271bb9ea7 SHA512 71a296a8d3914289e956f41b6b0d1bec5dab65d1f7256d23adbc163877501246d56d22824d21047212a850b19e5cfb8305601f3109897b86a39cad406846d30b
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
deleted file mode 100644
index a224969d9025..000000000000
--- a/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-See https://bugs.gentoo.org/840764
-
---- a/tests/test_misc.cpp
-+++ b/tests/test_misc.cpp
-@@ -131,7 +131,7 @@ TEST_CASE("clone async", "[clone]")
-     logger->info("Some message 1");
-     cloned->info("Some message 2");
- 
--    spdlog::details::os::sleep_for_millis(10);
-+    spdlog::details::os::sleep_for_millis(100);
- 
-     REQUIRE(test_sink->lines().size() == 2);
-     REQUIRE(test_sink->lines()[0] == "Some message 1");
diff --git a/dev-libs/spdlog/spdlog-1.10.0.ebuild b/dev-libs/spdlog/spdlog-1.10.0.ebuild
deleted file mode 100644
index 896f8a475926..000000000000
--- a/dev-libs/spdlog/spdlog-1.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Fast C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-force_external_fmt.patch"
-	"${FILESDIR}/${PN}-1.9.2-fix-clone-test.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild
index d61d98191cd7..18a3983ab09c 100644
--- a/dev-libs/spdlog/spdlog-1.11.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index 24e29c819dcb..fc1c98a8935a 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,9 +1,4 @@
-AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a
-DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
-DIST urdfdom-3.0.1.tar.gz 285714 BLAKE2B 1f27225dce2e715b421ad8290326f879c3c564146bb097f46d9602ab22a41d4f669df8a271db2eb700f23e75e6e1ffd98bfc06bf82b79fe0bc8ceda87e46f49c SHA512 f632aa3095f2ee27328ca1eaae2e10d1e69f540d1ae0a97337162ee57af0ba9be08c0a7456eb86cf949f849d1e4b727f0a8890ce9b5ee2e7fdac92b3aa0c4120
 DIST urdfdom-3.1.0.tar.gz 286589 BLAKE2B cfe0ba0160091c4160f4ad7d6648657cc19fcaea4346e89d4a8e685c67bbf038b4a23c0133f8af987d4aee7dac623d10c61eb98573e9a0ebf57babd7d6d48b7d SHA512 2ca34982550f0d83504ec711f45c59fa9011802ad85ffc8511fb02b7421ee99daad3f00d82925cd3490dd0164dfe7881c0d52c05fbea2be0449e57e565034695
-EBUILD urdfdom-1.0.4-r1.ebuild 808 BLAKE2B de8135362a32f152f8e4130605ea13e58704a595fdd7877546dc8f98182658d30e243a59e7c0dd2db4f6742622cc0a36fe2f8e406755823d6c7b405336624707 SHA512 5d9a219cb5e5ec1a24b7bf81a8f432fe707f70d5fb444bc8f388a83ce92485eeaebf83b50b99a119e07c264116534a44d7be491220231bca10749fa5466de42e
-EBUILD urdfdom-3.0.1.ebuild 652 BLAKE2B c47463d4cdfb01acd8b29f9f6cd36db1ae35c3a1948c9bd6df94f47840cbaed793653762f87a2ac643508b0c184170dc8ea33343e5f98b795053b93bc189ffc0 SHA512 9faaa5828d54e9786f470e622eb9a775f4ae05e63dccfbc5aa0a58cca92d0aad9d3c869d9190cd128607a1d4ee514d7cf00f0c90384a7d2a1a667b1eb888bce9
 EBUILD urdfdom-3.1.0.ebuild 652 BLAKE2B c47463d4cdfb01acd8b29f9f6cd36db1ae35c3a1948c9bd6df94f47840cbaed793653762f87a2ac643508b0c184170dc8ea33343e5f98b795053b93bc189ffc0 SHA512 9faaa5828d54e9786f470e622eb9a775f4ae05e63dccfbc5aa0a58cca92d0aad9d3c869d9190cd128607a1d4ee514d7cf00f0c90384a7d2a1a667b1eb888bce9
 EBUILD urdfdom-9999.ebuild 652 BLAKE2B 8a3f4504a6f828948229d6d491fb4d5c179dd91c1bcaf7aa28df252d7bd4c7e1913ab20f5a139d022b4716a64b3bbbbca8d42cc5dd77754a088b1888fc708a2c SHA512 21b7ab7921a539b648a13d05f570f3bba4d8cef5b66ab07cffb54b04b7007dfd720b480e16aa09b1878998cba70dc83fc1a5b84aac1fcb0b9f43c32cb6929ca9
 MISC metadata.xml 336 BLAKE2B f58bcfbda7136818c016ed571b04cb23d3f78072eee420280d354e3e24d752014ff884e064d4e5b402a60de04c802f818dba1e83fede7345ec44234bc72986b2 SHA512 8a12a7b50521d4b7d8675bc33fc94852152560c3dbfa6c0b52a0eed36cd1c9b926dcabfc1e0c33d84e9de69d333e2b306780ffac7abb563cd1dd81a60222599d
diff --git a/dev-libs/urdfdom/files/cb.patch b/dev-libs/urdfdom/files/cb.patch
deleted file mode 100644
index 3d3e150580ee..000000000000
--- a/dev-libs/urdfdom/files/cb.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6faba176d41cf39114785a3e029013f941ed5a0e Mon Sep 17 00:00:00 2001
-From: Steven Peters <scpeters@openrobotics.org>
-Date: Thu, 28 May 2020 09:22:29 -0700
-Subject: [PATCH] Find console_bridge without explicit version (#141)
-
-Signed-off-by: Steve Peters <scpeters@openrobotics.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 92762f1..f0d115d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,7 +41,7 @@ if (NOT MSVC)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
- 
--find_package(console_bridge 0.3 REQUIRED)
-+find_package(console_bridge REQUIRED)
- include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
- link_directories(${console_bridge_LIBRARY_DIRS})
- 
diff --git a/dev-libs/urdfdom/urdfdom-1.0.4-r1.ebuild b/dev-libs/urdfdom/urdfdom-1.0.4-r1.ebuild
deleted file mode 100644
index 08e2bb2e39e6..000000000000
--- a/dev-libs/urdfdom/urdfdom-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/urdfdom"
-fi
-
-inherit ${SCM} cmake
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="URDF (U-Robot Description Format) library"
-HOMEPAGE="http://ros.org/wiki/urdf"
-LICENSE="BSD"
-SLOT="0/1"
-IUSE=""
-
-RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
-	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml[stl]
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/cb.patch" )
-
-src_prepare() {
-	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/urdfdom/urdfdom-3.0.1.ebuild b/dev-libs/urdfdom/urdfdom-3.0.1.ebuild
deleted file mode 100644
index e21e9883c072..000000000000
--- a/dev-libs/urdfdom/urdfdom-3.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/urdfdom"
-fi
-
-inherit ${SCM} cmake
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="URDF (U-Robot Description Format) library"
-HOMEPAGE="http://ros.org/wiki/urdf"
-LICENSE="BSD"
-SLOT="0/3"
-IUSE=""
-
-RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
-	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml[stl]"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0-r1.ebuild b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..b046f50749a9
--- /dev/null
+++ b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ASOKOLOV
+DIST_VERSION=0.001
+inherit perl-module
+
+DESCRIPTION="Bridge between GooCanvas2 and Cairo types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Cairo
+	dev-perl/glib-perl
+	dev-perl/Gtk3
+	x11-libs/cairo
+	x11-libs/goocanvas:2.0[introspection]
+"
+BDEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+	)
+"
diff --git a/dev-perl/GooCanvas2-CairoTypes/Manifest b/dev-perl/GooCanvas2-CairoTypes/Manifest
index 946dc0c09dab..3494a88e2b02 100644
--- a/dev-perl/GooCanvas2-CairoTypes/Manifest
+++ b/dev-perl/GooCanvas2-CairoTypes/Manifest
@@ -1,3 +1,4 @@
 DIST GooCanvas2-CairoTypes-0.001.tar.gz 13527 BLAKE2B 492def35e1cb5142f37804c3e7b10ea5fd966c838b44e6f67f26cf19d08f12867e7f28a6901ed3d40798c6fd3498dd1a6149eb8ca9e18be66bb82343aa8dce32 SHA512 00478eda62bfb80393635e0c5eaa86cf43646e74df1ec61f9fac58f4792e8deabeede3f6dbfbaf8844c850f3ca729f3f27090449670f9eeeafcf2ec3ccd316c0
+EBUILD GooCanvas2-CairoTypes-0.1.0-r1.ebuild 530 BLAKE2B 64fd8aab67e7dc897c84dc2dc5d903f67417095d25c7264c5fed696363026130b712973cb94d81e69a7a053a922c8ea198d1c7a69389ec9530ba624fb964a070 SHA512 805e0de39c513829f5c5a9876c158004fa73e2244b57f3f868c627614b738b99e63ec66e25959d02bfddabcf509950e50c5d6ce36dfcb966f56ca9943ecb72f5
 EBUILD GooCanvas2-CairoTypes-0.1.0.ebuild 551 BLAKE2B 7e4c6e9f7c10395e16006492d4a410aff7b4a5bc024cab335569a099e19646b63cc5336f442955661877a8f4f18aaf4b12fda7bafc8763e484dbeb719554f9b6 SHA512 f63215c190a3349c31150342d8d4044caf3abb5063ad45234fed8de0febe57bd9d902180779197058af9f69c482c712a2fd99047ca78774b02a1d24d62aa14e1
 MISC metadata.xml 667 BLAKE2B 21ad659035a3d699afcb953e07cb4d96b91f88cd845e2d04fc4f4818bc500f38488a1550b330af33d4557bf8478420f314006f246ec01d0d4a6519ee41263639 SHA512 552bcf24e55f25b17bf6234aff3d88de2924628cb591504462cd2bd86bd8261fa0677c9cb06c9d8af0755ee71e7cc6b2e3ae0dd8066c737ceae0dd3d52f2dcd0
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c0ce88b66ec2..41dd288738ac 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 49b33d412191..fcd1c859e277 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 7b780713e017..d807ff9e19bc 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,3 @@
-DIST PyQtWebEngine-5.15.5.tar.gz 48610 BLAKE2B ea266c09965a6ee62e33d3970b145068271c9e1eb87839782e0100b5db2e90a0c002fc4d6f3d22ef9a5cb8c42a067bb45008b0392a0d8557bc6c5c9d77e6b75a SHA512 20eecd479ea757e3bf9855c7dafe0bbbc0cbc61be26509605a5c9a8026e54bb6e362069ecf4be74733dcf6eec154f6ed13933e334e4455b080e687abfd2659fa
 DIST PyQtWebEngine-5.15.6.tar.gz 48871 BLAKE2B af7c30a0d2e65e12a6eb4a2d3a40d72f94f16a5b4e509f9366be4bfb7d4358b27b3f9c0a7e4a2e7254d38950cbbd6bd4eb88e321949d4d9a44e6ea7e06c2f902 SHA512 f744fb0468ccbc79aad23d941c8e96d537ceeedfae215c7095dbf36b04b3dd042f0ff80aeca25a23715964b7d6db3bc80513f509d15c6dd6bd51e42a1a4e1975
-EBUILD PyQtWebEngine-5.15.5.ebuild 1705 BLAKE2B 8a25fd01211aaee90e81ed11e3ee21cf8ed4c8bd5a078779db8976067dba53f904db526a10f9382ce86a3e68ff423f8e42a1c1396f21fd3adcb289b476f3df56 SHA512 05692b46b05bfe0c2c6edf4d455d1c3d9a75ed2c4bd01ebce6070cae7647ef0214c8b517256974de2755de8f76718138a78411992330d01dde68a9e94a893c1d
 EBUILD PyQtWebEngine-5.15.6.ebuild 1705 BLAKE2B 8a25fd01211aaee90e81ed11e3ee21cf8ed4c8bd5a078779db8976067dba53f904db526a10f9382ce86a3e68ff423f8e42a1c1396f21fd3adcb289b476f3df56 SHA512 05692b46b05bfe0c2c6edf4d455d1c3d9a75ed2c4bd01ebce6070cae7647ef0214c8b517256974de2755de8f76718138a78411992330d01dde68a9e94a893c1d
 MISC metadata.xml 959 BLAKE2B 00163e3954184867c30d8e0bf102bf2fc68bcbbefb4169b2aad2521bdfe5f7e505c71f1e5ff82eaa20f0789b12c6d2812557809abf500c05527afc68ab66d38b SHA512 1d58825dbdb183fe56222b25844daa3d1d0fba14aa77674b8f6c3ec683e3c43f7f3173799b97d7aa3d2410e7f874d7386ebf23f9524b27710646ef5d7d1f8148
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
deleted file mode 100644
index 8ac077883076..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.15.5[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwebengine:5[widgets]
-"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-"
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			sip-build
-			--verbose
-			--build-dir="${BUILD_DIR}"
-			--scripts-dir="$(python_get_scriptdir)"
-			--qmake="$(qt5_get_bindir)"/qmake
-			--no-make
-			$(usev debug '--debug --qml-debug --tracing')
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain and build flags
-		run_in_build_dir eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index df9088d8c0ff..5a6ca4db4a76 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,9 @@
 DIST ipykernel-6.19.4.tar.gz 144072 BLAKE2B 25e2031a9198079488ef43b9c65e656be720ec8ac6648cb3eb65705be5c117d32c783776c0d8f5da466e745979ccb64573720146c0b41835ecb646bf25e7d4f8 SHA512 623a8cac7abfce0147a08fe55bf88772bfaf317431a608a99ae3e7058ebb120464d751a8b95633ccde5201b4cc2c1bde32dd823add96e5f2bb1ef20da19652dd
 DIST ipykernel-6.20.1.tar.gz 149147 BLAKE2B 9d05f1f43aa1a77dd63fac60fdd44d56dd03cc8b5025a99b29e04e30ca90ec5e6d541ab86c9fa1490b97b198e829058d14273823ad55321b1f8fe1b028d1bc62 SHA512 7a9b2ac79255e3049ee5847f5b424d2dff0a325e9f294b416d905907753c98751c70ff69ba496831eb98430532f438e5bd7edcb2c12b8b5c56f5b5c79b30c3d1
 DIST ipykernel-6.20.2.tar.gz 149263 BLAKE2B 38b3afdbe237ec2facb3af42311315a060f1dba845cb3f7ce10a3d5f68679804640b0dbda869395817a8612af2033f5936ff7f6f3b3b822f47ed512a3b8c0c4d SHA512 9c79c7fa175cd81a920e6b1f2159dda30ba9068437cb1d24b09d864ded36b439045e58f240daee1a46ae375f1990cf318cd8b2e2c02aa6d6e2004d90aff5225a
+DIST ipykernel-6.21.1.tar.gz 150412 BLAKE2B e77567230deb4b7a7af986e1465daa91d827ad1dafe38e8d71e7ed03edcab62b2dda81ee14f52bf29481e87a15e3346d6423b2e39b15bcdf26d3109022e7d252 SHA512 78e401f12f864364b73b4a12bf9adc0b0d7720b5b9f51f4af2d69b45535f34c81f099bdbe82865fc91ffafb19c97ac4a3831929528e821aa3db0fba9b3581fa4
 EBUILD ipykernel-6.19.4.ebuild 2070 BLAKE2B 0d0c02013a91fa10d33adc52d02e9cb6cd6fd6bf7743819f006facdfc2987333f00ef398a6a2014281d0aa4ef68bb7eea0b951ac16b8e6a44d61f5f8087489bd SHA512 6acc488cbd2de2fa86c1918df92c0127f0e9464233b277c46f354746c30d76995c14067f1ec2100c16d2a5d3564338e7bbf43fe1d993417d1c5ea0d553b76484
 EBUILD ipykernel-6.20.1.ebuild 2208 BLAKE2B 0c01465ef85bb251b5f367e1f589ff947abd51a7e10b4e2dbf5db2396c0a8be23ee2ee1fe4015389a71ea469092080b330a5404523dc37c95df416fddec4f283 SHA512 0f662fc33c471ee808a45bc0e285cf8cff1f01f4e345f37a952c1e8e42f23379905a1bb529ff1cee531475e6035da37b60502b7db870f3c7cbed54af8d159ab7
 EBUILD ipykernel-6.20.2.ebuild 2208 BLAKE2B 0c01465ef85bb251b5f367e1f589ff947abd51a7e10b4e2dbf5db2396c0a8be23ee2ee1fe4015389a71ea469092080b330a5404523dc37c95df416fddec4f283 SHA512 0f662fc33c471ee808a45bc0e285cf8cff1f01f4e345f37a952c1e8e42f23379905a1bb529ff1cee531475e6035da37b60502b7db870f3c7cbed54af8d159ab7
+EBUILD ipykernel-6.21.1.ebuild 2334 BLAKE2B 0cc96ac8e4a78aaef83861e88b2f3f58f6e70f2822e857a50e6efebb6863045bd39b725bf70c27c25bd4027500bf951869dd0d145b3e423ef1fc9bfcdd428b92 SHA512 6fabb41b5dd902799176cf488ce6e59e71b944e24717ad9ce54a9d2c63602192eda884b00b3ac07e77d6b2f82c7f60375f0cf9f2521b49a8725c47a91babf7e5
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.21.1.ebuild b/dev-python/ipykernel/ipykernel-6.21.1.ebuild
new file mode 100644
index 000000000000..4145bb1d401c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.21.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		ipykernel/tests/test_debugger.py::test_attach_debug
+		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_set_breakpoints
+		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+		ipykernel/tests/test_debugger.py::test_copy_to_globals
+		# hangs?
+		ipykernel/tests/test_eventloop.py::test_tk_loop
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 8c8c9fa2ceb6..96e4d4633478 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,5 @@
 DIST isort-5.11.4.gh.tar.gz 733368 BLAKE2B 82a9738cf48fd662c6128c7f58766e6b204d93fee73cbdd0d84850a62a1a714322dc6c31429a3b043401a963178c4aa3120e98c8f590f24799b75a92f9427798 SHA512 fd7dd8938cc700fa4a295bf1aabb9dc479e1b837e443e3210e4f2234316e207293eeb6f666b49ed2bc4f92942b3185de64439ce86ece201093072fee905766a8
 DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
-EBUILD isort-5.11.4.ebuild 1591 BLAKE2B e58efc33beb1fa1c34919e803082b3a17c090de3772e2c0d3a30ff56c5a0b36c65bfdfa893336673593550b183e156310f30cdae278749a7f5d1ec92249f457d SHA512 072ed6e6b60b235dfdc200e4a44046d2248d02aa017eb8b4d31e5b5277ad3fcd422758c7d75aa1148c4e90a39a2b1fdc13dbfde30c5bbc884875a024cb02dc94
-EBUILD isort-5.12.0.ebuild 1599 BLAKE2B edfe274b4c72c8727caf423ccaface9fdb8375289fb1d9ced425d29f3eea2ee652358c462078f4ef2b602533f5564b850bbb0d4049e686fcf1a97cf7a513eb01 SHA512 4a1be6daf58cb7c2a49c2357b7f1bcef9b453911f10ae69680e48478fc2570e1ccd574d4902b0a5a03441d59490db909a6464def6ba37229f6db75f09a7a5e7b
+EBUILD isort-5.11.4.ebuild 1707 BLAKE2B 2a9e775d26c979fb5ca3fcf10604447b44497a41b95eb869bbbd87ca61a84742a99afafe9516ed5c747b171b5d55bbb1d3c156a24da9abd16c1716e541f889b5 SHA512 e0e5db706b7082c174cbb8aebb696897812a06f90bfde10f35bc97b4031e8178f7a1ad3e860981b273da53ca13d042c6592c6206dad01a1e69cfdfa415b0ebf7
+EBUILD isort-5.12.0.ebuild 1471 BLAKE2B 86834dcb3987829735512c126537c1921f41e37ee46914e67e5ae944b2c5f6627649397c45d54b301c059ff3aece8583089679330d08662fde22401edfc58402 SHA512 e0f09fd4e455248ea3b027d8907e84269fb102a89fec22c75b9293823c629a256f2c1e03498b3c1415ad27856549f101c062f00473d5beb1481532fb0eb9d4bf
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.11.4.ebuild b/dev-python/isort/isort-5.11.4.ebuild
index 86119ad4b7f7..426bfd0652b3 100644
--- a/dev-python/isort/isort-5.11.4.ebuild
+++ b/dev-python/isort/isort-5.11.4.ebuild
@@ -45,6 +45,8 @@ src_prepare() {
 	rm -r isort/_vendored || die
 	# leftover toml import used to determine .toml support
 	sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
+	# syntax error that triggers with new poetry-core
+	sed -i -e 's:pip-shims<=0.3.4:pip-shims:' pyproject.toml || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/isort/isort-5.12.0.ebuild b/dev-python/isort/isort-5.12.0.ebuild
index 1c237256715b..131c8a595db9 100644
--- a/dev-python/isort/isort-5.12.0.ebuild
+++ b/dev-python/isort/isort-5.12.0.ebuild
@@ -43,8 +43,6 @@ src_prepare() {
 	# unbundle tomli
 	sed -i -e 's:from ._vendored ::' isort/settings.py || die
 	rm -r isort/_vendored || die
-	# leftover toml import used to determine .toml support
-	sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 3b4ab0bb975b..832ffc3f8dd2 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -2,5 +2,5 @@ AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feab
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
 EBUILD pyside2-tools-5.15.7.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
-EBUILD pyside2-tools-5.15.8.ebuild 1656 BLAKE2B 473740bc6392674185a1ce05176cd37d7a534a5ca4cf6418587d8297f0598c27ddcb823f774ca5ce1fa89cd393e7ebdce572596baa59275f250576da2b23689b SHA512 a3bac308f16fdcb61116aafdea5d74894e93cd62ffe041acbe2a2e7125dff3924f30579a54f45c94e8f0e20c1ba7f178583948d6e3d94fc5ce9b2a12ca23e7ca
+EBUILD pyside2-tools-5.15.8.ebuild 1654 BLAKE2B 1ed048d5941edcca44c55a28b65615778b3e8f9a0681a8f3d8d9f94f6e7db471d1259414c2951348943430e470abef9d7c68919e3a6f338f0d7349a3330f94b8 SHA512 0b5f143005e52819d11cdf1815e0da2ca08e3f306fee22d9548a5bd043bf7437662f04bab5f6e2f84b389c3ac86d4835e8b49f687c79d0cfe528d1c30c0dfbe6
 MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
index 81180b8926ab..00bba590214d 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index ff9a05259306..87edf22d12d8 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -4,5 +4,5 @@ AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a31
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
 EBUILD pyside2-5.15.7.ebuild 9267 BLAKE2B 6066eb7e94f05e9a83d87c57f6489e23cfca153a7c6dd13f3ea08184a2de5d7d7e0cd6d62be95fde5304cd2ebdbe328d12ebc0375d03a697d26297a694857555 SHA512 612ef6cb7d183e52fe67f0d209bf12efc2b9182eaa46da58fcc9586b1d96c36403d1b457293516a54ffe16f837ed3ccb3b3e87fb7c95213de709910c34f16ddf
-EBUILD pyside2-5.15.8.ebuild 9270 BLAKE2B 6cc61284bc3d90f5dbbd9169bed68e82362d0b6f179f2ab9463d7be1b44c46b71851b3ab344c223c52d99a985097481f668cee4ac6ab01c76d8c081575e5548c SHA512 6659e07a2f28fb56bbbb71827d93f0bef5c83ded318a5687a8668a18517aa08f9f7ce1eb4d179bc2be8737e054b1615c9c3f098e060f2330449361aad10b8d96
+EBUILD pyside2-5.15.8.ebuild 9268 BLAKE2B 87461aed4c425ff612ca073b0aefea80d569a1f3e8bb03376d56591f29a7bec5d013a3c0db517f7c9c67a729518d345da6e123f189ef4e225555b3233f40f6f7 SHA512 bd1f0fe98aacdee9948bfb8d8c4fa607be9668215c3744ff31d7f688ba3c54d23c016f41ca1c8461e233d10f82ac651a3cac853941eadd18eab577b9aca1ee31
 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7
diff --git a/dev-python/pyside2/pyside2-5.15.8.ebuild b/dev-python/pyside2/pyside2-5.15.8.ebuild
index 7a57cf9a7949..21d1ff744b71 100644
--- a/dev-python/pyside2/pyside2-5.15.8.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.8.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="
 	3d charts +concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning +printsupport qml quick script scripttools
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 365f7899f267..4ba5eff79d77 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,5 +1,5 @@
 DIST ruamel-std-pathlib-0.12.0.tar.xz 20972 BLAKE2B f228982f0df4d5bb41fb99e74179764eecc7d7850bb381cc219b4a3521dfbd42ec88e246600dd4d20977ce5718e32a32a89b5c922b7f56fc63396cdc3974d157 SHA512 07c969d95fa3ebcf2e5070aa50044760fa1198d189f2d4104bfbaf9b49884deb391e32db2b4ffa23e5ed7d192c4a010c76d7ecc0cbe7f321cdc449f9a89f12be
 DIST ruamel-std-pathlib-0.9.2.tar.xz 19948 BLAKE2B 1d8d6b4a6703c22a578320d47258bca487376945fc5442716686b05aed78ab64b32022da7fe63f454396235c5782135d173892ab99fdcb857d42369732e26f80 SHA512 71077d2c979bdd5f9d4a2467f6d4a7c0aeabb3dab3f0657411b562ada955c859da619db1e8431d8065d7610b376a961244920359471a9c1358315c02a6b621e4
-EBUILD ruamel-std-pathlib-0.12.0.ebuild 1243 BLAKE2B ba4ffd3bb8331c94e1180bdbdc3eabdc9894be00b96697af8689464af58711f943c18b7f7dd88c86624308863f8bb00c2c3c9cd2a0db535c3c5c2e17230e4748 SHA512 b37c6b44d370fc2ab0d48ffedfe216b6b3aa83c62d400e02e64bff1d19c04c8d02973839ec006fb1c4b6ad00d7ed5709ef9448a56f6dc7c6b3808ca2c6b785f0
+EBUILD ruamel-std-pathlib-0.12.0.ebuild 1254 BLAKE2B 2c70eefa0d3992e3657f6a434689b8c504cfb890d8d638bd753162aef6e5c37afbfb6140c83b501c707d91ae35347cc817b349abc3236df901c87f761b99628c SHA512 a9f89749891f97adef2384ba867aa7ebd511c43bf69db2d6ff35d9e8ff7c299f44957bb5f0e380a1fcaf0831889d6aa0cbbf6c6ffeed8299a7a4eac446832a4d
 EBUILD ruamel-std-pathlib-0.9.2-r2.ebuild 875 BLAKE2B 7b29869c2d65693854310b9e55a7309169d7e9ad97c7915441063f5a3a9bcd538187fac91f80a3dad7a37a4b8572380387ecc3cecc18c8939150c0bb5fdaf893 SHA512 aa530410776ee59ad1712fded66a2907a11fc12782a9f36c7cb62dc4bbebeb3e66d7335ac36cacf131261adaa5246200a4d9a99e8ff3c543b07ec0e29058be5a
 MISC metadata.xml 773 BLAKE2B da92f7a81821b07d2082a187c3b09e52552256a25404576676a10b92178f7ed75319b27a5ffd160631767dbed4e9ef699da57439d16ea4bc35a548f3c5978453 SHA512 5419f21c2f50d6d49bccd8a267d96cc230af41fd63fccf0391fcbce3f05197144bf731bc8f7b384c4eb4992ed0fe0824fdc7d2f6bc3e00553faad9d87c0bd6e2
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.12.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.12.0.ebuild
index b0a0bb40d455..2aa0882c9726 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.12.0.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.12.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	!dev-python/namespace-ruamel
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 64ad7a7ff2c0..7d6cc79d28ad 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -7,5 +7,5 @@ AUX shiboken2-5.15.8-py-limited-api.patch 527 BLAKE2B a27886393ff917dbf3b1318d44
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
 EBUILD shiboken2-5.15.7.ebuild 6690 BLAKE2B f9e0e9abf8bfeea66d9a9575b165c1622a5594899c7ae8e7d5a7aab4529616e59bcab140dc66f5d959bf3048e913150dfca47a403ed30b7b3e9e47d6994ebac6 SHA512 9f0d279062ee045426cd34c84e526bcf02d0daeaa12a0fae27876f683844097bb1dc03e785c6193812ab1e9cf217a8998c024d5d1918c94fd111ec1543241ba5
-EBUILD shiboken2-5.15.8.ebuild 6742 BLAKE2B 2ce7b18aa89621328e2f9fd34218a02438946e8ca8c07f7c85bbaabacc0d8e52244a0f6b075083d47374947035affcca7a2a94a88482ccc22faea339d536bfd1 SHA512 b505352ac4334326d0c17874f5f1b9b14861c7c6e78f208b63f94b11a3053bb8e9b06ec5360e4a7d69e9ac0c13203bb4d8d07724a899970f6f96942b1f2fb0b2
+EBUILD shiboken2-5.15.8.ebuild 6740 BLAKE2B dd742e887d32fdc792bec284cffcce63028546f49e0f20889d6543ff50ec3bf313c1dd5d281ef4fc1d280830cbec975cb5d3036669c680fd69af3794033fce60 SHA512 ace9566da10033d108d772cfdf5f1312d066ac77fc31884a3522e4905a66163547faa170d54e83dbb4379c4ba17c76511378c2ba40ce8e109aa7f59a50d5bfc5
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.8.ebuild b/dev-python/shiboken2/shiboken2-5.15.8.ebuild
index bb0a98d609b4..a9d6167b26cc 100644
--- a/dev-python/shiboken2/shiboken2-5.15.8.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.8.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 8a23b952ea5b..1b095c35d6f2 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,5 @@
 DIST ujson-5.6.0.tar.gz 7151977 BLAKE2B 59c0b88bdc59791889971993135484ce99763ad4805b36db7a3abc5e950c9132b917e7fbfb09870af916f5939d10e23ab44137f416179f75a06f424cf4b1154d SHA512 996c9746e011f116fcab3e61345df27cb2c1251852f758eff1d3465e19df03deb1a037669aa6ee5aad2fc6c2cf76c22075ad6a73158ff4dc81357e59a4ee244a
 DIST ujson-5.7.0.tar.gz 7152625 BLAKE2B 363fd77be3e2f8fb42a70db744ab4da12c0c8383103983b3555cee237497837abfcef102b19a51c0fa118fedd7847c568607c058f1d2cea76858a6bd89a226da SHA512 e18a1608a7fe79030e3ff307c9e95a0e238cd5049ee791eddbc07efa55853475d053268b80a8765023639ae8ff39f82b4ae2c04e82fc7dc5f3192a5134ec0757
 EBUILD ujson-5.6.0.ebuild 879 BLAKE2B 9cf8544a2950c8f0419700cbc90c332df03fa91de3f1de91c891c68da3ff748a66b27b8a154002153cfc1fad6cec1af66ee557937aef68825b61b4de39ff2c15 SHA512 c07a807702f1dc96272c06c6771385713a2feb4c26c374b583a8bf5f255def98507ace90cedcd00de485d474f6a158da44dd37fc3e177f2dbf21068eec996ef2
-EBUILD ujson-5.7.0.ebuild 883 BLAKE2B 5666a624ee94f8e4729cc3ff3143c5e814c008000474b0687277d137bf28c0ccdfc97e09fba327641dd4a48956edf12c07dadbbf0fdc11c017fdd71722ba48d7 SHA512 35fa6f90c695139c97263ba4795779047ec20a976573107bf0e21eee1cb84e78f923d6ef67730af24463034b6fea771d7d684ba3c79fd1c39f671b952322bd0d
+EBUILD ujson-5.7.0.ebuild 894 BLAKE2B 78214599c069af5dc0f9feab81f904fd75f3b383811fd02bc8659a485a05ebed11608a1dabdaa7f80d94f6929e2c31ba47eef4611540b342932fed3fd5372906 SHA512 18e248b68dfb40bc10401ba0f51fc736efc155ca8a9d3860724b7dbf2408d4e2492eff57d2850639397ff6227c3fbeee8388db03baef957d2c462569a37ad843
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.7.0.ebuild b/dev-python/ujson/ujson-5.7.0.ebuild
index aff5eeb94dcd..37a1623009fd 100644
--- a/dev-python/ujson/ujson-5.7.0.ebuild
+++ b/dev-python/ujson/ujson-5.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 38feab6d9b68..4bc015cff545 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 0bf0e963bd70..35e83952b558 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -4,5 +4,5 @@ DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50b
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtcore-5.15.8-r1.ebuild 3070 BLAKE2B 610fccc1d08332b4ca2b1681906812fa1ca3b900ff487dfbd83fb4c0cafc5aa3accea3cd4450a3b7d46d261faf7fe7308a45642e73f84b37a9d16ea3af34afdb SHA512 d19b28d91138bfce589907ba79b67a0db2d3b248640050851017343f0400a1ccfeffa6f414d2849fc38c901893cad95c5bae0cd3e5eb22fa5f7ae94c252a10dc
-EBUILD qtcore-5.15.8-r3.ebuild 3107 BLAKE2B 7855127e83de7642560f8dd89fa483f4cc4df667d82d5a34949502905144fd4b5b7e43c240930e0c0f427d105d9dbd0614d2c3381e28f5f8c2bfc52d9168640e SHA512 b45c52da1d9bf82d922ff7e030834dc8a2fdac3b3666ec558490f8c0ecd5083402d1d382d2731227c88503ce41c234f78b8024082f9871b203b71f1d4f22b951
+EBUILD qtcore-5.15.8-r3.ebuild 3105 BLAKE2B 6b287f8b99fc9aefd253cf94ede43040b21d74c55620c82c92f7b53d14bf7413c44e6f4e5f29594478fdf9fb9dc68d0b1381e3349ce4d8f45ada43574c8e37ae SHA512 734f1e8eaff2b2369de60f106e7d27ef067d8d406ce8abf22e79974a7d54272f7dc98b99f9c164e96a8e45fddbb1f6ada4fa75c1754e4a63ca47996e0212d46b
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 7e19031cbe35..5824b581bd83 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 5c7708b220ff..f3f07137d8d1 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50b
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3
-EBUILD qtgui-5.15.8-r3.ebuild 3842 BLAKE2B b13a7f63898005d3759ae61407392853d64650502716bf72e4a308fb2523548574ed138a9cfd93eaf1959738793785869b43bd6931cf755c5e3863cb44d0df0a SHA512 643421d9486a4f887dc09ebf90a569d25e28d6e4d3a0c18bed8db3b29624870f75a12eededd2a5448d63462f032d75402c3382b6842e1b19a7d06ec9d989e2ec
+EBUILD qtgui-5.15.8-r3.ebuild 3840 BLAKE2B ed66d1e8e9944c13475e1e974717744d041100e6839229778f56eb0eeec41e83e83aff76406978511e43f0a4cc5d1cecfec871f55d30c279552b97532c172b35 SHA512 d238c45f839673b217c59657309df4e3835445f2956a9e25f147b6c0d0df3314d20b60ed3ab4069accda06b9d3f070df798b80c57b24f040f09679567253a256
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
index f2af77c15d55..5a8fe26b7235 100644
--- a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 26a4c5cda00f..3fbf88831303 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -2,7 +2,7 @@ DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
 DIST qtimageformats-everywhere-src-6.4.0.tar.xz 1861400 BLAKE2B be2d99999a29b5876981d0768d63dab6a70181a1643be73e83cb7bf6771bd35462165e1a848206d4f69018c3388118f4bd94a336ff28ab19dbc75973eb86463b SHA512 3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01
 DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
-EBUILD qtimageformats-5.15.8-r1.ebuild 702 BLAKE2B 886af5f9b38be2bc82f5e81f121fba46687807ab77b34809158b767e592177466350a0f9110011e7998961132f6da54ca1dda0fabfda12ae0fea71b1d73137ae SHA512 3be583ce27469d7b5e5a21f75f05bf3e1acbc27bac6c12d86dfcb1fecd6046a0c6f2acf6b9b99e5a6092feeb400b598c4bf0ad1adebe789ee1b80350d5bdce3a
+EBUILD qtimageformats-5.15.8-r1.ebuild 700 BLAKE2B dc1002ce7aff97a6d71ec773c0e777f3f85b9a70729614537c491c4cb821d273aaa9f3868ea04fe5788e8fbfecf20c2a1710794d534a96cb9348c287f1a016ce SHA512 21fd2b4940025e2d15e2871d3bd0f9413878b8cccf8a9ec2dd60cfd0ec34defbb3cfba9e6aa903442f8f7f46442e0af732b67b2ee1766d26bd78bdc26da96dd2
 EBUILD qtimageformats-5.15.8.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
 EBUILD qtimageformats-6.4.0-r1.ebuild 633 BLAKE2B 1d17b7e376cdab0291450c0fce5da50f5ce7882670f3a6e02b4660ba2f6ffdfba8e4c8df51f15cd77ca8567e0fb01ab56af6f1772ec6d36a96cf5f20ffa0c227 SHA512 47d854a16b2af5c5fe487a8d4ca8052c49f3e5fbb4ffeccea85bec59d2926d640812e15aeab89d0ee807a8efa5c2e2aa85e1e089ed48568f827fb167ee8665d3
 EBUILD qtimageformats-6.4.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
index 1fc71ebd4a6d..885404f80c86 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 6b26bcab5d17..bc8293c57ae8 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtwidgets-5.15.8-r2.ebuild 1206 BLAKE2B 6437af15f1a3793cdf1fa64be23baf416b49d0b2239f69aa0a058845c009156e5108621edc8a65e2be270c5f1cd6650760248c8008b6db568a0d2c43ca590a7b SHA512 eb22969ca1164ad0664397c00d13d444d7cabe6cbe91a73f10bf7821d0a9a3e1bc79a84f5c86f6c2ed2f0ad097bc5b7f776ad697ce6b027ff546d47004d0287e
+EBUILD qtwidgets-5.15.8-r2.ebuild 1204 BLAKE2B 7a65f8330027039cad45d002c6b3eda04ff7fdfe82d8dd96230e49c179adf0864293c13fb2e1a1aa48214f97297bfebb7a40bd8a3e6b5a0784a94cd234d9385e SHA512 219ad10a661eb64f1b01a99ea8c43e6efd8a7748810a68fc1e6c1be2c2fcf89a989d88007907f452534d9fa058c1ba28c88fdee7f62a2c9cab71e22860f6c7dc
 EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
index c6c374f18d5e..7ac1a76bd499 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 77b007930cfc..348e248c9561 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 74644c6ac3e8..bb0557bdb4f5 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,9 +1,4 @@
-AUX vbam-2.1.4-arm-asm.patch 1288 BLAKE2B cee8723a05887cef699864e90a5cc14db826721a4c65adc12058fdfc0c84d5b59fa8053f923edb9914147117f4fab327e7cd72498e78342123f89b66885be6d6 SHA512 3ac82dfa44c228fafadbb2cc67a6ef634eb79c8ef6bac31b1f76c6707af03a136c6ec16a1cb5b800a2232cee44e9db9ea76b2a88bdf44fb1d2c74b1dc3940a6d
-AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
-AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600438baca4c73be0d5897a0b528275e433f596a6bb7fe6fd5a5cb3518ed9d7ff8a6f4166152ba6aa15ef90cff23a6159b5 SHA512 f97772215b857069ef881e859fa846400592c437ee85b5b2fd0f463df8be8f5cb40b322361ffa4718e89ab7460ec96a696c0a5683ef0914b2d901af4aacfaa8c
-DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
 DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7
-EBUILD vbam-2.1.4.ebuild 2251 BLAKE2B 9bb3ca90cfd3bec44a598002ad917dcc6b7a8312e538bc25ca2f59cbd7f532c7fa513fa6c5771d731da7971df50c02891829cfc77f3430bff9d2daa12ea4c4cd SHA512 1fa521b6579892189ed9046785de17a4a68575f95ffe35ef86ac92c92224ec45a109124befba9709c421b2e4b5d46342c5847fd9f6fa1a171547d1d3ead69512
 EBUILD vbam-2.1.5.ebuild 2236 BLAKE2B 7434145a698f17d1cab6f79e5679d55527af61495e530428fe3b01719e744a9da735161158e5116201dae8a709c5c404948e7ac750a4965637ce5760a5b2d1f3 SHA512 f08b26797919fd4e051f1710597b2f5e2c71f19363708a4278fdf17fe48a1d48d22f7f615b4acbd68cf51cc483413ae4c2b98a98f1a6463ac56c32983fbebeee
 EBUILD vbam-9999.ebuild 2236 BLAKE2B 7434145a698f17d1cab6f79e5679d55527af61495e530428fe3b01719e744a9da735161158e5116201dae8a709c5c404948e7ac750a4965637ce5760a5b2d1f3 SHA512 f08b26797919fd4e051f1710597b2f5e2c71f19363708a4278fdf17fe48a1d48d22f7f615b4acbd68cf51cc483413ae4c2b98a98f1a6463ac56c32983fbebeee
 MISC metadata.xml 480 BLAKE2B 43f103fa39cc5a54114a29e5a4d9f317a4cb05233dbeccd74a99218d22f1b93916873756c688fecb09f14d8b84772623d9e66fa64009a014f90cc95329d38d27 SHA512 f9a74a97be6da5686189baa7c5fcb05d9742e41611383b97d071f09fd36944b37d6dbf94309de661d7cd6e17349084f0cdb25ba2b761b44064504ad28f20a76a
diff --git a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
deleted file mode 100644
index bf6e2bd70e9e..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877.patch
-https://bugs.gentoo.org/799362
-
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Fri, 4 Oct 2019 07:35:49 +0000
-Subject: [PATCH] xbrz: fix inline asm check
-
-Use correct cpp code to detect x86/amd64 architecture to use inline asm.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---- a/src/filters/xBRZ/xbrz.cpp
-+++ b/src/filters/xBRZ/xbrz.cpp
-@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c
- 
- inline double fastSqrt(double n)
- {
--#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION
-+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__))
-     __asm__ ("fsqrt" : "+t" (n));
-     return n;
--#elif _MSC_VER && _M_IX86
-+#elif defined(_MSC_VER) && defined(_M_IX86)
-     // speeds up xBRZ by about 9% compared to std::sqrt which internally uses
-     // the same assembler instructions but adds some "fluff"
-     __asm {
-         fld n
-         fsqrt
-     }
--#else // _MSC_VER && _M_X64 OR other platforms
-+#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms
-     // VisualStudio x86_64 does not allow inline ASM
-     return std::sqrt(n);
- #endif
diff --git a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
deleted file mode 100644
index d801b08317a3..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From ae7349b06f86ff60b0d14dfa01b3fe2163dcfbab Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Wed, 13 Nov 2019 02:56:06 +0000
-Subject: [PATCH] cmake: Use list var VBAM_LIBS for link libs.
-
-Accumulate link libraries for wxvbam in the VBAM_LIBS list variable
-instead of listing every possible library variable in the
-target_link_libraries() call.
-
-This fixes the issue with trying to use OPENAL_LIBRARIES when it's set
-to NOTFOUND which generates a cmake error.
-
-Fix #563.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
----
- src/wx/CMakeLists.txt | 43 ++++++++++++++++++++++---------------------
- 1 file changed, 22 insertions(+), 21 deletions(-)
-
-diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
-index 13e0cea7..d37c1cdd 100644
---- a/src/wx/CMakeLists.txt
-+++ b/src/wx/CMakeLists.txt
-@@ -15,6 +15,8 @@ endif()
- 
- include(VbamFunctions)
- 
-+set(VBAM_LIBS ${VBAMCORE_LIBS})
-+
- if(WIN32)
-     # not yet implemented
-     option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF)
-@@ -46,6 +48,8 @@ if(ENABLE_OPENAL)
- 	if(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe)))
- 		add_definitions(-DAL_LIBTYPE_STATIC)
- 	endif()
-+
-+        list(APPEND VBAM_LIBS ${OPENAL_LIBRARY})
- else()
-     add_definitions(-DNO_OAL)
- endif()
-@@ -58,18 +62,15 @@ if(NOT ENABLE_XAUDIO2)
-     add_definitions(-DNO_XAUDIO2)
- endif()
- 
--if(NOT ENABLE_FAUDIO)
--    add_definitions(-DNO_FAUDIO)
--endif()
--
- if(NOT ENABLE_DIRECT3D)
-     add_definitions(-DNO_D3D)
- endif()
- 
--unset(FAUDIO_LIBS)
- if(ENABLE_FAUDIO)
-     find_package(FAudio REQUIRED)
--    set(FAUDIO_LIBS FAudio)
-+    list(APPEND VBAM_LIBS FAudio)
-+else()
-+    add_definitions(-DNO_FAUDIO)
- endif()
- 
- # on unix we have to check for X11 before we overwrite all the compile/link
-@@ -79,7 +80,7 @@ if(NOT WIN32 AND NOT APPLE)
- 
-     if(X11_X11_LIB AND X11_Xscreensaver_LIB)
-         include_directories(${X11_INCLUDE_DIR})
--        set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
-+        list(APPEND VBAM_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
-         add_definitions(-DHAVE_XSS)
-     endif()
- endif()
-@@ -419,7 +420,7 @@ int main(int argc, char** argv) {
-             include_directories(${GTK4_INCLUDE_DIRS})
-             link_directories(${GTK4_LIBRARY_DIRS})
-             add_compile_options(${GTK4_CFLAGS_OTHER})
--            set(GTK_LIBRARIES ${GTK4_LIBRARIES})
-+            list(APPEND VBAM_LIBS ${GTK4_LIBRARIES})
-         elseif(WX_USING_GTK3)
-             pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-             if(NOT GTK3_INCLUDE_DIRS)
-@@ -428,7 +429,7 @@ int main(int argc, char** argv) {
-             include_directories(${GTK3_INCLUDE_DIRS})
-             link_directories(${GTK3_LIBRARY_DIRS})
-             add_compile_options(${GTK3_CFLAGS_OTHER})
--            set(GTK_LIBRARIES ${GTK3_LIBRARIES})
-+            list(APPEND VBAM_LIBS ${GTK3_LIBRARIES})
-         else()
-             check_cxx_symbol_exists(__WXGTK20__ ${WX_CONFIG_H} WX_USING_GTK2)
-             if(WX_USING_GTK2)
-@@ -438,7 +439,7 @@ int main(int argc, char** argv) {
-                     include_directories(${GTK2_INCLUDE_DIRS})
-                     link_directories(${GTK2_LIBRARY_DIRS})
-                     add_compile_options(${GTK2_CFLAGS_OTHER})
--                    set(GTK_LIBRARIES ${GTK2_LIBRARIES})
-+                    list(APPEND VBAM_LIBS ${GTK2_LIBRARIES})
-                 else()
-                     # and if that fails, use the cmake module
-                     find_package(GTK2 REQUIRED gtk)
-@@ -447,7 +448,7 @@ int main(int argc, char** argv) {
-                     endif()
-                     include_directories(${GTK2_INCLUDE_DIRS})
-                     add_compile_options(${GTK2_DEFINITIONS})
--                    set(GTK_LIBRARIES ${GTK2_LIBRARIES})
-+                    list(APPEND VBAM_LIBS ${GTK2_LIBRARIES})
-                 endif()
-             else()
-                 find_package(GTK REQUIRED gtk)
-@@ -456,6 +457,7 @@ int main(int argc, char** argv) {
-                 endif()
-                 include_directories(${GTK_INCLUDE_DIRS})
-                 add_compile_options(${GTK_DEFINITIONS})
-+                list(APPEND VBAM_LIBS ${GTK_LIBRARIES})
-             endif()
-         endif()
-     endif()
-@@ -729,14 +731,14 @@ endif()
- 
- if(WIN32)
-     set(SRC_WX ${SRC_WX} wxvbam.rc dsound.cpp)
--    set(DIRECTX_LIBRARIES dxguid dsound ws2_32)
-+    list(APPEND VBAM_LIBS dxguid dsound ws2_32)
-     if(MSVC)
-         # workaround for some symbols needed by static SDL2.lib
--        set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} imm32 version)
-+        list(APPEND VBAM_LIBS imm32 version)
-     endif()
-     # not strictly directx, but win32-related
-     if(ENABLE_DEBUGGER)
--        set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} wsock32)
-+        list(APPEND VBAM_LIBS wsock32)
-     endif()
- endif()
- 
-@@ -783,19 +785,18 @@ endif()
- 
- target_link_libraries(
-     visualboyadvance-m
--    ${VBAMCORE_LIBS}
-     ${wxWidgets_LIBRARIES}
--    ${FFMPEG_LIBRARIES}
--    ${DIRECTX_LIBRARIES}
--    ${GTK_LIBRARIES}
--    ${OPENAL_LIBRARY}
--    ${FAUDIO_LIBS}
--    ${EXTRA_X11_LIBS}
-+    ${VBAM_LIBS}
- )
- 
- if(ENABLE_FFMPEG)
-     join("${FFMPEG_LDFLAGS}" " " FFMPEG_LDFLAGS_STR)
- 
-+    target_link_libraries(
-+        visualboyadvance-m
-+        ${FFMPEG_LIBRARIES}
-+    )
-+
-     set_target_properties(
-         visualboyadvance-m
-         PROPERTIES LINK_FLAGS ${FFMPEG_LDFLAGS_STR}
--- 
-2.24.0
-
diff --git a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
deleted file mode 100644
index a528a22e506e..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 619a5cce683ec4b1d03f08f316ba276d8f8cd824 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
-Date: Thu, 31 Dec 2020 00:22:21 +0100
-Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum
-
-Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value:
-https://hg.libsdl.org/SDL/rev/15a0bc9612e9
-
-So this code broke as the enum value doesn't satisfy `defined()`.
----
- src/sdl/SDL.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
-index ee8ae50a3..082b47c0c 100644
---- a/src/sdl/SDL.cpp
-+++ b/src/sdl/SDL.cpp
-@@ -878,7 +878,8 @@ void sdlInitVideo()
- 
-     sdlResizeVideo();
- }
--#if defined(KMOD_GUI)
-+
-+#ifndef KMOD_META
- #define KMOD_META KMOD_GUI
- #endif
- 
diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
deleted file mode 100644
index 8fe87b4e1480..000000000000
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg cmake
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-
-REQUIRED_USE="
-	ffmpeg? ( wxwidgets )
-	openal? ( wxwidgets )
-	|| ( sdl wxwidgets )
-"
-
-RDEPEND="
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		ffmpeg? ( media-video/ffmpeg:= )
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake_fix.patch
-	"${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208
-	"${FILESDIR}"/${P}-arm-asm.patch
-)
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-		-DENABLE_LTO=OFF
-	)
-	if use wxwidgets; then
-		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		xdg_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index bf18adacb8ba..dd4bb4591220 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/pvpgn/Manifest b/games-server/pvpgn/Manifest
index 7838ab352271..66850d961d60 100644
--- a/games-server/pvpgn/Manifest
+++ b/games-server/pvpgn/Manifest
@@ -1,9 +1,6 @@
 AUX pvpgn-1.8.5-fhs.patch 10813 BLAKE2B 849e2094ec0d313494046310028c63d01fdf5f377a33ec0779968a9d509d42fa7dcfd58fc23fa13809eff7d6e0baf25d97a88822c4a4d41c1f97a087e1077ed8 SHA512 4bb6f66f8499fce973ec9de2f6d30fe82c3965fa8aba2c257063abe8bc65a274f35ad1cd0ddedf9915747be0361d7a33ca1dae5faf2e71227c85d64f28aa6ed5
 AUX pvpgn-1.99.7.2.1-path.patch 1038 BLAKE2B 126f82bc49978c495688e4609ea7a001bbe77cf8b9a80f66b71181fb28ef1d897958f6c9ffee17b5b4bd6297e23ba25e7d4d4413b433f3d136330b22387b7a1b SHA512 012445bc577cce40a6b1799d5b02d7403fd73e54830f5576eb373d781ec487d0cc2743f4ab3f22cf523119ffaa472f4584ba2108c7f803fbe204f066d866f638
 AUX pvpgn.rc 885 BLAKE2B c0739177a13a2bddbe3cc82ad7bf87ff313faf0882159f7475c223ec76ef164ba572b048d05683bd02756d121e97efb04ec34fbd53ad856a54f6c23663fec6a3 SHA512 4b0a5d52e50bfde317ab3d9689aef6491b0dc8e3e94576c8ee7376c2118e3a315555a66b2aecb086914aec055011b7687eb1bdfea266423071098ac1151d0cdf
-DIST pvpgn-1.8.5.tar.bz2 982931 BLAKE2B 73c84278c5a7a13b781541f49a77af45d05950f0e378237ec0bfce3b4a55a94f91cfc2f994f56046e76c3dfb5d390427ee9cecbc21d1da048d2c503bfa21cf7b SHA512 7cbe141efe03efa4ce0fc1cc3b4e15afe2e85e3c83a27afdf36fec9e2dadf1c7b9aca1773e6a3e6566b62f5a7999cc040c9517786ca70eeb70f86eea84e9218e
 DIST pvpgn-1.99.7.2.1.tar.gz 1515818 BLAKE2B b4f5017b58e91785b199b700ced9e54bc7d953f2fe12696c931d44e5cad93f86eb77cff8fdc429e7d033f19d93ae895c192ce4c5a73beb7812c2f27f94bbeaf3 SHA512 b3b042c739b15b8460d9e0da1ed9f1fb6fb2db39046a23d7d30290b47b31e41de6c152023f0ab6dd92ce0c7b7483e6933509bda216cb0cb1260b5eed0bc874dd
-DIST pvpgn-support-1.3.tar.gz 123805 BLAKE2B dc051265c6d4c5a2ab69379f7ac4a57f402d25e8898020217f2ae5f12cb2ca4db860df47efe38ed6494eb040cbd52a7ed495bc3dab59c9e9e48a8e1386500d6e SHA512 9002fcdb7da92e84af97319b9f1e38f5cf97466aef88549b1fe81b9070643f321011adf674424e2c4acc22f847c7fc61ca2cbf2da0223842e9b9e6c8f1427d76
-EBUILD pvpgn-1.8.5-r4.ebuild 2434 BLAKE2B f466ddb175b3af77d8cd5c4d45fdeb32dba1eecb76c8f60b7997f339068cd66a7082d0e460da1b1fe38d073f37650fdfd806930b5ebd58b7ca00b1cf9ebdbfdc SHA512 8797306e15cff306a20bbf9b23b3d6e9634b58c8285b5c5aa77b02005804e70fa44aab955e88c809e76443473ae500fcc92179b8939c6415d948faef78367f4e
 EBUILD pvpgn-1.99.7.2.1-r1.ebuild 2746 BLAKE2B c6f8a790b11f475b2b48767aeea31c23ec6cfa948d14c67f948dd56153ae39eafca5c94632997863d485e3ec39a58d0adafc0685c3b5b129b2d09ab13202c168 SHA512 2e3df7446451608c5a9c2c1bd007b7aa115f70c6c39b4ddd1447d82a5e14ba25214b0e8b19cc589d7a0b6c5648a1165a3264b41c57f922b3bf0b9c066339623f
 MISC metadata.xml 395 BLAKE2B b8e5f9e085d755dbec33a1106b80da344cffd7bc8e5df827269bd91ae89756f233aef8fc0710833b530c618e5dee59d6ae0ea78e7dd27e9d6b6fe6b4f6cfc16b SHA512 588429d1917f53ceba35c335939e4f103eb81303f376478b0309c56f7f88fe013f493dfb53a3a6953c604af9aaa23e928e62411119293aa1f7e7c93a4e98ed1b
diff --git a/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild b/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
deleted file mode 100644
index 8d587fde8934..000000000000
--- a/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-SUPPORTP="${PN}-support-1.3"
-DESCRIPTION="A gaming server for Battle.Net compatible clients"
-HOMEPAGE="https://sourceforge.net/projects/pvpgn.berlios/"
-SRC_URI="mirror://sourceforge/pvpgn.berlios/${PN}-${PV/_/}.tar.bz2
-	mirror://sourceforge/pvpgn.berlios/${SUPPORTP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres"
-
-DEPEND="
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:*[server] )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/pvpgn
-	acct-group/pvpgn
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fhs.patch
-)
-
-src_configure() {
-	cd src || die
-
-	tc-export CC
-	# Was: "everything in GAMES_BINDIR (bug #63071)"
-	# Not anymore.
-	econf \
-		--sbindir="/usr/bin" \
-		$(use_with mysql) \
-		$(use_with postgres pgsql)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	local f
-
-	dodoc README README.DEV CREDITS BUGS TODO UPDATE version-history.txt
-	docinto docs
-	dodoc docs/*
-
-	emake -C src DESTDIR="${D}" install
-
-	insinto /usr/share/${PN}
-	doins "${WORKDIR}/${SUPPORTP}/"*
-
-	# Was: "GAMES_USER_DED here instead of GAMES_USER (bug #65423)"
-	for f in bnetd d2cs d2dbs ; do
-		newinitd "${FILESDIR}/${PN}.rc" ${f}
-
-		sed -i \
-				-e "s:NAME:${f}:g" \
-				-e "s:GAMES_BINDIR:/usr/bin:g" \
-				-e "s:GAMES_USER:pvpgn:g" \
-				-e "s:GAMES_GROUP:pvpgn:g" \
-				"${D}/etc/${PN}/${f}.conf" \
-				"${D}/etc/init.d/${f}" || die
-	done
-
-	keepdir $(find "${ED}/var/lib"/${PN} -type d -printf "/var/lib/${PN}/%P ") /var/lib/${PN}/log
-
-	chown -R pvpgn:pvpgn "${ED}/var/lib/${PN}" || die
-	fperms 0775 "/var/lib/${PN}/log"
-	fperms 0770 "/var/lib/${PN}"
-}
-
-pkg_postinst() {
-	elog "If this is a first installation you need to configure the package by"
-	elog "editing the configuration files provided in /etc/${PN}"
-	elog "Also you should read the documentation in /usr/share/docs/${PF}"
-	elog
-	elog "If you are upgrading you MUST read UPDATE in /usr/share/docs/${PF}"
-	elog "and update your configuration accordingly."
-
-	if use mysql ; then
-		elog
-		elog "You have enabled MySQL storage support. You will need to edit"
-		elog "bnetd.conf to use it. Read README.storage from the docs directory."
-	fi
-
-	if use postgres ; then
-		elog
-		elog "You have enabled PostgreSQL storage support. You will need to edit"
-		elog "bnetd.conf to use it. Read README.storage from the docs directory."
-	fi
-}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index e81f5e415a7e..bfb31eb6b23c 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
index 537e86bbd0ba..13ee6dcf51ac 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,5 +1,3 @@
-DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
 DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383 SHA512 ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c
-EBUILD megaglest-data-3.11.1-r1.ebuild 622 BLAKE2B 8442d613c7bb399394dfc2eb4b8113ee6677c417e2cb8b87283633f3ef9c2a91b3ac8bc1e9ca6191a4abf62896d0c54d95e1e99cd1d91dd07cb8305da9d366a5 SHA512 cc45ffc465d32cd741625e19d0bb5b273899ff1c3c95b3c9ad8b6635b43116ded4e101f6900b7b1f831577f91ade69b427182579d085f78399b0764cab21cebc
 EBUILD megaglest-data-3.13.0.ebuild 735 BLAKE2B c673c37e617fdfcb580555102528cd93eb67fd9cfb82643da88137dcf8d6a1d8b74bdc766f92bfc0aca5ee817635d68dbb86b356ae06e67bb4e601bbaccab50c SHA512 8011dca05ea8cfcd2cf2d2f3fe897225919cdf0504c27ae2a9181f49374397c0b38d6f744fe5c5fcad68ce785e8680a53306829ad99ca4605497a34d231214d9
 MISC metadata.xml 343 BLAKE2B 28d402d1670909a99503c02f9778a0686035f08273dfe5f03bc11f26cafefbf15bb2041ea20670e292877ae2a1983a685eb634c404786b59a721a6b11928ec66 SHA512 59ec858c8f0622fcd97211175a250f0e97bbbcc01cf1c2d9ed74e6717e1ac81589653f1edaf8edb38406753b380ba1ecdbbb0c90c085d8d39663d8635732f204
diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild
deleted file mode 100644
index 152c98954194..000000000000
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="megaglest"
-DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest"
-HOMEPAGE="http://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	use doc && HTML_DOCS+=( docs/glest_factions/ )
-	cmake_src_install
-}
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index 716c599711b4..2a46289f2198 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,10 +1,4 @@
 AUX megaglest-3.11.1-cmake-lua.patch 848 BLAKE2B ae918da49eb8bac6add4cd0df27f2e58cc632a3b5c3fc188fefd7152cbdff83e255bab9cdcd17580ef564ca99a88fc4715ed103001463981d7053d8338c3d5ca SHA512 33b1a3bb6fc0fed9cc30d5cd88aed4b738b831625e0d1a33cf11dfd0252b9bf8b5c2cbdfd1a8f62b4b683562e7d6fb824675850ac79ce7f74ce4d7e41feb7076
-AUX megaglest-3.11.1-cmake.patch 897 BLAKE2B 3076a11cbb18263aabfabdaadb4e201d26b7db6e55e32278c0f37ebd938ae8a41cccb906bcf30ff99a32f6ecb35d77512fd3904610443847d1e3bb3212122902 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc
-AUX megaglest-3.11.1-miniupnpc-api-version-16.patch 1336 BLAKE2B 66dd8eb198258ecc59e0f186f89976413e15d2d49314f877a4444ba598ab4cdaa00b18c3c8defe50f4da21d0b4557ac220e351b1d6c006032ae6bc5cfb054bee SHA512 c1f343f0987715aa7bded6f4dff85db1212e4b6e45c8ac6d27ea429e5698b39973e917c8ba3f1b25b3c60d2d0054608f036d89056263c09981ba6157ff75264a
-AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4
-AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
-DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c
-EBUILD megaglest-3.11.1-r100.ebuild 3993 BLAKE2B 9cac50646fc06f9a73bb233b91c460a1b6c876b1c9b7f1022bce037e854602dc33d86127fcb139d158f932a502bbd046d58dbff1cf3911ee2fcce337390303db SHA512 a95153df30b853b16d28202edadae744c8dbc1de026e5c2d04099d730a5a7414274169417982c482530e629cc0f7425b5511ff6b0166f625b649e8893dd2643c
 EBUILD megaglest-3.13.0.ebuild 3681 BLAKE2B 637c56194556b157e5eabf97051e27a3c988a92d52ba028299490ce5038fb9ff46186e2d59fc689931c4582789d5ef5738f79588c901b14c5ad2a211dc6d613d SHA512 36f9bd1b500ee3c5d05b0df26a862a11db2b7602ff87608a6af8b7191fe3b93def37c697879862fbf038900d1327510f8da64d6cb897a0abb2a5e5fcfc3935a6
 MISC metadata.xml 1622 BLAKE2B f4d7dddd0d654cefb22fe3acc00d366501a5fa93243bef3336965fffe2f8500f94eed915e5adf7655a8e1f7a28fcbc2fc49d99a2cdf2899173ffe819cdfdfa80 SHA512 5b65d3bf4ccf9619350293d3669e7a001fcb0f4addcb0c50f56c6ccba2239b87507a796a34d5fc5c3b2d144e740057496220aff2d0699a41db5f37ae8eaad2bc
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
deleted file mode 100644
index 527671246e98..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Wed, 13 May 2015 04:22:45 +1000
-Subject: [PATCH] Fix build with >=cmake-3.2.
-
-The FindOpenGL module no longer pulls in X11 libraries.
----
- source/shared_lib/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
-index 3da563e..e5a06fc 100644
---- a/source/shared_lib/CMakeLists.txt
-+++ b/source/shared_lib/CMakeLists.txt
-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
- 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
- 	ENDIF()
- 
-+        IF(UNIX)
-+		FIND_PACKAGE(X11 REQUIRED)
-+		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
-+        ENDIF()
- 
-         IF(WANT_XERCES)
- 	        FIND_PACKAGE(XercesC REQUIRED)
--- 
-2.3.6
-
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
deleted file mode 100644
index b0275156bda1..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac
-
---- a/source/shared_lib/sources/platform/posix/socket.cpp
-+++ b/source/shared_lib/sources/platform/posix/socket.cpp
-@@ -2610,8 +2610,10 @@
- 				if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
- 
- 				//printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr);
--#if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
--				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0);
-+#if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 16)
-+				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0, NULL);
-+#elif (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
-+                char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0);
- #else
- 				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])));
- #endif
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
deleted file mode 100644
index 112e734c6efb..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
-index a5d4b92..cb8ceb4 100644
---- a/source/shared_lib/sources/platform/posix/socket.cpp
-+++ b/source/shared_lib/sources/platform/posix/socket.cpp
-@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
- 		const char *upnp_minissdpdsock = NULL;
- 		int upnp_sameport = 0;
- 		int upnp_ipv6 = 0;
-+		unsigned char upnp_ttl = 2;
- 		int upnp_error = 0;
- 
--#ifndef MINIUPNPC_VERSION_PRE1_6
-+#if (MINIUPNPC_API_VERSION >= 14)
-+		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
-+
-+		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
-+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
-+#elif (MINIUPNPC_API_VERSION >= 8)
- 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
- 
- 		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
deleted file mode 100644
index 2586a561956b..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
-Author: hasufell <hasufell@gentoo.org>
-Date:   Mon Nov 18 21:54:54 2013 +0100
-
-    fix static build
-
-diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake
-index 2a026cc..8ca8a23 100644
---- a/mk/cmake/Modules/FindOGG.cmake
-+++ b/mk/cmake/Modules/FindOGG.cmake
-@@ -19,11 +19,11 @@
- 
- FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
- 
--#IF (OGG_STATIC AND NOT OGG_LIBRARY)
--#	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
--#ELSE()
--	FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
--#ENDIF()
-+IF (OGG_STATIC AND NOT OGG_LIBRARY)
-+	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a)
-+ELSE()
-+	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so)
-+ENDIF()
- 
- #IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
- #	FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
---- a/mk/cmake/Modules/FindXercesC.cmake
-+++ b/mk/cmake/Modules/FindXercesC.cmake
-@@ -83,6 +83,9 @@
- 	 /usr/lib
- 	 /usr/local/lib
- 	)
-+	
-+	FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a)
-+	FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a)
- 
- 	IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
-                 MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]")
-@@ -90,7 +93,7 @@
- 
- 		IF(UNIX AND NOT APPLE)
- 			#SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata")
--			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}")
-+			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY}  ${ICUDATA_LIBRARY}")
- 		ENDIF()
- 	ENDIF()
- ENDIF()
---- a/mk/cmake/Modules/FindFriBiDi.cmake
-+++ b/mk/cmake/Modules/FindFriBiDi.cmake
-@@ -28,9 +28,9 @@
- SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
- 
- OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
--IF(WANT_STATIC_LIBS)
--	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
--ENDIF()
-+#IF(WANT_STATIC_LIBS)
-+#	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
-+#ENDIF()
- 
- MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
- 
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
deleted file mode 100644
index 0ee6393c8030..000000000000
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2010-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# google-breakpad
-# TODO: fribidi, libvorbis static
-
-EAPI=7
-
-# src_install() currently requires this
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-LUA_COMPAT=( lua5-{1..2} )
-
-# Only needed by certain features
-VIRTUALX_REQUIRED="manual"
-
-WX_GTK_VER="3.0"
-inherit cmake desktop lua-single virtualx wxwidgets xdg-utils
-
-DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
-SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
-
-LICENSE="GPL-3 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# Older versions of megaglest-data install into /usr/games
-RDEPEND="${LUA_DEPS}
-	~games-strategy/${PN}-data-${PV}
-	>=games-strategy/${PN}-data-3.11.1-r1
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libsdl[X,sound,joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/gnutls
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	dev-libs/xerces-c[icu]
-	media-libs/ftgl
-	media-libs/glew:=
-	media-libs/libpng:0
-	net-libs/libircclient
-	>=net-libs/miniupnpc-1.8:=
-	net-misc/curl
-	virtual/jpeg:0
-	videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man
-	virtual/pkgconfig
-	editor? ( ${VIRTUALX_DEPEND} )
-	model-viewer? ( ${VIRTUALX_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-static-build.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-cmake-lua.patch
-	"${FILESDIR}"/${P}-miniupnpc.patch
-	"${FILESDIR}"/${P}-miniupnpc-api-version-16.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use editor || use model-viewer ; then
-		setup-wxwidgets
-	fi
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse3; then
-		SSE=3
-	elif use cpu_flags_x86_sse2; then
-		SSE=2
-	elif use cpu_flags_x86_sse; then
-		SSE=1
-	else
-		SSE=0
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_MEGAGLEST_MAP_EDITOR=$(usex editor)
-		-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=$(usex tools)
-		-DBUILD_MEGAGLEST_MODEL_VIEWER=$(usex model-viewer)
-		-DENABLE_FRIBIDI=$(usex fribidi)
-		-DFORCE_LUA_VERSION="$(lua_get_version)"
-		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
-		-DUSE_FTGL=ON
-		-DWANT_STATIC_LIBS=OFF
-		-DWANT_STREFLOP=$(usex streflop)
-		-DWITH_VLC=$(usex videos)
-		-DwxWidgets_USE_STATIC=OFF
-		-DwxWidgets_USE_UNICODE=$(usex unicode)
-		-DwxWidgets_USE_UNIVERSAL=$(usex wxuniversal)
-
-		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	if use editor || use model-viewer; then
-		# work around parallel make issues - bug #561380
-		MAKEOPTS="-j1 ${MAKEOPTS}" \
-			virtx cmake_src_compile
-	else
-		cmake_src_compile
-	fi
-}
-
-src_install() {
-	# rebuilds some targets randomly without fast option
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
-
-	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
-	doicon -s 48 ${PN}.png
-
-	use editor &&
-		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
-	use model-viewer &&
-		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
-}
-
-pkg_postinst() {
-	einfo
-	elog 'Note about Configuration:'
-	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
-	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
-	elog 'values in these files.'
-	elog
-	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
-	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
-	elog 'Some graphics cards may require setting Max Lights to 1.'
-	einfo
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index df94370f637a..a53ee5614531 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index d2ddb1da1262..5b4e4173bf75 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,8 +1,3 @@
-AUX opentoonz-1.4.0-fix-header.patch 374 BLAKE2B 3ba2857ceea33e5cbaff5e79a8e5790ef2e9813d4366211c155033cfed51e27cd8de61ab3dda1f7d005e1dfab6d43f90de099bd0121f537dc7d756b04f766a15 SHA512 ed4e34d75c43cb4de536ea0b662372edd43cb6f8221350b6214a0decaa9d0038901c86e78e3c55a77ae07956391f81b6ce2834a4498472a7adf5cad101fd8feb
-AUX opentoonz-1.4.0-qt-5.15.patch 543 BLAKE2B f4000bf965cbf2f8723b8a05a69f8bdb3ee83180ddfef59d9830d3321ca22aef3bfc0632ebe7a58a87085bc5d0e2a625f519e64726a448f0ab03ec50dc22c9db SHA512 34d0b641aa27ee0b218e2c9c00da3df1ac1f69ca34c56e1d92f1abd1ccb05fc4a2d59097b9fd1ec2a9d0fd9bdfdddcfc64df0d86215ee18dcee467fc0cca14bf
-DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
 DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9
-EBUILD opentoonz-1.4.0-r1.ebuild 1939 BLAKE2B 24aec475c6629c1fc5f55154473efc92e6c6ceb30c835c89a9a3f5bdf2d1b1093d8c76ead7995bd3934b8b9e5750a6ba6581af174667525beeb8d262e2027816 SHA512 4a8fdd5f5e0e682aae2eadd375ccf9e1e6ee1adf6774388ecdd8f6e0fe05edeec29289c4211a6e774e940685160fd64e291e2da0967c0aecdbf7dc3dac6a4532
-EBUILD opentoonz-1.4.0.ebuild 1808 BLAKE2B 4f7afd3c03cad0af76e203e03c95241d1ff4938232f93ba1b940c6a4132add71356ea0e46ee8f5a58cca76abb7d57e1b02400423052b44d1be1ab359317e60a4 SHA512 8caf8fa2241d0d33abddfd7e36ed2dfe68afa8d446afeb2b238b094e3042fc02d30bfbe1e103aecf5511e71d6bbe770299f510b4a76f1891f0f16efad78ce7ef
 EBUILD opentoonz-1.6.0.ebuild 1964 BLAKE2B 6afa50e8c6b720d2ce925c7f9f1fc8a7979fc92b3a758daa49cadf4ce4913dd2945cfa2c75dff3c12649f540af3fd38c36eeb520cc0fa4a78756a37e53512dae SHA512 e8c0dba3ee7d940d47d6efe8b7ea7fc8aa04b9399d3f15155dbaa745f7cec9787772bae2156db77e565b100b7ce6b66bc7cc3c89ebd96dcf9dd88861b5fed4f3
 MISC metadata.xml 484 BLAKE2B 3850af092b035bf6ef637fcf1d09fa79526011ab3629a6e918f952bba06de73b21a0ca3dcb2e6532faaab444404d3e767bff25d59c042650a4ab9b356c1f5a2e SHA512 5daa54628d2d677dc10934d3d43b1df1972f5515461bdaaa0684d4f9f26fb2b065f3fa64a3f0eed8403570ab64a919b7831269dcc68638b7da2e3d40730c01dd
diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch b/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
deleted file mode 100644
index 299c927a5817..000000000000
--- a/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/723946k
---- a/toonz/sources/common/twain/twain.h
-+++ b/toonz/sources/common/twain/twain.h
-@@ -2209,7 +2209,7 @@ typedef struct {
- #elif defined(TWH_CMP_GNU)
- #pragma pack(pop, before_twain)
- #elif defined(TWH_CMP_BORLAND)
--#pragma option –a.
-+#pragma option_a.
- #elif defined(TWH_CMP_XCODE)
- #if PRAGMA_STRUCT_ALIGN
- #pragma options align = reset
- 
diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch b/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
deleted file mode 100644
index 1a4f54e2ebb4..000000000000
--- a/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/723946
---- a/toonz/sources/tnztools/toolutils.cpp
-+++ b/toonz/sources/tnztools/toolutils.cpp
-@@ -42,6 +42,7 @@
- #include "tools/strokeselection.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGLWidget>  // for QGLWidget::convertToGLFormat
- #include <QFont>
- #include <QFontMetrics>
---- a/toonz/sources/toonzqt/functionpanel.cpp
-+++ b/toonz/sources/toonzqt/functionpanel.cpp
-@@ -28,6 +28,7 @@
- #include <QWheelEvent>
- #include <QMenu>
- #include <QSettings>
-+#include <QPainterPath>
- 
- #include <cmath>
- 
-
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
deleted file mode 100644
index 4d3987c46011..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/lz4:=
-	dev-libs/boost:=
-	dev-libs/lzo:2
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libmypaint-1.3.0:=
-	media-libs/libpng:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib
-	virtual/cblas
-	virtual/libusb:1
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-fix-header.patch
-	"${FILESDIR}"/${PN}-1.4.0-qt-5.15.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	CONFIG_SHELL="${BROOT}"/bin/bash econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake_src_compile
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
deleted file mode 100644
index 21ad1ad85bc5..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/lz4:=
-	dev-libs/boost:=
-	dev-libs/lzo:2
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libmypaint-1.3.0:=
-	media-libs/libpng:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib
-	virtual/cblas
-	virtual/libusb:1
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake_src_compile
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 95e0fae4ba3e..f5b196d4f811 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index df0187c3ad22..8d207db52269 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,13 +1,7 @@
-AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493ee81a3c18e7118658b76ad5a41f31626cf0099b8bc7bb2fec83ef64c7ab6feb4fe01994cf106440d7a284d5af66b06b2a5ccb086d9 SHA512 128e420ae01246f46deab243bf09e4a0012935e34d5273792c22538bc9353641203450388c19aa5a7670d0f1a3a40e1d4e31a550711f64c8e2d4d0b0e6b3fba2
-AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
-AUX assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d
-AUX assimp-5.2.4-update-version.patch 932 BLAKE2B 641c1c745b385acf83ddbc2c3e1d21b40b43a68934bbb637aba3a61b626668c423c6bc81d4e2a94cf602a24d9a6fef89b96fe56696c925b88531c059f7240f1a SHA512 68e14391feecac4fc8ae91cedd9a902d593d3d964e7827fd9661277bd39c5de64f97a832247cfb5cd807a75d07016820caad75e70e6e04a7714ba3422206013a
 AUX assimp-5.2.5-disable-collada-tests.patch 798 BLAKE2B 302c2ea2a1152f7bcf71d82378991a2a7259e1a4d81808499b163156ddec2351f441fa7db17886977b1e51c10ba7db70ea68d4cdfcfd2dccea9d0cc06082f429 SHA512 36164420838a5bb21c11dbc3955158b07d561e2da944017a6ce65fd9eab399ddcaddeaa3031727d977a283c2af4dbfec611507251e6a91f6ad475d5ef3763a08
 AUX assimp-5.2.5-disable-failing-tests.patch 3612 BLAKE2B 08dd1585e0d5ea37f5b52a88d364f48865f3b8032eba3cbd875047b7a07a5d9df658631cb5649dc6688112a9ec8809d9dfe75959711b0238b78ed01a5bc2eeb9 SHA512 cef65009eaf04cef82c22d86273dc63a30ae32ecf352b9ce9bfc61ecd9b9c67415d4162a02ffad5337d3d2af4f594b6f4387ad68fb4b4c78500d7ea1a3d42b82
 AUX assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch 5237 BLAKE2B 04f0cf86616afcf0e050ae9d8caf956b389362a667a370a1bfc523b428990e09481c92946cf252c04259d69b1718087aa24c65e645f19a86339fd1d4f359a505 SHA512 76fa57de33bb93722d9c83af7c706a99a3a9e76f1136b63edc7ba4036fd75ada9d7d6df2060563f56963a6ec971023944d6701319bb1c810fd2803fb4fb4afc7
 AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae
-DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
 DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
-EBUILD assimp-5.2.4-r1.ebuild 1372 BLAKE2B d8b3b36c33040a4db2bf2e1496a4fc1fec68be1cb8bf6e39db36753da297c88d5d1ac6d638697bfe8ad0a526c4bf8aa275eec28b8b03d16499dd952e766f3780 SHA512 8a6880e26604ed4c74818ad15140b44346dfc5b0983a7c410d33fd78ab1380448ae36292266f7c54e5bf635aaf4fa284f63fb9b677571d74c9d76e9efabee727
 EBUILD assimp-5.2.5-r1.ebuild 1581 BLAKE2B 5379bd0912873efe04c375844cc6b8be15731128d4744b9153e3a8de285798b7f6339a0c678dda6d30e7647760ee231daf8f08b5a342f3f9e45a5ee428d81f67 SHA512 235f93bea9e1a0c9aef5266b37a7d225512e245a26a06c328d36d95f23636c1d20592c53102a440de5866254b170562169c7410e36b0fb760521dd7d7f5442ed
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild b/media-libs/assimp/assimp-5.2.4-r1.ebuild
deleted file mode 100644
index 135d40e3ca95..000000000000
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/5.2.4"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
-	"${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
-	"${FILESDIR}"/${P}-update-version.patch
-)
-
-DOCS=( CodeConventions.md Readme.md )
-
-src_prepare() {
-	if use x86 ; then
-		eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_ASAN=OFF
-		-DASSIMP_BUILD_DOCS=OFF
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-		-DASSIMP_IGNORE_GIT_HASH=ON
-		-DASSIMP_UBSAN=OFF
-		-DASSIMP_WARNINGS_AS_ERRORS=OFF
-	)
-
-	if use samples; then
-		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
deleted file mode 100644
index 3c423ac5107a..000000000000
--- a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 11 Mar 2022 11:24:13 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
-     aiMatrix4Scaling(&result_c, &scaling);
-     EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
--    // Use predetermined vectors to prevent running into division by zero.
--    const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
--    aiMatrix4x4::FromToMatrix(from, to, result_cpp);
--    aiMatrix4FromTo(&result_c, &from, &to);
--    EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
--    const auto qvec3 = random_unit_vec3();
--    result_cpp = aiQuaternion(qvec3);
--    aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
-     result_c = result_cpp = random_quat();
-     EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
-     EXPECT_NE( aiGetCompileFlags(), 0U );
- }
- 
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
--    EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
-     EXPECT_NE( nullptr, aiGetBranchName() );
- }
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
deleted file mode 100644
index 6d48161646ef..000000000000
--- a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From https://github.com/assimp/assimp/issues/4334#issue-1097591121
-From: Brecht Sanders (@brechtsanders)
-Date: Fri, 11 Mar 2022 10:01:15 +0100
-Subject: [PATCH] fix usage of incompatible minizip data structure
-
-Suggested-by: Brecht Sanders (@brechtsanders)
-Bug: https://github.com/assimp/assimp/issues/4334
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/code/Common/ZipArchiveIOSystem.cpp
-+++ b/code/Common/ZipArchiveIOSystem.cpp
-@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
-     zlib_filefunc_def mapping;
- 
-     mapping.zopen_file = (open_file_func)open;
-+#ifdef ZOPENDISK64
-     mapping.zopendisk_file = (opendisk_file_func)opendisk;
-+#endif
-     mapping.zread_file = (read_file_func)read;
-     mapping.zwrite_file = (write_file_func)write;
-     mapping.ztell_file = (tell_file_func)tell;
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index fba27be45315..000000000000
--- a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-https://bugs.gentoo.org/840767
-https://github.com/assimp/assimp/issues/4438
-
-From 48cb5451383855755debfc17cb5e3428cba2d94e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 21 May 2022 17:37:04 +0200
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-Drop two additional test wrt 5.2.3
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
--    const auto q = random_quat();
--    result_cpp = q.GetMatrix();
--    aiMatrix3FromQuaternion(&result_c, &q);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
-     result_c = result_cpp = random_mat3();
-     EXPECT_EQ(result_cpp == result_c,
-@@ -127,14 +120,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) {
--    const float angle(RandPI.next());
--    const auto axis = random_unit_vec3();
--    aiMatrix3x3::Rotation(angle, axis, result_cpp);
--    aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) {
-     const auto axis = random_vec2();
-     aiMatrix3x3::Translation(axis, result_cpp);
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
--    const aiVector3D s = random_vec3();
--    const aiQuaternion q = random_quat();
--    const aiVector3D t = random_vec3();
--    result_cpp = aiMatrix4x4(s, q, t);
--    aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
-     const aiMatrix4x4 temp = random_mat4();
-     result_c = result_cpp = random_mat4();
-@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
--    result_c = result_cpp = random_mat4();
--    EXPECT_EQ(result_cpp.Determinant(),
--        aiMatrix4Determinant(&result_c));
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
-     EXPECT_EQ(result_cpp.IsIdentity(),
-         (bool)aiMatrix4IsIdentity(&result_c));
-@@ -228,14 +213,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) {
--    const float angle(RandPI.next());
--    const auto axis = random_unit_vec3();
--    aiMatrix4x4::Rotation(angle, axis, result_cpp);
--    aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) {
-     const auto axis = random_vec3();
-     aiMatrix4x4::Translation(axis, result_cpp);
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -54,19 +54,6 @@ protected:
-     aiQuaternion result_c, result_cpp;
- };
- 
--TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
--    // Use a predetermined transformation matrix
--    // to prevent running into division by zero.
--    aiMatrix3x3 m, r;
--    aiMatrix3x3::Translation(aiVector2D(14,-25), m);
--    aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
--    m = m * r;
--
--    result_cpp = aiQuaternion(m);
--    aiCreateQuaternionFromMatrix(&result_c, &m);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
-     const float x(RandPI.next()),
-         y(RandPI.next()),
---- a/test/unit/AssimpAPITest_aiVector2D.cpp
-+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
-@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
-         (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
- }
- 
--TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp += temp;
--    aiVector2Add(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp -= temp;
--    aiVector2Subtract(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
--    const float FACTOR = RandNonZero.next();
--    result_c = result_cpp = random_vec2();
--    result_cpp *= FACTOR;
--    aiVector2Scale(&result_c, FACTOR);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-     result_c = result_cpp = random_vec2();
-     result_cpp = result_cpp.SymMul(temp);
-@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
--    const float DIVISOR = RandNonZero.next();
--    result_c = result_cpp = random_vec2();
--    result_cpp /= DIVISOR;
--    aiVector2DivideByScalar(&result_c, DIVISOR);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp = result_cpp / temp;
--    aiVector2DivideByVector(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
-     result_c = result_cpp = random_vec2();
-     EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.4-update-version.patch b/media-libs/assimp/files/assimp-5.2.4-update-version.patch
deleted file mode 100644
index cc70165bc2e0..000000000000
--- a/media-libs/assimp/files/assimp-5.2.4-update-version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/assimp/assimp/issues/4655
-https://github.com/assimp/assimp/pull/4656
-
-From 304b0f61d7c9ef7e2e5ca2eed185b32a2951aa90 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 30 Jul 2022 09:39:12 +0200
-Subject: [PATCH] update version
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
-   add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF()
- 
--PROJECT(Assimp VERSION 5.2.0)
-+PROJECT(Assimp VERSION 5.2.4)
- 
- # All supported options ###############################################
- 
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
- }
- 
- TEST_F( utVersion, aiGetVersionPatchTest ) {
--    EXPECT_EQ(aiGetVersionPatch(), 0U );   
-+    EXPECT_EQ(aiGetVersionPatch(), 4U );
- }
- 
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
--- 
-2.35.1
-
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 381505bee0c5..8cc135ad9247 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,11 +1,7 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
-AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
-AUX exempi-2.4.5-gcc11.patch 346 BLAKE2B 022ca9284b3415b2a24c1aca421488e0741cd42784cdf1c24753d5a3941274f4adad87474e72f45286dba907641101d27ca5047cfa6e8f3b36dfba470db14f32 SHA512 2ca5dc6f1147c11a8ce4911b5b5b6d52ffedc6925ea2c13bd46e074320020b3e7ef52bc405fad9214a35fc47e8087f49258660750e65f168afc8517c49629947
 AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f99250c9c755c5650d38a4d427125b60245dbfb79cf4d94ad135f043ddde956d3241c091f901d7243b99d26c70c88af44414a7b674 SHA512 49004cea850f2e51a4266a574e7453e21afe1a7032e7a925717c7b0df3bbe187c5c0b79dddabbd002ce662fe4055171cc72ddff6985f611cc4b8c3280dda1fc9
-DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
 DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
 DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4
-EBUILD exempi-2.4.5-r1.ebuild 1200 BLAKE2B 2be269505b74dc4c0d8a2f2f05a0f99a2796b9a09a9711fd2e64926daa5c9126822c0e9e6e3550fe421a272c597dbfe74283c389b887b1001722198f15282616 SHA512 600901867f7a75d18fc727df7f379bf3e0c9b4a1dfbda64f157299347e6d3a50377951db7ea4ea056ab40559e3b1ab3b45810abfcda2169bd9723b6d4943746c
 EBUILD exempi-2.6.2.ebuild 1367 BLAKE2B c14b4815a8745d6a8bad3e3539ab033c2151611b8dddf382df5649f67d758c52c1c05c2c62d5efa95b339c79b2c76c1d2023c49d9dc0e6a449a5ba6c2fbe9ac8 SHA512 558a7ecde81272289d1932b1a8e64b0f00b9f45cdedb83cd8e0cc10f0d7d291227b1816d87bf9e92b908bd6de1a41a1c021bbb8776e69c10d7b9ed5a86266f94
 EBUILD exempi-2.6.3.ebuild 1314 BLAKE2B 1b6d927a65658ebab5020ebdfcc4e20c569430e199c17d4949bc2413a5d20d66821cbe6cb5b9e5ed6a1e3fa10825ffcbc6fe56970998dbfd7cd48fd300f55951 SHA512 724bea0088f40a55e62fc56d256dd6345d8eda22a50bca7ec63816bfbfd9edd4572f6269123aefa2deb8d919496ff91b089c64c20c246c2aaabace90d5a69055
 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
deleted file mode 100644
index 9d36d341cc38..000000000000
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/boost )"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	"${FILESDIR}"/${P}-CVE-2018-12648.patch
-	"${FILESDIR}"/${P}-gcc11.patch
-)
-
-src_prepare() {
-	default
-
-	config_rpath_update .
-	eautoreconf
-}
-
-src_configure() {
-	# Valgrind detection is "disabled" due to bug #295875
-	econf \
-		--disable-static \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm samples/{,source,testfiles}/Makefile* || die
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
deleted file mode 100644
index 36f0d0734350..000000000000
--- a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
-From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Date: Sat, 18 Aug 2018 13:54:55 +0000
-Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The WEBP::GetLE32 function in
-XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
-NULL pointer dereference.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=106981
-https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
-
-Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Signed-off-by: Hubert Figuière <hub@figuiere.net>
----
- XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-index ffaf220..4fe705b 100644
---- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
- }
- void VP8XChunk::xmp(bool hasXMP)
- {
--    XMP_Uns32 flags = GetLE32(&this->data[0]);
--    flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
--    PutLE32(&this->data[0], flags);
-+    if (&this->data[0] != NULL) {
-+        XMP_Uns32 flags = GetLE32(&this->data[0]);
-+        flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
-+        PutLE32(&this->data[0], flags);
-+    }
- }
- 
- Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
--- 
-2.18.0
diff --git a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
deleted file mode 100644
index 259c05d5cbd2..000000000000
--- a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/XMPFiles/source/FormatSupport/P2_Support.hpp
-+++ b/XMPFiles/source/FormatSupport/P2_Support.hpp
-@@ -79,7 +79,7 @@
- }; // class P2_Clip
- struct P2SpannedClip_Order
- {
--	bool operator()( P2_Clip* lhs,  P2_Clip* rhs)   
-+	bool operator()( P2_Clip* lhs,  P2_Clip* rhs) const
- 	{  
- 		return lhs->GetOffsetInShot() < rhs->GetOffsetInShot();
- 	}
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 7e5cefd0937b..ecb5f19120c7 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,5 +3,5 @@ AUX lcms-2.13.1-fix-configure-bashisms.patch 544 BLAKE2B 8b129f74cea00033a5cf02c
 DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
 DIST lcms2-2.14.tar.gz 7406694 BLAKE2B 777b0bf65829121a3d32bca1ab936ac022f9af739bccdd02d5f86688c3386b974f526a012bdec4d36649566eea0aa659db317dd383eede6488236d601156a0f9 SHA512 92fba0a457ea81590eba0b8d98b7b621da6a83e3857948585e0b524235954954f9ac1670cf6a19b457c0fce22a87899ea4c5810db1ff2acf7c6b6e0dc4b61a1b
 EBUILD lcms-2.13.1-r3.ebuild 1512 BLAKE2B fb15df98139327e95c3accca2ee48c0d8acd2c2eb7fd84b9ec3b200c49231ac513c531fd13444b58857970c6ba653cdedc417fcb5c8c2995581b5b07cd1e8b4a SHA512 0510bf343478291fead3e4e69bd74c5ba84eab1539e3e8e7cb78ccd56402ce42d6054baf501b1c9df5802131d18667121087b16aad1d4bb5868daf138778c307
-EBUILD lcms-2.14-r4.ebuild 1370 BLAKE2B 8a70a2f6f9f3ffe367be16ffdff2f3e6e9bcd73d262e363e208e014139ebdb5cd85fa370b7bc1537e4b54f7d707e91076415e311b81d45a8b3ea2bf51fc9a874 SHA512 5e6efceede74d72498ad2077eecc15ad988d6c7a1bb858745c6f746b74bcb7e3036494f1621f998586ef58878fc4a0bc5cb3fdc8f7df7633507ef71c3c8f71da
+EBUILD lcms-2.14-r4.ebuild 1362 BLAKE2B d8e7afbe30d08b3df83227a2f8a5c8f80d1d1105b1e808d6cec2238673173e34e572595062a9a205c78129c96c1df9271473bad1807fa6b5b3c407eb216bca90 SHA512 fc98c4e548540aa8c46afc44f940375ed05d5d5dd8a4828e4c0feb5541a5a94b24011cd0b0796e83c6e978c3c355a212f53290d2c68bfc1deeedb69b064a7aa6
 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/lcms-2.14-r4.ebuild b/media-libs/lcms/lcms-2.14-r4.ebuild
index 3260cab550d5..6b1fe0d4e1e0 100644
--- a/media-libs/lcms/lcms-2.14-r4.ebuild
+++ b/media-libs/lcms/lcms-2.14-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/lcms2-${PV}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs tiff zlib"
 REQUIRED_USE="tiff? ( zlib )"
 
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 4ed86f403396..65593f8d01bf 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,4 +1,6 @@
 AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
 DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
+DIST lensfun-0.3.4_rc1.tar.gz 1045616 BLAKE2B fee14b97dcda98be4e8a32443ff71347ba75e46192f8437be580cb6697f6ef2eca92ef57cfcb2de5bd87fe7ba96542a6b5551b12f50fec09a035c69d6f4b427f SHA512 0d034c6996e5650b022d33a7e00ef7e0e00dfa99155aa62c6c3ab48b9ac936e46f812ceea46e2070514e2c77150a1d7c827831686b1cf73e2acf88b6b3dfb6c5
 EBUILD lensfun-0.3.3.ebuild 1487 BLAKE2B aa5bb2f7e99444876507f8899fbeab603930c8973a7ef61a51b589688ed66d9203114f78debac49bee49ef83fc7c9b1b5a2e1a5347ef4ef73f8f2b761c74fdbd SHA512 0361c7d354e6680c886163793a2e32ef1367be3aa8310ef0b83708c364a40e2263526d9b733d39f06fe63fca1277f5fe3cd7455f07a2839d50148ba3a54c3247
+EBUILD lensfun-0.3.4_rc1.ebuild 1485 BLAKE2B 5a1e2cccae8f10c94bc5e52e934a43504b93d3f7b73ad6c43ace6f7eeafced37c408e1991a396ef6be7ef4d96d00eb136d87e3cd5d01fcfc4bb47456b6314daa SHA512 7c1f09f3c2e0e1032b31a45d8ca5517ff3a4663b11ce4427d34a2dbda6f981730a953d56daea7731b018d0aa6fbb92aaca7ae85372c31810ae6764b6aa30679a
 MISC metadata.xml 716 BLAKE2B 866b92afec30235731857799268948cf0d63be654432c72bf6a93084d2e344d486d0156571e08accfce4c9323aee6e7f155620d2e7a72ebfe69ef27b39bb13cb SHA512 fa3c54e5ea453bcefb5e9b9c76c3a45fa74280ba52b713ac93aa5a95341dc0f9111130b1952bc0a4b3b7898d5d0bde46234e1b42453757ead0c42c002141e6c4
diff --git a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
new file mode 100644
index 000000000000..cbdf5c801f2a
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake
+
+DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="https://lensfun.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV/_rc/-RC}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_rc/-RC}"
+
+LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.40
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/docutils
+	)
+"
+
+DOCS=( README.md docs/mounts.txt ChangeLog )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DSETUP_PY_INSTALL_PREFIX=/usr
+		-DBUILD_LENSTOOL=ON
+		-DBUILD_STATIC=OFF
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
+		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	mkdir -p "${T}/db/lensfun" || die
+	cp data/db/* "${T}/db/lensfun/" || die
+
+	XDG_DATA_HOME="${T}/db" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 9ddc546faf8b..20421d21271c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index a8768020313e..11da9bb63aa6 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -4,6 +4,6 @@ DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 0edc617690adea48d4cd253a28aa56906684a55272630a9163b2573887afad4fd288bd9db72133494ac9cb58cb9415b9195415d61671430e4a1c19f63e833df3 SHA512 8710249d67c5c48dc4c9788ad8e0fef7a6ace8b52306da1b900a3098227115c547ed3b86b2389c32798df3d13bfa7a458303d8e0266258ffc205f7387823572b
 EBUILD mpv-0.35.0-r1.ebuild 7715 BLAKE2B 697a5320c5f572b7932894656313661c99d0ccc8824ba40d23de535824ae4a48ba93dc34f64f341e901f190a5fa8d32b8303839bb10eab9f7a9891da899180ad SHA512 6bb601e58c4c5cbc161d6dc71f253557c17359d7c1bb0505d0db407fda2b259c519cd98eb268608ba8054034c2ff9312596505044c1d75d85b3d51160da73e1f
-EBUILD mpv-0.35.1.ebuild 7643 BLAKE2B c2159d39091b7d9049e251db6596d0bb0091e2ea17616e259adbb3d9d678c4db0a6a139cfa148cb0f17a8b10b43c21f9468a51efffc9d24f41d82512add2a192 SHA512 945065d726cf0ac2c533a4eb43cf24fdd3df88bcf0c966c576b097af3179a660a481cf814b5ecbe98264ca572532ca761e94b3ae1bdc5b492589470b250b53a9
+EBUILD mpv-0.35.1.ebuild 7640 BLAKE2B a7c228e90d81e7917bb36ceeae60a6fe987f235e00a5798c6d4ae9122951606344c506fc03141f19fe0e06eb7a60e9a5d58a66ed04aadf28d99ad87ea52d7376 SHA512 5a6dcdab8db370aac623f4be8137929a57c61c014a7735c8d673554c39299c7683c412a992a5a9978713fbb833759252507411e772485f204d92b658572351e2
 EBUILD mpv-9999.ebuild 7753 BLAKE2B 011fd532b44331999e86d367a879218656985264d57b59ac409a5fcb899686a06635c56af0145169bc6b02cb7cf70988df95c20740b4039303e654aa70fc0ea5 SHA512 48fe671969b3ada26769dedfb7f8a7829758bb19501c97b855809f149e83096898c22985785066e965c29933c4101aa6d501bf958a283941881113aa7b406723
 MISC metadata.xml 2537 BLAKE2B ce08ff18966b0937d5c1564a32d8da1225d603626d02b081f8a236531683890770d134fb7898a208bceffeb7ed2d1cabf34f4d211a97d1d0d95287830b93ddbc SHA512 5dc6cdacffed6f751a05d261a23e765cf3eaa16bd0757853635da977176666f5fc75f0a6c759ccbfcfdd63c2732a0b53858f0379d5f3437bcd9b40a7cb82f59c
diff --git a/media-video/mpv/mpv-0.35.1.ebuild b/media-video/mpv/mpv-0.35.1.ebuild
index 9a41edeb58eb..859d7bb46c7d 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.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/metadata/Manifest.gz b/metadata/Manifest.gz
index 9fac20c8a178..d04dbac60f37 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 047a4c5c7448..3d076c4933a3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Feb 2023 14:43:22 +0000
+Tue, 07 Feb 2023 20:39:39 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 593c02943c92..fc54b42e93ae 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-02-07T14:43:25Z
+TIMESTAMP 2023-02-07T20:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPiY41fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPitw9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWkw//dAkJEaOl4l7dHPqgaDdKkDlu0yMyGiI2RAIypsdU4uroMWhp7bja9SKb
-Q2f7WRICCpkYqjG65WbPdXgoXt+ve1wp/TkfXTttZCVoX0oNi6BDPvuYUtxNx23I
-ZolpBEfb9glu0+rD1vH5hF6IGH+7F/wA+/jEckU1WA+XvQLOKgGEH4DoYFmvU9Te
-ib5o1XUM/G6X3K4vz36/euHdun3CW2HvbmIxuqCK1p+QcNvrwPf8wdtyD/QmomkC
-J4anJgrvW2CEYORx0Mk9L7mXqGmiuFe7lCzJ3+mLNdnlXna4yVXlPojG7bIXe5lH
-ygp4AeV6UuhwTGbFljGnPTpc9IJ63TTXIKxCktzMKgxPM6MKsT/RdLvIzSCAriy3
-rcF/ZfT7XrkIALlMXfujQXJFzH/jl6ujQ9DkswEHKe0s8buH1LeWkkjlQxQM94We
-xHJDIJmbJYips/S8V7tbIc81MVME2rIV0wXihaSHirYb9AkJ8RIyaMNiLNOAgj0n
-Xo423Ga1ztXet44CRbI8nd7gj+rU0bmHV0Y5bflGUhARZ7Cju+lg14zE8Mw/M/Oi
-cIcdGq40L4zHwsAA1BteB9nYptwlasfsGa7SDfrPSJtC1GQDFxj8cxK/6nm50U5/
-PR8czwVc2zbHoZ+J6S+pzrSaNYBWwEClinbsebx3HrFfdniwdFc=
-=6JON
+klDEKg/8D57etw+HxpnB9bffa/diiQjIl8KONrwudTPt5cbIuDpoSd7TCg+F6EHu
+BEYJlnvB/GiVCc8Szxh8zcKoFdla1jf17AaTAejdzzsT1Wh4+6SzZFp0Jgus0xWQ
++Ec4WcmMWGXN7fEyRj1ua1ZbIXkUhm5ukWSW9WLONo4MYkVjOTYZSMNWvuArisq0
+DNeyABwsv7ZhQvDP0diuY6Oj4wVLwtCfJEFo86KEjHUfw6nGrvy2dEJV5ex7Ru1K
+6zM7JsonMVOFfAFFjziz9fsno45qkasQHvj6dsF1VmkV7K54neN87gZKohq8QtHc
+ftRNe+TOE/Q8fKc2B/DMMZ+O62FbJ5SqT5susmRwiegIRVGFCNi6c0pdfkwxb8M/
+46DRZVF9EvRiR1HOeYbgdf1L47j5SOo06TL4mH0qUOwBP4LsuwqMLOc1/GNathCT
+WvxLdlHhsQLA8BCbRAXqKnvGaK8AQBEdsFawjkgwe+pDbBiTGn/eW9x0oPO2N4vh
+TY0W71RpLkHMfwf6o55Nsl1jK7dJNwrkZNZtDghsrBEJ5QebhG1Ov/wf8TADNgVo
+IgCdL6agd21KZosfPMyi+lxab0lQ798XjSmJ7S7ZK+6Zh5HUPuIJQVZ5fzZnoi3A
+uiJo/7Ympt8sCGF13l/ime6uAmfKOGeOUfntPD+YxyLAzwmyRYQ=
+=Gh+c
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 047a4c5c7448..d6c31f93eb99 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Feb 2023 14:43:22 +0000
+Tue, 07 Feb 2023 20:39:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 03bd631c6a23..df9530ab2854 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index c48b82118a46..4dd1e0cd3e75 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0 b/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0
index bc3c3d58fda7..5a4ddd2032bf 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://developers.yubico.com/yubikey-manager/
 INHERIT=distutils-r1 verify-sig
 IUSE=ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=app-crypt/ccid dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/cryptography-41[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fido2:0/1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyscard[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ssl? ( >=dev-python/pyopenssl-0.15.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.0.0.tar.gz verify-sig? ( https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.0.0.tar.gz.sig )
 _eclasses_=distutils-r1	5805686d488d821ed8d8d9367942c0f3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=e6f93a4cf7eef4f4cd6cc81125fcf807
+_md5_=bcf3feb065dc3a934245ace422a2872d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 763677702b63..99e382aa2d64 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/texmaker-5.0.3 b/metadata/md5-cache/app-office/texmaker-5.0.3
deleted file mode 100644
index 251fed9e5a52..000000000000
--- a/metadata/md5-cache/app-office/texmaker-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A nice LaTeX-IDE
-EAPI=7
-HOMEPAGE=https://xm1math.net/texmaker/
-INHERIT=qmake-utils readme.gentoo-r1 xdg
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
-SLOT=0
-SRC_URI=https://xm1math.net/texmaker/texmaker-5.0.3.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ee62044dbffd6699664603fdbbf132c3
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 399b6aa0b105..a694b1a07d05 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/sigil-1.9.10 b/metadata/md5-cache/app-text/sigil-1.9.10
deleted file mode 100644
index 477de05fc69e..000000000000
--- a/metadata/md5-cache/app-text/sigil-1.9.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk] ) dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) ) system-mathjax? ( dev-libs/mathjax )
-DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
-EAPI=8
-HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg cmake python-single-r1
-IUSE=+plugins system-mathjax python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) ) system-mathjax? ( dev-libs/mathjax )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.9.10.tar.gz -> sigil-1.9.10.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=817d5f8d6be239874552c9756fe84db4
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 5343e0322e3d..b4632dd3626d 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0 b/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0
deleted file mode 100644
index b6280fbcd13f..000000000000
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( sys-libs/timezone-data ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
-EAPI=7
-HOMEPAGE=https://abseil.io
-INHERIT=cmake python-any-r1
-IUSE=test
-KEYWORDS=amd64 arm64 ppc64 ~riscv x86
-LICENSE=Apache-2.0 test? ( BSD )
-RESTRICT=!test? ( test )
-SLOT=0/20211102
-SRC_URI=https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz -> abseil-cpp-20211102.0.tar.gz test? ( https://github.com/google/googletest/archive/1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz -> gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=49a76836fc088f527054b8893a68d4fc
diff --git a/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1
index dd3aac7a6bb1..c091e086f92a 100644
--- a/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.antlr.org/
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.11.1-source.zip -> antlr-cpp-4.11.1.zip
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=03b46224b07ced37a695d0629583e800
+_md5_=e301f51543ff67d7e989aa56c0eb2d5c
diff --git a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
index 489b9df8091f..1b2a2ec843e7 100644
--- a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=4
 SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.7.2-source.zip -> antlr-cpp-4.7.2.zip
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a413c0642082e7864e14e1d99e2f1321
+_md5_=c679f6315a1f9a2a2c27fabedd05de77
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index bad1531b3028..d81ec234f7d4 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.2.1 b/metadata/md5-cache/dev-db/pgrouting-3.2.1
index d546c6503943..29c5c3f32934 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.2.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pgrouting.org/
 INHERIT=cmake postgres-multi
 IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 MIT Boost-1.0
 RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.2.1.tar.gz -> pgrouting-3.2.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	postgres	7233fc439696bbab8442204f0f284645	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=88f74145ce4ef004c51a3e650cb335ac
+_md5_=0c9bda0283b5f236bf3c36cc7ba44dc0
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b147ed52bd9c..dff6b407db74 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-9.1.2 b/metadata/md5-cache/dev-lang/swi-prolog-9.1.2
index be32e1b787e9..de686ddb7f2d 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-9.1.2
+++ b/metadata/md5-cache/dev-lang/swi-prolog-9.1.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.swi-prolog.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop flag-o-matic java-pkg-opt-2 toolchain-funcs xdg
 IUSE=X archive berkdb +cli debug doc +gmp gui +ipc java minimal odbc pcre pgo qt6 ssl test yaml java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib:= virtual/libcrypt:= X? ( media-libs/freetype:2 media-libs/fontconfig:1.0 media-libs/libjpeg-turbo:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt ) archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) cli? ( dev-libs/libedit sys-libs/readline:= ) gmp? ( dev-libs/gmp:0= ) gui? ( !qt6? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !minimal? ( dev-libs/ossp-uuid ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= ) yaml? ( dev-libs/libyaml ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=doc? ( archive ) minimal? ( !archive !doc !ipc !ssl !test )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-9.1.2.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=babeb908183dbd46cfbbf653d3fca9f3
+_md5_=2ea0dc7b21555f36ea8824493a8d9c57
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index db3c20ce227f..e39610069c9f 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/leatherman-1.12.8 b/metadata/md5-cache/dev-libs/leatherman-1.12.8
deleted file mode 100644
index d56025678352..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[nls] net-misc/curl
-DESCRIPTION=A C++ toolkit
-EAPI=7
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-INHERIT=cmake
-IUSE=debug static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/boost:=[nls] net-misc/curl
-RESTRICT=test
-SLOT=0/1.12.8
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.8.tar.gz -> leatherman-1.12.8.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3b7f14a87d97da20f03fbd22c4a86786
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1q b/metadata/md5-cache/dev-libs/openssl-1.1.1q
deleted file mode 100644
index 7382b547552d..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1q
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers 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 ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1q.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1q.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=f54f3e2acdc6489d85b5a6f5fd411dbe
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1s-r2 b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
index 45874e17af80..5c600e3fdfb1 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1s-r2
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers 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 ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
 RESTRICT=!test? ( test )
 SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
+SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9415f37ce0477cc41d9507e86e99c070
+_md5_=dbc22a36b7f40de8a89672b8e8769512
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.7-r4 b/metadata/md5-cache/dev-libs/openssl-3.0.7-r4
index 1328b515d406..e4c7d75c1d84 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.7-r4
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.7-r4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
 IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers 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 ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.7.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.7.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=a60a922ece5713c27e573d562c84ea14
+_md5_=9f301cb73f8d053733754ee5c33e26ef
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.7-r3 b/metadata/md5-cache/dev-libs/openssl-3.0.8
index 04be58233b59..c6bcd6598953 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.7-r3
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.8
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
 IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers 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 ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.7.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.7.tar.gz.asc )
+SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9f2f1639fc4b492edae4ee7b1d07de7e
+_md5_=70a37576ba599ff9abd144297f9c3596
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.7.0 b/metadata/md5-cache/dev-libs/sdformat-9.7.0
deleted file mode 100644
index d40eda4c3f3c..000000000000
--- a/metadata/md5-cache/dev-libs/sdformat-9.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/ruby:* virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
-DESCRIPTION=Simulation Description Format (SDF) parser
-EAPI=8
-HOMEPAGE=http://sdformat.org/
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
-SLOT=0/9
-SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.7.0.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=282408ac6e0b9a4d6da3e8caef2273ea
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.1.1 b/metadata/md5-cache/dev-libs/simdjson-3.1.1
new file mode 100644
index 000000000000..304a31cfe678
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/simdjson-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=tools? ( dev-libs/cxxopts:= )
+DESCRIPTION=SIMD accelerated C++ JSON library
+EAPI=8
+HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+INHERIT=toolchain-funcs cmake
+IUSE=test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 Boost-1.0 BSD MIT
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/15
+SRC_URI=https://github.com/simdjson/simdjson/archive/v3.1.1.tar.gz -> simdjson-3.1.1.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c52b9c7ab594f63eafa16ee47a28cee3
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.10.0 b/metadata/md5-cache/dev-libs/spdlog-1.10.0
deleted file mode 100644
index 710b6ff3eec8..000000000000
--- a/metadata/md5-cache/dev-libs/spdlog-1.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libfmt-8.0.0:=
-DESCRIPTION=Fast C++ logging library
-EAPI=7
-HOMEPAGE=https://github.com/gabime/spdlog
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libfmt-8.0.0:=
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz -> spdlog-1.10.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9bd8eddd03738ae6cda234a2c43b218a
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.11.0 b/metadata/md5-cache/dev-libs/spdlog-1.11.0
index 2fa4886046b0..c5a4662a6161 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.11.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.11.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/gabime/spdlog
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.11.0.tar.gz -> spdlog-1.11.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=00136d0981587905bf2d50e1755219f2
+_md5_=42dd04c8c94874b20027ab02f879dd0b
diff --git a/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1 b/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1
deleted file mode 100644
index fc6075c8e35f..000000000000
--- a/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=
-DESCRIPTION=URDF (U-Robot Description Format) library
-EAPI=7
-HOMEPAGE=http://ros.org/wiki/urdf
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=
-SLOT=0/1
-SRC_URI=https://github.com/ros/urdfdom/archive/1.0.4.tar.gz -> urdfdom-1.0.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fffb00ce4d56b3ec202b7ac1e5393194
diff --git a/metadata/md5-cache/dev-libs/urdfdom-3.0.1 b/metadata/md5-cache/dev-libs/urdfdom-3.0.1
deleted file mode 100644
index dd211f2763b2..000000000000
--- a/metadata/md5-cache/dev-libs/urdfdom-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
-DESCRIPTION=URDF (U-Robot Description Format) library
-EAPI=7
-HOMEPAGE=http://ros.org/wiki/urdf
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
-SLOT=0/3
-SRC_URI=https://github.com/ros/urdfdom/archive/3.0.1.tar.gz -> urdfdom-3.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=15bd0b0aec54812413794934a762e490
diff --git a/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0-r1 b/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0-r1
new file mode 100644
index 000000000000..a68f5e8bd3f2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-perl/Cairo dev-perl/glib-perl dev-perl/Gtk3 x11-libs/cairo x11-libs/goocanvas:2.0[introspection] dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Bridge between GooCanvas2 and Cairo types
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/GooCanvas2-CairoTypes
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Cairo dev-perl/glib-perl dev-perl/Gtk3 x11-libs/cairo x11-libs/goocanvas:2.0[introspection] dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/GooCanvas2-CairoTypes-0.001.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=1de056bfb9706609010e045c2fd586be
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 4dd326700f36..0cc6dfa32ce8 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 28fde6b62500..53e1220b72e0 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.5 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.5
deleted file mode 100644
index 554d0761a2a9..000000000000
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/PyQt-builder-1.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-qt/qtcore:5
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/PyQt5-5.15.5[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets]
-DESCRIPTION=Python bindings for QtWebEngine
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/
-INHERIT=python-r1 qmake-utils
-IUSE=debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/PyQt5-5.15.5[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] >=dev-python/PyQt5-sip-12.9:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.15.5.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=544769220494384d7ee028b513c8360a
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.21.1 b/metadata/md5-cache/dev-python/ipykernel-6.21.1
new file mode 100644
index 000000000000..9d0657587b68
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.21.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/comm-0.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.21.1.tar.gz
+_eclasses_=distutils-r1	5805686d488d821ed8d8d9367942c0f3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=2a74231a3ae4affe3e8a418058361904
diff --git a/metadata/md5-cache/dev-python/isort-5.11.4 b/metadata/md5-cache/dev-python/isort-5.11.4
index b817e4138ee3..f101daf241e2 100644
--- a/metadata/md5-cache/dev-python/isort-5.11.4
+++ b/metadata/md5-cache/dev-python/isort-5.11.4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/isort/archive/5.11.4.tar.gz -> isort-5.11.4.gh.tar.gz
 _eclasses_=distutils-r1	5805686d488d821ed8d8d9367942c0f3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=92457a11082cd57d63745a37cf585163
+_md5_=a38ce5bdc73175ffa6ba29ae4bb6a113
diff --git a/metadata/md5-cache/dev-python/isort-5.12.0 b/metadata/md5-cache/dev-python/isort-5.12.0
index ec75d68de73f..a749ae9bf099 100644
--- a/metadata/md5-cache/dev-python/isort-5.12.0
+++ b/metadata/md5-cache/dev-python/isort-5.12.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/isort/archive/5.12.0.tar.gz -> isort-5.12.0.gh.tar.gz
 _eclasses_=distutils-r1	5805686d488d821ed8d8d9367942c0f3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=aef8165d66f9826992dde05ffdb4875b
+_md5_=5ad41cc665f7cb5d6d0fd1844234d17a
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.8 b/metadata/md5-cache/dev-python/pyside2-5.15.8
index 7874042709a8..2a5f7dcaa692 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.15.8
+++ b/metadata/md5-cache/dev-python/pyside2-5.15.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1 virtualx
 IUSE=3d charts +concurrent datavis designer gles2-only +gui help location multimedia +network positioning +printsupport qml quick script scripttools scxml sensors speech +sql svg test +testlib webchannel webengine websockets +widgets +x11extras xml xmlpatterns python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/shiboken2-5.15.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtcore-5.15*:5 =dev-qt/qtopengl-5.15*:5[gles2-only=] =dev-qt/qtserialport-5.15*:5 3d? ( =dev-qt/qt3d-5.15*:5[qml?,gles2-only=] ) charts? ( =dev-qt/qtcharts-5.15*:5[qml?] ) concurrent? ( =dev-qt/qtconcurrent-5.15*:5 ) datavis? ( =dev-qt/qtdatavis3d-5.15*:5[qml?,gles2-only=] ) designer? ( =dev-qt/designer-5.15*:5 ) gui? ( =dev-qt/qtgui-5.15*:5[jpeg,gles2-only=] ) help? ( =dev-qt/qthelp-5.15*:5 ) location? ( =dev-qt/qtlocation-5.15*:5 ) multimedia? ( =dev-qt/qtmultimedia-5.15*:5[qml?,gles2-only=,widgets?] ) network? ( =dev-qt/qtnetwork-5.15*:5 ) positioning? ( =dev-qt/qtpositioning-5.15*:5[qml?] ) printsupport? ( =dev-qt/qtprintsupport-5.15*:5[gles2-only=] ) qml? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] ) quick? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] =dev-qt/qtquickcontrols2-5.15*:5[widgets?] ) script? ( =dev-qt/qtscript-5.15*:5[scripttools?] ) scxml? ( =dev-qt/qtscxml-5.15*:5 ) sensors? ( =dev-qt/qtsensors-5.15*:5[qml?] ) speech? ( =dev-qt/qtspeech-5.15*:5 ) sql? ( =dev-qt/qtsql-5.15*:5 ) svg? ( =dev-qt/qtsvg-5.15*:5 ) testlib? ( =dev-qt/qttest-5.15*:5 ) webchannel? ( =dev-qt/qtwebchannel-5.15*:5[qml] ) webengine? ( =dev-qt/qtwebengine-5.15*:5[widgets?] ) websockets? ( =dev-qt/qtwebsockets-5.15*:5[qml?] ) widgets? ( =dev-qt/qtwidgets-5.15*:5[gles2-only=] ) x11extras? ( =dev-qt/qtx11extras-5.15*:5 ) xml? ( =dev-qt/qtxml-5.15*:5 ) xmlpatterns? ( =dev-qt/qtxmlpatterns-5.15*:5[qml?] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) 3d? ( gui network ) charts? ( gui widgets ) datavis? ( gui ) designer? ( gui widgets xml ) gles2-only? ( gui ) help? ( gui sql widgets ) location? ( gui network positioning quick ) multimedia? ( gui network widgets ) printsupport? ( gui widgets ) qml? ( gui network ) quick? ( gui network qml widgets network ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( gui network positioning quick qml widgets? ( printsupport network webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c975082c95bc41047a3c96b4b3247924
+_md5_=8d89096adca2b3b85285ee609e9e2338
diff --git a/metadata/md5-cache/dev-python/pyside2-tools-5.15.8 b/metadata/md5-cache/dev-python/pyside2-tools-5.15.8
index 4e8ddb7392b7..a4abf924792e 100644
--- a/metadata/md5-cache/dev-python/pyside2-tools-5.15.8
+++ b/metadata/md5-cache/dev-python/pyside2-tools-5.15.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/pyside2-5.15.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=708988dfaaaae17d885eeea30c986e01
+_md5_=b887945be98a3f49c8e5b7dbe19a63da
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.12.0 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.12.0
index 978d26a9630e..a33e3ae84a86 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.12.0
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.12.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/projects/ruamel-std-pathlib/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=!dev-python/namespace-ruamel python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.std.pathlib-0.12.0.tar.xz -> ruamel-std-pathlib-0.12.0.tar.xz
 _eclasses_=distutils-r1	5805686d488d821ed8d8d9367942c0f3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=96821bb4a8598ea2e8a2c99a4a052a7f
+_md5_=cf51ce1bd7a6df54faa701c6d987612a
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.8 b/metadata/md5-cache/dev-python/shiboken2-5.15.8
index e2041da66059..37ff9b9337c7 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.8
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake llvm python-r1 toolchain-funcs
 IUSE=+docstrings numpy test vulkan python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) =dev-qt/qtcore-5.15*:5 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 =dev-qt/qtxml-5.15*:5 =dev-qt/qtxmlpatterns-5.15*:5 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=57c5e5f23cfae2867a54c725610f841b
+_md5_=006d42231e0ddff8de4b3ec07e783e3e
diff --git a/metadata/md5-cache/dev-python/ujson-5.7.0 b/metadata/md5-cache/dev-python/ujson-5.7.0
index 6834ab265f3f..670776c53866 100644
--- a/metadata/md5-cache/dev-python/ujson-5.7.0
+++ b/metadata/md5-cache/dev-python/ujson-5.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ultrajson/ultrajson/ https://pypi.org/project/ujson/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/double-conversion:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-5.7.0.tar.gz
 _eclasses_=distutils-r1	5805686d488d821ed8d8d9367942c0f3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=dbe208260eec256b1512171394b4eaf6
+_md5_=7f53a31a1220a214c45b8be42f6d827c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 23de2072eccd..97c4b6930bb0 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3 b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
index 41b64ece47f5..64e332cc5005 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info flag-o-matic toolchain-funcs qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.8
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=e3c6af2cd757035be06b42ddc8ca13ae
+_md5_=6c7f21af36b7a9506a678b6fa5b234c3
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3 b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
index 4de4ff6b0d16..db9b12ccb13c 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.8* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.8* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.8* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.8* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.8
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=87a26164c9a622155642338bf73586ce
+_md5_=c925fa6b7031a9b054cf9196ce55db5b
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
index f2f88f9baa5a..aa6014d19c91 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtimageformats-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.8-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=93d2e234d374a017bfcc45375c11522b
+_md5_=1337ba360f2ff9b36f2eb703cebbd1f3
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
index 14c4c34326e3..dc9cd7c771af 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.8* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.8*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=51946323d099db251855c6bc4a14b648
+_md5_=563393a893e19b92a9f217e68feab9d1
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 8ebbb930ec88..8211c7ae8fa2 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/vbam-2.1.4 b/metadata/md5-cache/games-emulation/vbam-2.1.4
deleted file mode 100644
index 92f65c75b16c..000000000000
--- a/metadata/md5-cache/games-emulation/vbam-2.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
-EAPI=7
-HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
-INHERIT=wxwidgets xdg cmake
-IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
-REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
-SLOT=0
-SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.1.4.tar.gz -> vbam-2.1.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dc484156096fe65e80ca8b4a2c7bedf2
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 70a3af117247..51c0c1122331 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/pvpgn-1.8.5-r4 b/metadata/md5-cache/games-server/pvpgn-1.8.5-r4
deleted file mode 100644
index b8971c995f10..000000000000
--- a/metadata/md5-cache/games-server/pvpgn-1.8.5-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:*[server] )
-DESCRIPTION=A gaming server for Battle.Net compatible clients
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/pvpgn.berlios/
-INHERIT=toolchain-funcs
-IUSE=mysql postgres
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:*[server] ) acct-user/pvpgn acct-group/pvpgn
-SLOT=0
-SRC_URI=mirror://sourceforge/pvpgn.berlios/pvpgn-1.8.5.tar.bz2 mirror://sourceforge/pvpgn.berlios/pvpgn-support-1.3.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f45a4a1351d5fd405b493a7c2ff5b248
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 9c77db4ef738..6c9f4e3b48d9 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/megaglest-3.11.1-r100 b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
deleted file mode 100644
index 9f6795d751b8..000000000000
--- a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/help2man virtual/pkgconfig editor? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) model-viewer? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ~games-strategy/megaglest-data-3.11.1 >=games-strategy/megaglest-data-3.11.1-r1 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew:= media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8:= net-misc/curl virtual/jpeg:0 videos? ( media-video/vlc )
-DESCRIPTION=Cross-platform 3D realtime strategy game
-EAPI=7
-HOMEPAGE=https://megaglest.org/ https://github.com/MegaGlest/megaglest-source
-INHERIT=cmake desktop lua-single virtualx wxwidgets xdg-utils
-IUSE=debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BitstreamVera
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ~games-strategy/megaglest-data-3.11.1 >=games-strategy/megaglest-data-3.11.1-r1 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew:= media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8:= net-misc/curl virtual/jpeg:0 videos? ( media-video/vlc )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
-SLOT=0
-SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a8d22a40be3e34a79d328834a2ce5b6b
diff --git a/metadata/md5-cache/games-strategy/megaglest-data-3.11.1-r1 b/metadata/md5-cache/games-strategy/megaglest-data-3.11.1-r1
deleted file mode 100644
index 0dcf5ff9ff8d..000000000000
--- a/metadata/md5-cache/games-strategy/megaglest-data-3.11.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Data files for the cross-platform 3D realtime strategy game MegaGlest
-EAPI=7
-HOMEPAGE=http://www.megaglest.org/
-INHERIT=cmake
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0
-SLOT=0
-SRC_URI=https://github.com/MegaGlest/megaglest-data/releases/download/3.11.1/megaglest-data-3.11.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5c0168b940abd158b0b2e6c82410361
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index fb160ca043f8..ae688bd5aac3 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.4.0 b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
deleted file mode 100644
index 124313eeea9a..000000000000
--- a/metadata/md5-cache/media-gfx/opentoonz-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/lz4:= dev-libs/boost:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
-DESCRIPTION=An open-source full-featured 2D animation creation software
-EAPI=7
-HOMEPAGE=https://github.com/opentoonz/opentoonz
-INHERIT=cmake xdg-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD libtiff
-RDEPEND=app-arch/lz4:= dev-libs/boost:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.4.0.tar.gz -> opentoonz-1.4.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bdb3830b75960ebd60744c01eea9969e
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.4.0-r1 b/metadata/md5-cache/media-gfx/opentoonz-1.4.0-r1
deleted file mode 100644
index 2a7da9112cc8..000000000000
--- a/metadata/md5-cache/media-gfx/opentoonz-1.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/lz4:= dev-libs/boost:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
-DESCRIPTION=An open-source full-featured 2D animation creation software
-EAPI=7
-HOMEPAGE=https://github.com/opentoonz/opentoonz
-INHERIT=cmake xdg-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD libtiff
-RDEPEND=app-arch/lz4:= dev-libs/boost:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.4.0.tar.gz -> opentoonz-1.4.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0586e74575b75597109042fd48a3a5d9
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ef2cd1361908..317b29b49e0f 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/assimp-5.2.4-r1 b/metadata/md5-cache/media-libs/assimp-5.2.4-r1
deleted file mode 100644
index f516d844dee4..000000000000
--- a/metadata/md5-cache/media-libs/assimp-5.2.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-DESCRIPTION=Importer library to import assets from 3D files
-EAPI=8
-HOMEPAGE=https://github.com/assimp/assimp
-INHERIT=cmake
-IUSE=samples test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0/5.2.4
-SRC_URI=https://github.com/assimp/assimp/archive/v5.2.4.tar.gz -> assimp-5.2.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5389e91df8e509449601c53ef34b46c5
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.5-r1 b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
deleted file mode 100644
index a2882bafad84..000000000000
--- a/metadata/md5-cache/media-libs/exempi-2.4.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv test? ( dev-libs/boost )
-DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
-EAPI=7
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
-INHERIT=autotools
-IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
-RESTRICT=!test? ( test )
-SLOT=2/3
-SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=adb5c52d327111f533cf55961ddea8b5
diff --git a/metadata/md5-cache/media-libs/lcms-2.14-r4 b/metadata/md5-cache/media-libs/lcms-2.14-r4
index ae55d1331a23..92e2b4a39c92 100644
--- a/metadata/md5-cache/media-libs/lcms-2.14-r4
+++ b/metadata/md5-cache/media-libs/lcms-2.14-r4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.littlecms.com/
 INHERIT=autotools multilib-minimal
 IUSE=doc jpeg static-libs tiff zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=tiff? ( zlib )
 SLOT=2
 SRC_URI=https://github.com/mm2/Little-CMS/releases/download/lcms2.14/lcms2-2.14.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=4146cc48cc5e1394cb17b4745064ba0f
+_md5_=a175e4602d183de55a929d730580d23a
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.4_rc1 b/metadata/md5-cache/media-libs/lensfun-0.3.4_rc1
new file mode 100644
index 000000000000..9b0eb9e56cc1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.4_rc1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen dev-python/docutils ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib
+DESCRIPTION=Library for rectifying and simulating photographic lens distortions
+EAPI=8
+HOMEPAGE=https://lensfun.github.io
+INHERIT=python-single-r1 cmake
+IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3 CC-BY-SA-3.0
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lensfun/lensfun/archive/refs/tags/v0.3.4-RC1.tar.gz -> lensfun-0.3.4_rc1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2ee975dbda25eae883076a4b51ba1c21
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index c4b1226a3495..b523cb3a40ff 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.1 b/metadata/md5-cache/media-video/mpv-0.35.1
index 5d8cdf8f95ea..51dcb1203f49 100644
--- a/metadata/md5-cache/media-video/mpv-0.35.1
+++ b/metadata/md5-cache/media-video/mpv-0.35.1
@@ -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_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-bin 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_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=^^ ( 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.1.tar.gz -> mpv-0.35.1.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	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b7d75dbd0bca3f1589fe4ed8e1b6def3
+_md5_=cdf500206cf14a65c219f439425a3b2d
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 8340f9ae0677..23f4661a504b 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7
deleted file mode 100644
index d0074f738f7f..000000000000
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=sys-libs/pam
-DESCRIPTION=Password change daemon with PAM support
-EAPI=7
-HOMEPAGE=https://github.com/kravietz/poppassd-ceti
-INHERIT=pam readme.gentoo-r1
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/pam
-SLOT=0
-SRC_URI=https://github.com/kravietz/poppassd-ceti/releases/download/v1.8.7/poppassd-ceti-1.8.7.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=605462f4ecc4941e816dc875351a6d83
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 8922edba48b2..6425eeff5f93 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1-r1 b/metadata/md5-cache/net-misc/grive-0.5.1-r1
deleted file mode 100644
index c993bca6b085..000000000000
--- a/metadata/md5-cache/net-misc/grive-0.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
-DESCRIPTION=An open source Linux client for Google Drive
-EAPI=7
-HOMEPAGE=https://github.com/vitalif/grive2
-INHERIT=cmake vcs-snapshot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
-SLOT=0
-SRC_URI=https://github.com/vitalif/grive2/archive/v0.5.1.tar.gz -> grive-0.5.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=71efd2feb78665ee3afc62bc5d9152eb
diff --git a/metadata/md5-cache/net-misc/grive-0.5.2_pre20200205 b/metadata/md5-cache/net-misc/grive-0.5.2_pre20200205
deleted file mode 100644
index cf4c872519e8..000000000000
--- a/metadata/md5-cache/net-misc/grive-0.5.2_pre20200205
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
-DESCRIPTION=An open source Linux client for Google Drive
-EAPI=7
-HOMEPAGE=https://github.com/vitalif/grive2
-INHERIT=cmake vcs-snapshot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
-SLOT=0
-SRC_URI=https://github.com/vitalif/grive2/archive/ffb744a59b1496f86ec71581345355715d846f7b.tar.gz -> grive-0.5.2_pre20200205.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4fd4ac070e06536604ce35b72e02eeea
diff --git a/metadata/md5-cache/net-misc/grive-0.5.2_pre20211128 b/metadata/md5-cache/net-misc/grive-0.5.2_pre20211128
deleted file mode 100644
index 5292b29e49b8..000000000000
--- a/metadata/md5-cache/net-misc/grive-0.5.2_pre20211128
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
-DESCRIPTION=An open source Linux client for Google Drive
-EAPI=7
-HOMEPAGE=https://github.com/vitalif/grive2
-INHERIT=cmake vcs-snapshot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
-SLOT=0
-SRC_URI=https://github.com/vitalif/grive2/archive/6901fbb169eaae51acb61778760ba2ac019675ae.tar.gz -> grive-0.5.2_pre20211128.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=04c052cafa97403f8c134e9ead29adf3
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 34cc3a54a548..bde27682237c 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2 b/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2
index bed575430e49..93bb96f6f33a 100644
--- a/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2
+++ b/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.siril.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson optfeature toolchain-funcs xdg
 IUSE=curl ffmpeg heif jpeg openmp png raw tiff wcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ Boost-1.0
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff:= ) wcs? ( >=sci-astronomy/wcslib-7.7 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/siril/-/archive/1.0.6/siril-1.0.6.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=55f5becdbfa91603599a48d9eb43487f
+_md5_=3ec8feaf8d43af7e7bf67e855ca0bc8f
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 4faa40db9c9d..faebc8736de8 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gmt-6.4.0 b/metadata/md5-cache/sci-geosciences/gmt-6.4.0
index ca576b59b256..ac71cff65314 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-6.4.0
+++ b/metadata/md5-cache/sci-geosciences/gmt-6.4.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.generic-mapping-tools.org
 INHERIT=bash-completion-r1 cmake
 IUSE=blas +fftw ffmpeg +gdal geos gmttria lapack openmp pcre threads zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ gmttria? ( Artistic )
 RDEPEND=app-text/ghostscript-gpl:= media-gfx/graphicsmagick:= net-misc/curl >=sci-libs/netcdf-4.1:=[hdf5] media-video/ffmpeg:= blas? ( virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) gdal? ( sci-libs/gdal:= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) pcre? ( dev-libs/libpcre2 ) zlib? ( sys-libs/zlib:= ) !sci-biology/probcons sci-geosciences/dcw-gmt sci-geosciences/gshhg-gmt
 SLOT=6
 SRC_URI=https://github.com/GenericMappingTools/gmt/releases/download/6.4.0/gmt-6.4.0-src.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=56333f386d9c71936d5e621819fbdde5
+_md5_=5b2c9237eaf9ca5b87b782b6f5c6a74f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e5b363de8789..d0387c23b71b 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.3.0-r1 b/metadata/md5-cache/sci-libs/ViSP-3.3.0-r1
deleted file mode 100644
index 443ee066a38f..000000000000
--- a/metadata/md5-cache/sci-libs/ViSP-3.3.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( sci-misc/ViSP-images ) doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=coin? ( >=media-libs/coin-4 virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl:= ) ieee1394? ( media-libs/libdc1394:2= ) jpeg? ( virtual/jpeg:0 ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:= ) opencv? ( media-libs/opencv:=[contribdnn(+)] ) pcl? ( sci-libs/pcl:= ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) v4l? ( virtual/os-headers )
-DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
-EAPI=7
-HOMEPAGE=https://visp.inria.fr/
-INHERIT=cmake
-IUSE=+coin demos +dmtx doc examples gsl ieee1394 jpeg motif ogre opencv pcl png test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=coin? ( >=media-libs/coin-4 virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl:= ) ieee1394? ( media-libs/libdc1394:2= ) jpeg? ( virtual/jpeg:0 ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:= ) opencv? ( media-libs/opencv:=[contribdnn(+)] ) pcl? ( sci-libs/pcl:= ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
-REQUIRED_USE=motif? ( coin )
-RESTRICT=!test? ( test )
-SLOT=0/3.3
-SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.3.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=41fe7af92638091cd566c3707d564fd1
diff --git a/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r2 b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r2
deleted file mode 100644
index c150828fd134..000000000000
--- a/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare pretend setup
-DEPEND=virtual/cblas virtual/blas virtual/lapack dev-libs/gmp[cxx(+)] =sci-libs/givaro-4.1*
-DESCRIPTION=Library for dense linear algebra over word-size finite fields
-EAPI=7
-HOMEPAGE=https://linbox-team.github.io/fflas-ffpack/
-INHERIT=autotools toolchain-funcs
-IUSE=static-libs openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=virtual/cblas virtual/blas virtual/lapack dev-libs/gmp[cxx(+)] =sci-libs/givaro-4.1*
-SLOT=0
-SRC_URI=https://github.com/linbox-team/fflas-ffpack/releases/download/v2.4.3/fflas-ffpack-2.4.3.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=136048d49fbd0f60251a050907bc6fdb
diff --git a/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r3 b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r3
index 8763856d6a0c..f5746fc091cc 100644
--- a/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r3
+++ b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://linbox-team.github.io/fflas-ffpack/
 INHERIT=autotools toolchain-funcs
 IUSE=openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=virtual/cblas virtual/blas virtual/lapack dev-libs/gmp[cxx(+)] =sci-libs/givaro-4.1*
 SLOT=0
 SRC_URI=https://github.com/linbox-team/fflas-ffpack/releases/download/v2.4.3/fflas-ffpack-2.4.3.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7ab76e221a4bfff57121079df4f8ed70
+_md5_=5e5b1cd88a66f6cefe3c9424fe8fd20c
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-5.1.3 b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r1
index 8652b3aeaa07..cf59a8c0d1e2 100644
--- a/metadata/md5-cache/sci-libs/rocBLAS-5.1.3
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/rocm-cmake:0/5.1 dev-util/Tensile:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip dev-libs/msgpack test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
+DEPEND=dev-util/hip <dev-libs/msgpack-5.0.0 test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
 DESCRIPTION=AMD's library for BLAS on ROCm
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.1.3.tar.gz -> rocm-rocBLAS-5.1.3.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cc101fa41f5b96a7c7457cdc02cdc4f8
+_md5_=3090535e41374b3dde45c76e7eb51b9e
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-5.4.2 b/metadata/md5-cache/sci-libs/rocBLAS-5.4.2-r1
index dae5e5653497..ea4b54bd4b55 100644
--- a/metadata/md5-cache/sci-libs/rocBLAS-5.4.2
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.4.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-5.3 dev-util/Tensile:0/5.4 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip dev-libs/msgpack test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
+DEPEND=dev-util/hip <dev-libs/msgpack-5.0.0 test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
 DESCRIPTION=AMD's library for BLAS on ROCm
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.4
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.4.2.tar.gz -> rocm-rocBLAS-5.4.2.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2904f00abfd83390660373ab10189dba
+_md5_=02bbfc2c6898a310b167c9a136615247
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 9882b945d240..97bd46fa6bf9 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/eclib-20221012 b/metadata/md5-cache/sci-mathematics/eclib-20221012
index 765042606d68..50617cca132e 100644
--- a/metadata/md5-cache/sci-mathematics/eclib-20221012
+++ b/metadata/md5-cache/sci-mathematics/eclib-20221012
@@ -4,10 +4,10 @@ DESCRIPTION=Programs for elliptic curves defined over the rational numbers
 EAPI=8
 HOMEPAGE=https://github.com/JohnCremona/eclib
 IUSE=boost flint minimal test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari:= dev-libs/ntl:= boost? ( dev-libs/boost:= ) flint? ( sci-mathematics/flint:= )
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/JohnCremona/eclib/releases/download/20221012/eclib-20221012.tar.bz2
-_md5_=a95c493b3ff31e7f1552f3ea3261aac7
+_md5_=caa877f4a878ee13f6566b32067b95a7
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.4.0-r5 b/metadata/md5-cache/sci-mathematics/octave-6.4.0-r5
deleted file mode 100644
index 37153fed1442..000000000000
--- a/metadata/md5-cache/sci-mathematics/octave-6.4.0-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig gui? ( dev-qt/linguist-tools:5 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/fortran
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( dev-libs/openssl:0= ) sundials? ( <sci-libs/sundials-6.2.0:= ) X? ( x11-libs/libX11:0= ) dev-util/gperf doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) java? ( >=virtual/jdk-1.6.0 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=High-level interactive language for numerical computations
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/octave/
-INHERIT=autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg-utils
-IUSE=curl doc fftw +glpk gnuplot gui hdf5 java opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib java
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( dev-libs/openssl:0= ) sundials? ( <sci-libs/sundials-6.2.0:= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/6.4.0
-SRC_URI=mirror://gnu/octave/octave-6.4.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a56667e8522547ecbe3e86b73f1a740
diff --git a/metadata/md5-cache/sci-mathematics/primecount-7.4 b/metadata/md5-cache/sci-mathematics/primecount-7.4
deleted file mode 100644
index 449a54841c06..000000000000
--- a/metadata/md5-cache/sci-mathematics/primecount-7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sci-mathematics/primesieve-8.0:=
-DESCRIPTION=Highly optimized CLI and library to count primes
-EAPI=8
-HOMEPAGE=https://github.com/kimwalisch/primecount
-INHERIT=cmake toolchain-funcs
-IUSE=cpu_flags_x86_popcnt +executable openmp test
-KEYWORDS=amd64
-LICENSE=BSD-2
-RDEPEND=>=sci-mathematics/primesieve-8.0:=
-RESTRICT=!test? ( test )
-SLOT=0/7
-SRC_URI=https://github.com/kimwalisch/primecount/archive/refs/tags/v7.4.tar.gz -> primecount-7.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=493c9904f0827c769c6bf2600176941b
diff --git a/metadata/md5-cache/sci-mathematics/primecount-7.6 b/metadata/md5-cache/sci-mathematics/primecount-7.6
index 01b545eae033..e29f4dd219b2 100644
--- a/metadata/md5-cache/sci-mathematics/primecount-7.6
+++ b/metadata/md5-cache/sci-mathematics/primecount-7.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/kimwalisch/primecount
 INHERIT=cmake toolchain-funcs
 IUSE=cpu_flags_x86_popcnt +executable openmp test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD-2
 RDEPEND=>=sci-mathematics/primesieve-11.0:=
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/kimwalisch/primecount/archive/refs/tags/v7.6.tar.gz -> primecount-7.6.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5f3b284f649dae2395ebed788b962dc0
+_md5_=c33f6e586da6e5287289f7027f600353
diff --git a/metadata/md5-cache/sci-mathematics/primesieve-11.0 b/metadata/md5-cache/sci-mathematics/primesieve-11.0
index 98133bd1d65f..8981564eedbf 100644
--- a/metadata/md5-cache/sci-mathematics/primesieve-11.0
+++ b/metadata/md5-cache/sci-mathematics/primesieve-11.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/kimwalisch/primesieve
 INHERIT=cmake
 IUSE=doc +executable test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/kimwalisch/primesieve/archive/refs/tags/v11.0.tar.gz -> primesieve-11.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d7cc849a71368ee642e4e94b05ac73cc
+_md5_=7b5e636188f50e0facb10131cdb6ccca
diff --git a/metadata/md5-cache/sci-mathematics/primesieve-8.0 b/metadata/md5-cache/sci-mathematics/primesieve-8.0
deleted file mode 100644
index 78d6ce628508..000000000000
--- a/metadata/md5-cache/sci-mathematics/primesieve-8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CLI and library for quickly generating prime numbers
-EAPI=8
-HOMEPAGE=https://github.com/kimwalisch/primesieve
-INHERIT=cmake
-IUSE=doc +executable test
-KEYWORDS=amd64
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://github.com/kimwalisch/primesieve/archive/refs/tags/v8.0.tar.gz -> primesieve-8.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=49b0992be3117f5856d175872d547d92
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 9988c728b9db..7e66b4f4200d 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101 b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101
index 9e7c5fab17c8..1b190f18d1ad 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101
@@ -6,4 +6,4 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-8657ABB260F056B1E5190839D9C4D26D0E604491.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc
-_md5_=bf336da214670f979cfb25b98b94fdaa
+_md5_=7299e31a8b4130202ca66722b31979e4
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207 b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207
new file mode 100644
index 000000000000..9726f4c44352
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by OpenSSL
+EAPI=8
+HOMEPAGE=https://www.openssl.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-8657ABB260F056B1E5190839D9C4D26D0E604491.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc
+_md5_=55db85b74df717be4684658fa8925bb6
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-yubico-20220824 b/metadata/md5-cache/sec-keys/openpgp-keys-yubico-20220824
index effdf4166dc8..e6c93d677a50 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-yubico-20220824
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-yubico-20220824
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by Yubico's developers
 EAPI=8
 HOMEPAGE=https://developers.yubico.com/Software_Projects/Software_Signing.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://keys.openpgp.org/vks/v1/by-fingerprint/0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A -> yubico-0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A.asc https://keys.openpgp.org/vks/v1/by-fingerprint/20EE325B86A81BCBD3E56798F04367096FBA95E8 -> yubico-20EE325B86A81BCBD3E56798F04367096FBA95E8.asc https://keys.openpgp.org/vks/v1/by-fingerprint/B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A -> yubico-B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A.asc https://keys.openpgp.org/vks/v1/by-fingerprint/57A9DEED4C6D962A923BB691816F3ED99921835E -> yubico-57A9DEED4C6D962A923BB691816F3ED99921835E.asc https://keys.openpgp.org/vks/v1/by-fingerprint/1D7308B0055F5AEF36944A8F27A9C24D9588EA0F -> yubico-1D7308B0055F5AEF36944A8F27A9C24D9588EA0F.asc https://keys.openpgp.org/vks/v1/by-fingerprint/355C8C0186CC96CBA49F9CD8DAA17C2953914D9D -> yubico-355C8C0186CC96CBA49F9CD8DAA17C2953914D9D.asc https://keys.openpgp.org/vks/v1/by-fingerprint/9E885C0302F9BB9167529C2D5CBA11E6ADC7BCD1 -> yubico-9E885C0302F9BB9167529C2D5CBA11E6ADC7BCD1.asc https://keys.openpgp.org/vks/v1/by-fingerprint/7FBB6186957496D58C751AC20E777DD85755AA4A -> yubico-7FBB6186957496D58C751AC20E777DD85755AA4A.asc https://keys.openpgp.org/vks/v1/by-fingerprint/78D997D53E9C0A2A205392ED14A19784723C9988 -> yubico-78D997D53E9C0A2A205392ED14A19784723C9988.asc https://keys.openpgp.org/vks/v1/by-fingerprint/AF511D2CBC0F973E5D308054325C8E4AE2E6437D -> yubico-AF511D2CBC0F973E5D308054325C8E4AE2E6437D.asc https://keys.openpgp.org/vks/v1/by-fingerprint/8D0B4EBA9345254BCEC0E843514F078FF4AB24C3 -> yubico-8D0B4EBA9345254BCEC0E843514F078FF4AB24C3.asc https://keys.openpgp.org/vks/v1/by-fingerprint/1DC4BA2872525B3F2FE8207F5D9C760A3FB51707 -> yubico-1DC4BA2872525B3F2FE8207F5D9C760A3FB51707.asc
-_md5_=e6ce33ca05fd9cdea31421740866a556
+_md5_=b1df6d95f192d700f3c552431152681b
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 3977a38a4472..ad2ddd3c5539 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.8 b/metadata/md5-cache/x11-base/xwayland-22.1.8
new file mode 100644
index 000000000000..dd0e87b4aaa2
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.8
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=8
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+INHERIT=meson
+IUSE=selinux video_cards_nvidia unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.8.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=f8f91ef6406362c8ba9da39625154ed7
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 43aac4fa7890..aa518cb7f124 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/gammastep-2.0.9-r1 b/metadata/md5-cache/x11-misc/gammastep-2.0.9-r1
index 564fc7344b7a..45eaecc79ccd 100644
--- a/metadata/md5-cache/x11-misc/gammastep-2.0.9-r1
+++ b/metadata/md5-cache/x11-misc/gammastep-2.0.9-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/chinstrap/gammastep
 INHERIT=autotools systemd xdg-utils python-r1
 IUSE=appindicator geoclue gtk nls wayland python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libayatana-appindicator ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) gtk? ( dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=gtk? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/chinstrap/gammastep/-/archive/v2.0.9/gammastep-v2.0.9.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e6974a4fbac314f7e7c6d6328f18af4e
+_md5_=9c96b500002d6ca601ccc338b7faedb5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f1bb0a651d70..b848e216139f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-07T14:43:25Z
+TIMESTAMP 2023-02-07T20:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPiY41fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPitw9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC5BxAAhL1ORHwxNJGp72vybrhPLPOoXklhmKy2g5fJRHhcdRFM3dO/IiA2GnxE
-e5Gjjp2eWR4Y4jQuXQUMF0VG6DstT9SrYHy3BqIssC0XlNB102K02NKplShkr4dx
-vyqF7ObBX0urSCJrujWkej4Umm328+0xWOHokf0T1TYw/eMkdC7MRXGWs2QRvtcT
-jzltfO+muPK6m7y8KlF0zsBUwbxkL9SyCNEMnaodnOr07bMQV/XFjFDAMAsQET/Q
-axn922WMiPbEu2xI9RrIDoVXZEFT6grlI+KkeLf2LSuGpTXn+yxGfRnEbcqfUkA7
-KJlQrpVpmHJvbI8HiqLXlZ3IABsHO/WfKIMTxS9/K/7ubvDGDH4MzTS3Jcf2N2X5
-DVn+qJhDYFfu20eATCmT3r8N8FMxZfYQOmmon4oS6Xgde72/xdmXzTj66YT/S2o6
-eZc+uPx/rtsY9P20nCbh648xxr3d7xUtRt0x8fVRk5rk5baPjeWPmsgUnS8kSJ9N
-z+unC+TU4Zt60CcCfjiZ/YAHXMVUwC4j7qezPQfXL5Hlo+wX9hqIKQ0UI0GyLWwA
-hVgRSwamrN5qz1F/TxB5loaXpaVGl1uDqhRcDVJgCqrPCNFNQfenSM+5y+HnJZHU
-siZaiXtE36DD866IyFpt/I1N9GUKBQoJTqVXESE6N896EghOihk=
-=4rjR
+klBvbQ//YQb4v4BesyiPsrGB6Cli3Li8C6VhgeyABlC8BD8HTHedsWSDHu5FI+HD
++0cTN0NiMeUc1jCs5nhITxcvO15iek1wL4V8HpgGFDFAjUzMpBRZs5hXdgpDhFRA
+GNFHWjIDfCquzkVS3ceTN8cbCeJd8EyUutKMxxlau5dc5I00ANRNaTrRa6N6V0H8
+2z/upTZPYILprzBrSg88ULhTgsAgKcby0KZjDUNe/ZQKJ0T9OTexj78+JfN+RgAJ
+VtzTojLxM90H1VuCVi+zvuLYK1EPHqpD8UNJ9I1D5NV07CEjF/MHYcGCM+qL4pdf
+0raIl5NKBvSJqasH+AsVsd8yD43e3pEWwoGzpGPHjSEGi2KM4AA9HjGEFxeiYigO
+mZ/YlFQR6DAMq7LQV+JFJjEPPFnXL5TbSNr5RZo06xWxV6U1+aJwVrTYd8r/ElVF
+4/uWTS+q4iSIxllYI9zv0XNJMNE+4VY9RfMk+8dT0fALBl1UgdmGoPDtb2ZrUAdm
+DS3oBGqDVkggXCmOIDAMHNOVUocIYMM2dITfTiP37Wynsds17NsVJnCwXPC6WcKK
+VgI3tx7c5nEfgJu16qQLqJ0Q/dgloSK0mZBzBRqYbGQJkzj3nC0hUKX7OgPN8ftm
+LJj6/hR9PY3+de+xwxf+xhjLdrll5/M+eJAYdN0vimqCFDRuHcY=
+=vnpe
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 047a4c5c7448..d6c31f93eb99 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Feb 2023 14:43:22 +0000
+Tue, 07 Feb 2023 20:39:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8fcabc3886ad..6f5ffc93286e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb  7 02:43:22 PM UTC 2023
+Tue Feb  7 08:39:39 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6ab7d4610a30..3db23c09bb48 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Feb 2023 14:45:01 +0000
+Tue, 07 Feb 2023 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2d33430cf3ca..854f4da55fc6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bef4ad3b0453ce385a02b2c8bb4717e39aa6e8bc 1675780455 2023-02-07T14:34:15+00:00
+2bfbe8f9be6a224b0f7c0c69bef32eca1cb4b833 1675801951 2023-02-07T20:32:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index aa08cf6d232b..e183fcb01a5f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1675780801 Tue 07 Feb 2023 02:40:01 PM UTC
+1675802401 Tue 07 Feb 2023 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 047a4c5c7448..3d076c4933a3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Feb 2023 14:43:22 +0000
+Tue, 07 Feb 2023 20:39:39 +0000
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 313de284ee0d..65d172837098 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index bf476357fe44..32250c06867d 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,6 +1,4 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
-DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8ddeff80a7b1655df91a7a15668337112113806d0aef788a374c483cbc957e765b178428d839da2c853ebf87e16039548 SHA512 d50549a4f6bdd9eac7fa74a7787e47dbffff14da883d4e8e23e24802883761c1a392b8a7fbffe5fa726845f48b3b33e0dbc1743ad2d689a4d396c91d0a42f8f1
 DIST poppassd-ceti-1.8.9.tar.gz 15465 BLAKE2B 22f6b521d83c4b7c4a8842cde22710c17dda26f9cbfb39d020de05b14c045a1606fcebf51557c2e38c932e009554c5f0d1f770d5cfbf1666f81eb03a342c25f4 SHA512 cc8953aaed8cd6d2633d1c2040e364770598eb71d563a29fd3f4798730654d002ba720babab0596cc336ea8aff403064e17e8b17c3df657e5c840db2230a2077
-EBUILD poppassd_ceti-1.8.7.ebuild 1669 BLAKE2B 6c6bbc9c8ac6c04b772d60ca90afd38a72f058058b701eb5aabca630e04f1eb0c5c604bdb35c8ad45bb8ad277d19b0b0cb469ab2753f5f8a25615fbfa1f5eb61 SHA512 d7fa9305991753ccb2d42d6f5cfe06bf5d57eae03cd83162a144542438ecc749af22c1ec47bac2088e3f98cdcff798c01198459d59d14e854c8b452b4efd2f59
 EBUILD poppassd_ceti-1.8.9.ebuild 1858 BLAKE2B 575d77175b29e08b6ef17d3cc0a4c5285e97964fcc41b5759b9c6e1a50ceeba4211401ea5d0f8f7e03c8e4eab5ca3f20c961635bf60f3559c3173fd9bfdfe0d4 SHA512 8235d0fc10ff537fe3c55f078b678dd02703baac56fff1f1368db76dc159a2c437624f49ae77240d404282c5fa21e9d28327a2000c9229e4a61db2997ee6c65c
 MISC metadata.xml 945 BLAKE2B 908fc2f18052b0da8ef0e74d40d5886b9d66e6ff8907987a7533337507f36b835fb76580f9fca641bc50cb297629cf4a64553a7f9393e3dc7b4fdbdd9f35adef SHA512 40388f7a33c9879d5666920b38e665ed5a329dca4f7d042aceb8faf9b2ff43cf3b4e6d414f7233c6ca4ecc237cde2e98065325ea11ba55cd7187bacae2233a5d
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
deleted file mode 100644
index f32d4839e2d0..000000000000
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam readme.gentoo-r1
-
-# Long ago it was just "poppassd", but upstream now seems to have
-# settled on "poppassd-ceti" (instead of "poppassd_ceti" or no suffix).
-MY_PN="poppassd-ceti"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Password change daemon with PAM support"
-HOMEPAGE="https://github.com/kravietz/poppassd-ceti"
-SRC_URI="https://github.com/kravietz/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-
-# Strictly speaking the "or later version" clarification was only
-# added upstream after 1.8.7:
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-FORCE_PRINT_ELOG=1  # possibly remove in the next bump
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="poppassd is installed, but has to be run as root to work.
-
-Most commonly a front end would require sys-apps/xinetd and connect to
-port 106: For this, edit /etc/xinetd.d/poppassd, install sys-apps/xinetd,
-and start the xinetd service.
-
-Alternatively, a front end may be able to run it directly (if already
-root), or might use app-admin/sudo.  To use sudo, you'll need to configure
-/etc/sudoers with something similar to:
-
-	apache ALL=(ALL) NOPASSWD: /usr/sbin/poppassd
-
-See also README.md.bz2 for related configuration and security
-considerations.
-"
-
-src_install() {
-	dodoc README.md
-	readme.gentoo_create_doc
-
-	pamd_mimic_system poppassd auth account password
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/poppassd.xinetd poppassd
-
-	exeinto /usr/sbin
-	exeopts -o root -g bin -m 500
-	doexe poppassd
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 86301bbd897d..d10d32785c71 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 795fb1eeb6fb..19506300adb2 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,10 +1,4 @@
-AUX 299.patch 3435 BLAKE2B 04b4c27800ee95e185aff83e1fd2453c30559fce7034a42821482cac9b4d409d3945813fef736e7adb744b9d865e31afab60c6ac457af968d7dbc319872ad5ea SHA512 b425c524b28a3e245a4de6090b052a2b1e08a06b5b8227450f91a127d4ea67cc8b1f3a74ac802f1525126d236fa1ad2de0a171ef0fa241ad27b1164606ec0501
 AUX 363.patch 579 BLAKE2B 7402bde852b1317fd0f072902a8475c5e55e55b7001e8a87d834f7ddf6ae6c21d2f7df387df73ec64ac49086565efc131eb098c64568a9fbe6f5a48ad4a78e57 SHA512 9c4d73105309bb25e03d692313c46c5281b8b0b1f1f3f4fb7bfdd5d167d642e966203024d675d9139ca92de72a2d796819f04e8940da9c8bbb746eb8b5ed615f
-DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888
-DIST grive-0.5.2_pre20200205.tar.gz 170384 BLAKE2B dac8d75bdefe0c206f443010093e73b34ae8257a5ced87917cca240fb7134a6aac8e5f018eeb7bf7dec46d5043e144efb2c9586ca2b5ff55a1d0fe022f72675a SHA512 d1058649d2a3dce773eab53b1704c5dd8bb1998089099ed9c3bacdaa5d3f995fa08c1b2c2b723bbce0efa2c9c04729d97aade6df6130da32f975e2bb45f339e6
 DIST grive-0.5.2_pre20211128.tar.gz 171412 BLAKE2B 62e966917959ed4306a7a787948bc1533cca6a5521f262450658c81f6dc88cb7914df6c3a8271d87fdc189ff74ada421f76c38bd9b89157cd27ef0f2ba531e67 SHA512 33e6a382f979a0a7a6c4236bce1779bbda0b3817b7d2f1750f6759350d7de79bd999bd0f4f7cb72fd32586683053ef1d21dc830403a9d1225b6e9a3408f830fa
-EBUILD grive-0.5.1-r1.ebuild 787 BLAKE2B 7737e8622f3779d8a121b18bd09fd3717b019576fa1ada046dc104e3f23445b297d749bf6a3557b58a212839c6611c916e872455890be7aae01be1cf1ffdf574 SHA512 41bfbcd2dc7038d879db312b4701b4bd37cbbb8fa065a720dd5de71903aac8745c9ff679e96df1accd9e316badb1e02fd4562ff734fe52e79c53f2133f054dfd
-EBUILD grive-0.5.2_pre20200205.ebuild 804 BLAKE2B 52c46fe6396ab3d8cbefd8591f6b02ca5dfaa0815812ddc5cdb284fb0faca5a160755a99ab94ed87582911baa1e920f1902ed3abb6fc41fffcf9c73e45cfcc74 SHA512 cc872fbc59c008773dc275eadf339db3f4d4b6ff92d974f1af55fd7f6f681ac238bc67c32db900d467d224ae294623dd5875ceb799bffc7bce06a7648eca5d26
 EBUILD grive-0.5.2_pre20211128-r1.ebuild 841 BLAKE2B 088460e3ef13a0af65753ef8ca914c22be72e830b0a3ae8d05b33a891c902190dac1522f5fab9705b9be2f0010ed5d8bbb903c60f634cf73f695daa0836ccd07 SHA512 14a6985e97670d42f3d238703ebec02909f38e9a01361766fdd226ea26eafbe706f3ba79112f1a87b194f1921089142b77eae82761df83819cd24b8a337d067b
-EBUILD grive-0.5.2_pre20211128.ebuild 804 BLAKE2B 467fc7d9022d2f45c9aa5615deb5506251b3cf31be9dced9d2e1e56f10315c7c8397b00594773e973a91dc307b647011930fb05fafdd36b68e56c4f621be84a4 SHA512 d9fc5fe24d4840f452aab215772fbd12cf227c13dd2239fb4da413c711e32c2adeea4aa06088190fe3a75312b1ae2d70d3f4a73e646cd1de23747f9e9312c30a
 MISC metadata.xml 330 BLAKE2B 92f51d3512032afcce83d09f6543814fac1f75b79e89f9d350654d4f3954fd4a77afc9f3f5f2a27c8c1e57f22829ef27643383c0a9e58ca035c1a16e5d38cde5 SHA512 ddc7be8e9e3f6e5069c5a048e77e0d1de84d39ab7377ab89078ed446225e5a37d4bf5959d4761ba2bb954dc046c4b83a7418705b8e7e3565595200b4a4a0bc63
diff --git a/net-misc/grive/files/299.patch b/net-misc/grive/files/299.patch
deleted file mode 100644
index a5e030f2534a..000000000000
--- a/net-misc/grive/files/299.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From b4d6ac055f8f16ac735a70036243bc4ea2334039 Mon Sep 17 00:00:00 2001
-From: Giuseppe Corbelli <corbelligiuseppe@mesdan.it>
-Date: Tue, 14 Jan 2020 11:50:20 +0100
-Subject: [PATCH] [SymbolInfo.cc] Support compilation with binutils >= 2.33.1
- on Debian.
-
-bfd_get_section_vma macro was removed.
-bfd_section_size changed signature.
-
-See inline comment for details.
----
- libgrive/src/bfd/SymbolInfo.cc | 35 ++++++++++++++++++++--------------
- 1 file changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/libgrive/src/bfd/SymbolInfo.cc b/libgrive/src/bfd/SymbolInfo.cc
-index 5876cc0..cdb5d7c 100644
---- a/libgrive/src/bfd/SymbolInfo.cc
-+++ b/libgrive/src/bfd/SymbolInfo.cc
-@@ -49,9 +49,9 @@ SymbolInfo::SymbolInfo( )
- 	m_impl->m_bfd		= 0 ;
- 	m_impl->m_symbols	= 0 ;
- 	m_impl->m_symbol_count	= 0 ;
--	
-+
- 	bfd_init( ) ;
--	
-+
- 	// opening itself
- 	bfd *b = bfd_openr( "/proc/self/exe", 0 ) ;
- 	if ( b == NULL )
-@@ -60,13 +60,13 @@ SymbolInfo::SymbolInfo( )
- 		          << bfd_errmsg( bfd_get_error() ) << std::endl ;
- 		return ;
- 	}
--	
-+
- 	if ( bfd_check_format( b, bfd_archive ) )
- 	{
- 		bfd_close( b ) ;
- 		return ;
- 	}
--	
-+
- 	char **matching ;
- 	if ( !bfd_check_format_matches( b, bfd_object, &matching ) )
- 	{
-@@ -78,7 +78,7 @@ SymbolInfo::SymbolInfo( )
- 			std::cerr << bfd_get_filename( b ) << ": Matching formats: " ;
- 			for ( char **p = matching ; *p != 0 ; p++ )
- 				std::cerr << " " << *p ;
--			
-+
- 			std::cerr << std::endl ;
- 			std::free( matching ) ;
- 		}
-@@ -107,7 +107,7 @@ struct SymbolInfo::BacktraceInfo
- 	const char			*m_func_name ;
- 	unsigned int		m_lineno ;
- 	unsigned int		m_is_found ;
--	
-+
- 	static void Callback( bfd *abfd, asection *section, void* addr ) ;
- } ;
- 
-@@ -117,17 +117,24 @@ void SymbolInfo::BacktraceInfo::Callback( bfd *abfd, asection *section,
- 	BacktraceInfo *info = (BacktraceInfo *)data ;
- 	if ((section->flags & SEC_ALLOC) == 0)
- 		return ;
--	
--	bfd_vma vma = bfd_get_section_vma(abfd, section);
--	
-+
-+	// bfd_get_section_vma works up to 7b1cfbcf1a27951fb1b3a212995075dd6fdf985b,
-+	// removed in 7c13bc8c91abf291f0206b6608b31955c5ea70d8 (binutils 2.33.1 or so)
-+	// so it's substituted by its implementation to avoid checking for binutils
-+	// version (which at least on Debian SID it's not that easy because the
-+	// version.h is not included with the official package)
-+	bfd_vma vma = section->vma;
-+
- 	unsigned long address = (unsigned long)(info->m_addr);
- 	if ( address < vma )
- 		return;
--	
--	bfd_size_type size = bfd_section_size(abfd, section);
-+
-+	// bfd_section_size changed between the two objects described above,
-+	// same rationale applies
-+	bfd_size_type size = section->size;
- 	if ( address > (vma + size))
- 		return ;
--	
-+
- 	const SymbolInfo *pthis	= info->m_pthis ;
- 	info->m_is_found	=  bfd_find_nearest_line( abfd, section,
- 	                                              pthis->m_impl->m_symbols,
-@@ -149,7 +156,7 @@ void SymbolInfo::PrintTrace( void *addr, std::ostream& os, std::size_t idx )
- 	{
- 		this, addr, 0, 0, 0, false
- 	} ;
--	
-+
- 	Dl_info sym ;
- 	bfd_map_over_sections( m_impl->m_bfd,
- 							&SymbolInfo::BacktraceInfo::Callback,
-@@ -165,7 +172,7 @@ if ( btinfo.m_is_found )
- 			filename.erase( pos, std::strlen( SRC_DIR ) ) ;
- #endif
- 		os << "#"  << idx << " " << addr << " "
--			<< filename << ":" << btinfo.m_lineno 
-+			<< filename << ":" << btinfo.m_lineno
- 			<< " "
- 			<< (btinfo.m_func_name != 0 ? Demangle(btinfo.m_func_name) : "" )
- 			<< std::endl ;
diff --git a/net-misc/grive/grive-0.5.1-r1.ebuild b/net-misc/grive/grive-0.5.1-r1.ebuild
deleted file mode 100644
index 323a194002ef..000000000000
--- a/net-misc/grive/grive-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	dev-libs/yajl
-	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/299.patch" )
diff --git a/net-misc/grive/grive-0.5.2_pre20200205.ebuild b/net-misc/grive/grive-0.5.2_pre20200205.ebuild
deleted file mode 100644
index fdaaf8147839..000000000000
--- a/net-misc/grive/grive-0.5.2_pre20200205.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-else
-	inherit vcs-snapshot
-	COMMIT="ffb744a59b1496f86ec71581345355715d846f7b"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	dev-libs/yajl
-	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.2_pre20211128.ebuild b/net-misc/grive/grive-0.5.2_pre20211128.ebuild
deleted file mode 100644
index 82bf739ad8c4..000000000000
--- a/net-misc/grive/grive-0.5.2_pre20211128.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-else
-	inherit vcs-snapshot
-	COMMIT="6901fbb169eaae51acb61778760ba2ac019675ae"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	dev-libs/yajl
-	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-"
-DEPEND="${RDEPEND}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4625cfe40a2e..ea3c9950f54c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 759b821dd553..2c653de82353 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -145,15 +145,6 @@ games-strategy/0ad nvtt
 # Cinnamon is not keyworded on this architecture.
 x11-themes/arc-theme cinnamon
 
-# Sam James <sam@gentoo.org> (2020-07-11)
-# Don't drag in qtwebengine for Plasma right now
-# Not going for nuclear option of general mask
-# (or dropping keywords) because unclear if it's caused
-# by the use of a linux32 chroot.
-# See bug #713900
-kde-plasma/libksysguard webengine
-kde-plasma/kdeplasma-addons webengine
-
 # Sam James <sam@gentoo.org> (2020-06-27)
 # Tests require Valgrind, not available on <armv7a
 dev-libs/rapidjson test
diff --git a/profiles/package.mask b/profiles/package.mask
index abcd3bc34c5b..eeee93ac2cfa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -90,12 +90,6 @@ dev-python/google-reauth-python
 dev-python/oauth2client
 net-misc/gsutil
 
-# Marek Szuba <marecki@gentoo.org> (2023-02-03)
-# New major version with breaking changes, mask until 2023-03-03
-# for revdep testing and porting. Bug #893006.
->=dev-cpp/msgpack-cxx-5.0.0
->=dev-libs/msgpack-5.0.0
-
 # Michał Górny <mgorny@gentoo.org> (2023-02-02)
 # dev-python/citeproc-py requires dev-python/nose and is not maintained
 # upstream.  Its only revdep, dev-python/duecredit has no reverse
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 87b9862e675b..1f012faf99e2 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index c205a576250e..fce8d7088276 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -5,6 +5,6 @@ AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719
 DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
 EBUILD siril-1.0.5-r1.ebuild 2017 BLAKE2B 490e2aec30486ae9059443088ed9af21c4265b79731ac4c0e891255d34a6c0d280383329e4cb6f7b2659b5130e378af249005666981ef00abd9486f6f99f7718 SHA512 d5cfc1385fa8c4295247075da10333dbb1cec2bb71e001b14366feae12035aa2888f982391b8ff4705cf4784da1d4080bb86476616befc807d167d458d72c4b1
-EBUILD siril-1.0.6-r2.ebuild 2072 BLAKE2B 12ac9a9355305abf1e48fbd645eb164bb6b04ca56fc0825408a6cf603aee76af0c845b1ad57170c32be61460b5684735770d77012de602c4d5240a52e29e2b4a SHA512 0b8d946afb58e335a3f2b2ce32cba49ba65eb0f963e101c7563f40729007bc86fe0f0010e86db68b30ee8d732106f444ab2f65561f855226151acc5b75d82e7c
+EBUILD siril-1.0.6-r2.ebuild 2071 BLAKE2B df014e827db09ca4463d8b71742672e3d5035af2a22f903c62367f7b804e9761dce8d28ec20f081e8d1e41f3c2ad4567278e9f46daf36121d81d627400aeea31 SHA512 6cdf085f67fa685cf286d00422475f418d9a84347afed9916fbd222c43c236a1adade89d90f5c463af44a107c285be23839d397e0d4e3fbe825d48055b5b80fb
 EBUILD siril-9999.ebuild 1960 BLAKE2B fbb8be0a40cf3d416dd52fc5e5273b00bd63b312043ddd22c7747517faa1a64d74c6036d853ce72174c33ff5dcaea4d8242aec834e46737d04796ef8ab512e86 SHA512 f9a5f7e79f151400da38d433d4802ec621cb2224925df91a73a24201a10741ee2d8ec4bd43963901d8949609d7061d139c864a9cf3c595c7af336232e8a3798f
 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1
diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index a198b6fb965f..b1160125b55d 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7a4a5d7ef196..5c7c8d84846e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index a7343c1b761f..6f5c9b9b4a33 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -2,5 +2,5 @@ AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f36
 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
 DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40
 EBUILD gmt-5.4.4.ebuild 3084 BLAKE2B 7ce77400d0aa0834c9681581b88fd8c27c01c4e1c3bc12f5973aa3ea29d25f00dc18f7462d5c55cbc0b17a64d2ea95b53299b69be2e56ab24ce16db888c8cb41 SHA512 8906114f67a3210de7b0d08f6012b6b19b88dca0fdd621e364e627b96d0642bd6c0bb8ade05d06548bb8c8e631ff5838525e8f9ef86612f943ad59af5c115fe7
-EBUILD gmt-6.4.0.ebuild 2616 BLAKE2B 80cbbf905a4421942c653804ac3715a0e785164c67e4028c4f4217e1f9888886d035875f8b3a37744579ef9df978fb1ab7b0708cfd16c476cc70c91c12a3c9de SHA512 fd5904d103f2b7db77d10184ec270c41c54d567abb8872c69ca6ba69f2833335fe49f4ca5c70f3e6154c4232585aa6c5d5310825be70b4738b706c0be02378ef
+EBUILD gmt-6.4.0.ebuild 2615 BLAKE2B c104e6c6382f4caaeb47dfbe176c5de29ab6c8fff16e251b86467caa8a593494d4a6e8495b1a86fff58b41d5a267c56c4d0c3822ce793ddc9ea223422043e436 SHA512 a36bd6550fc700e9199d0a3b3939e5cf27ffde48959441975122b4d49490c7844a51a999d3d553152ee7d8f67fa76d6e9fd77dd4d10e1a5d0304973091d13f95
 MISC metadata.xml 803 BLAKE2B 495348da16fac57337217745efbb67a20ddf05d208136caaab926434b84f765c7c7f044dc026bf5df7c09fbaf443f210e19f3bb8e3bc5c1b68b5bfb2bd0379c5 SHA512 09e8b04766b871f579b84541de88f19c8f6bff63a9b6b36bbc863cedbb0e3bb3eeb13becac2a793b88dbb2ced592f5b8d80f7c421c7491be4a48cd56fb402205
diff --git a/sci-geosciences/gmt/gmt-6.4.0.ebuild b/sci-geosciences/gmt/gmt-6.4.0.ebuild
index 47ef90d65d6e..ab7b61b5eb63 100644
--- a/sci-geosciences/gmt/gmt-6.4.0.ebuild
+++ b/sci-geosciences/gmt/gmt-6.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/GenericMappingTools/${PN}/releases/download/${PV}/${
 
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="blas +fftw ffmpeg +gdal geos gmttria lapack openmp pcre threads zlib"
 
 DEPEND="
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d714f7865306..5106b2275387 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 3641bed271d4..eec031e3b640 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,7 +1,5 @@
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
-DIST visp-3.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2
 DIST visp-3.5.0.tar.gz 52005297 BLAKE2B a429c07c8d80e8790bdd72bf27b777c79784173cc8be2539656c1cfbc111e35b3f80207a866fe3aaca536033af9e9d5006bf7e10a56cef5655aa9615a674c5ac SHA512 5a968a78c8ed2c48da71fa3def482b84fd73961f012e82ea1d7dd9b7b14336be5596ac9fc1bdf16414793d2399431bbc4306710d31b62946e6b2c03f692751b8
-EBUILD ViSP-3.3.0-r1.ebuild 2889 BLAKE2B c32b75bf495ca255454134ea8fa326a274ee23cee239f97fb802e7f0457d8070315ebaac7ec007f36cb7001ed49d025f294cf94d53a3a8e42dc9e7269b829dd7 SHA512 78b0b86503fa9bc8e4be05b47a0b30d3cedc03a83f7dd4725353aefa2d876b8dadab8542dd2cc81722e61ac3af1d7be0f733f7b73a1cf20a135f62fbeb374408
 EBUILD ViSP-3.5.0.ebuild 2878 BLAKE2B 330a6ead9614e2c3226d6cc5052248f0ae0325e698325d90be3f4137027b903247a930d5e9be88c9da727729517dab35363d03ac5bbd997331866011ee667395 SHA512 9690ac77874705af3345f5f02015baa5f1561b5f826734ec34a9628bc15e6cbac8b8c8a48c0516d16e5f86f6462ace676556f5ee55566e93405646703f425d2b
 MISC metadata.xml 1384 BLAKE2B 5146b30499cd534556ef2b6f9048535296f38e5ae2dd2dca9670799de61cf666b74ec2ed602a35c56df839317221200129ef71fcf6c6026fe7d74a14ac70dd9c SHA512 4dbd648e138eea6bdb7a97d2eb32f1df909afa7a4922b4ffff356e511a4d73fa0095b65c3b70100c81436b1f9636f9190fedc98ced52c13db0f1d86ca86d9f66
diff --git a/sci-libs/ViSP/ViSP-3.3.0-r1.ebuild b/sci-libs/ViSP/ViSP-3.3.0-r1.ebuild
deleted file mode 100644
index 226001297981..000000000000
--- a/sci-libs/ViSP/ViSP-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="https://visp.inria.fr/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3.3"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples gsl ieee1394 jpeg motif ogre
-	opencv pcl png test tutorials usb v4l X xml +zbar zlib
-	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-"
-REQUIRED_USE="motif? ( coin )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	coin? (
-		>=media-libs/coin-4
-		virtual/opengl
-	)
-	dmtx? ( media-libs/libdmtx )
-	gsl? ( sci-libs/gsl:= )
-	ieee1394? ( media-libs/libdc1394:2= )
-	jpeg? ( virtual/jpeg:0 )
-	motif? ( media-libs/SoXt )
-	ogre? (
-		dev-games/ogre[ois(+)]
-		dev-libs/boost:=
-	)
-	opencv? ( media-libs/opencv:=[contribdnn(+)] )
-	pcl? ( sci-libs/pcl:= )
-	png? ( media-libs/libpng:0= )
-	usb? ( virtual/libusb:1 )
-	v4l? ( media-libs/libv4l )
-	X? ( x11-libs/libX11 )
-	xml? ( dev-libs/libxml2 )
-	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${COMMON_DEPEND}
-	v4l? ( virtual/os-headers )"
-RDEPEND="${COMMON_DEPEND}
-	demos? ( sci-misc/ViSP-images )"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( sci-misc/ViSP-images )
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/visp-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.0-ocv.patch"
-	"${FILESDIR}/${PN}-3.0.1-opencv.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_JAVA=OFF"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_DEMOS=$(usex demos ON OFF)"
-		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
-		"-DUSE_COIN3D=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_JPEG=$(usex jpeg ON OFF)"
-		"-DUSE_PNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ogre ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_PCL=$(usex pcl ON OFF)"
-		"-DUSE_SOQT=OFF"
-		"-DUSE_SOXT=$(usex motif ON OFF)"
-		"-DUSE_V4L2=$(usex v4l ON OFF)"
-		"-DUSE_X11=$(usex X ON OFF)"
-		"-DUSE_XML2=$(usex xml ON OFF)"
-		"-DUSE_ZBAR=$(usex zbar ON OFF)"
-		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4"
-		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
-		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile visp_doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-	if use tutorials ; then
-		dodoc -r tutorial
-		docompress -x /usr/share/doc/${PF}/tutorial
-	fi
-}
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index 6c53e5af9239..96d2ddb28804 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -5,6 +5,5 @@ AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c
 AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1
 AUX fflas-ffpack-2.4.3-no-test-fgesv.patch 1268 BLAKE2B 51c0cf74dac9b296a944e918475807e97a2cf71f066cda9c067b63b344e260b9fbb9ea2851db7ac2170e2b239c0778be0c9a99e0efbbbb9215df921197208784 SHA512 9a57cba58a6bab69092c4d335d92994651bb51d2f4e867d4f0396813e14f492d720232779615299b5203603bb76553ec8a4881ffb9677c349f22c0ef3975df0d
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
-EBUILD fflas-ffpack-2.4.3-r2.ebuild 2229 BLAKE2B 06ad7771aa46f6b10c83613058b3c13603c21757fba84c6287b0c52fa8560e77ff27b98713511a09cc658ffe56b33d35f8c1cbfbe59a5e00595882cc5a642fd1 SHA512 d8c24ba0eb075f6907266452c024adfca44a78144818957b61b5bc94503062e8bad325dd541eb1c4500b74222df8fcbcf6ec6e8550864bdeed911a8bbe6e7e52
-EBUILD fflas-ffpack-2.4.3-r3.ebuild 2229 BLAKE2B 02040e83e38717f35601e0d2fbc0a6ab5df23377671dcea95b3b9d11937de7f0c9fa7092995841b33bae4d1c6ddbfd154e1b0816a17a78778483a3373dad33e0 SHA512 ab68923da8b421941d4adcbf664f03a573868bb450b1c2f117d8ec357ace31b792f1ecfef6c0b4c0e2e0b2aac482d00e5dd9666c7e0c4f76f9f91bbff3d1f803
+EBUILD fflas-ffpack-2.4.3-r3.ebuild 2228 BLAKE2B fbb0b1ad23f85a77ed93175a1c8d8d9426a2c931e6fe935a33117291a77d0d20c2773e7d286f944796f222c5234ddb60be21d6aa61c20f9d97995e18fe05fd09 SHA512 6a0eb0437c2cdbcc064c71487edf8d7a8ea3c79e8eca641c428b2412d9480300ab736414b9cb2d870239d17b4edfaaa17d60afabadb412b255995c658e9115f5
 MISC metadata.xml 1492 BLAKE2B 46a6b13fb1bae6f2aa43a9d7a96c7882d4d7de4b885a4ac92f320f72ce3076ad820c4c5f75c0f2d60334801d2764c20524ea26c1cc6c9975be13e00906708927 SHA512 fc6d90e2945f67a32594f601df69952baec0821d1e529a03c8dc332723848ca531f747efe7c30ea00885c4c4a081cdb81c0ea05085e7ca3acd7db304bb4f468b
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
deleted file mode 100644
index 45175f978bb7..000000000000
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Library for dense linear algebra over word-size finite fields"
-HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
-SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="static-libs openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
-
-# Our autotools patch hacks in PKG_CHECK_MODULES calls.
-BDEPEND="virtual/pkgconfig"
-DEPEND="virtual/cblas
-	virtual/blas
-	virtual/lapack
-	dev-libs/gmp[cxx(+)]
-	=sci-libs/givaro-4.1*"
-RDEPEND="${DEPEND}"
-
-# The no-test-echelon patch works around a test failure that may
-# eventually be fixed upstream. Gentoo bug 725446 and upstream
-# Github issue 282. Same for test-fgesv (bug 807100).
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
-	"${FILESDIR}/${P}-no-test-echelon.patch"
-	"${FILESDIR}/${P}-no-test-fgesv.patch"
-	"${FILESDIR}/${P}-fix-internal-linking.patch"
-	"${FILESDIR}/${P}-no-fabi-version.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	econf \
-		--enable-precompilation \
-		$(use_enable openmp) \
-		$(use_enable cpu_flags_x86_fma3 fma) \
-		$(use_enable cpu_flags_x86_fma4 fma4) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41) \
-		$(use_enable cpu_flags_x86_sse4_2 sse42) \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable cpu_flags_x86_avx2 avx2) \
-		$(use_enable cpu_flags_x86_avx512f avx512f) \
-		$(use_enable cpu_flags_x86_avx512dq avx512dq) \
-		$(use_enable cpu_flags_x86_avx512vl avx512vl) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
index 9d9117b172ef..f5b94166a028 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
 
 # Our autotools patch hacks in PKG_CHECK_MODULES calls.
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 1dfc128efddf..e92732a70c91 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -10,6 +10,6 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc
 DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53
 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f
 DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4
-EBUILD rocBLAS-5.1.3.ebuild 3046 BLAKE2B 8c508afc782607532296e3439923db2f2f4b4cc4b9c59c18fd331b16819c82f78a5196cc8852650b1829761fcc8e73105ab96767b68fc00e3b1bb325aa3ec039 SHA512 7a85e77c2a8cc2be8305dd0137bb63446e80a5cfb039bdad07da1c35daf0a49fbadb94b65686f35c445f285378f69e48ba68c4cde26f408c265864a91a131558
-EBUILD rocBLAS-5.4.2.ebuild 2677 BLAKE2B 775888b43b7d4a87624fb988452c706e0572d363bdb317de63553ba0b1c2b2f8e524ba3f5b71e19ff958654ecc251834a348a29b3f2cd69a325e119827920d73 SHA512 31c03a389e8e516914198f3f0f76b597950d849e8e72bdba4f41338e1d14feef7706d7562998b4c8c85b5d2c5d43668650e91a1178dd33beb2df5768c2c24a1d
+EBUILD rocBLAS-5.1.3-r1.ebuild 3053 BLAKE2B cdaf0e314f82ea517cad6c0b40b99d4de6c3a139a9fadca87f2e8f84eb5e236bdecffbbefd797e620f7b3f81d5694c262a67e56169841c3927008470fa67046e SHA512 def4b29c88a500090ca40a843c72846fb5cabdf65b44aa0b9c5d75daae53922ac24771db79bab29b100c8259ae40dbbbe3d255389b54432d0350c6f69698fe06
+EBUILD rocBLAS-5.4.2-r1.ebuild 2684 BLAKE2B bed691dab1668260682de8f209e2c0f0bd8d17cd3ebdf26bc86766a95afb8cc15a84c255e423491a60b95bca7889b97eced67e7e7c757d75e1b3a3a2cc53dd6d SHA512 cb2b4a270414031d6eb19b31289831d97af2baa0ce3eb82afa48a59898d0f25146943537af35d6e8e73008843292557fb0e68767964c0260a492b5486bbb8f50
 MISC metadata.xml 739 BLAKE2B 38ace9571ca717a5bf7251888b4537522326f34778be98cfe717a06dbbd3a04a2bf905ec1cabafe9bbd3fea90adfb5c25c8b41e46c034a7793363ea5fc0c7f29 SHA512 60f1d5aa2a6ebe17cfcf24780529e1eef521bb7c838e48d18180a52d580cf91430ac1f4fdd0e70b9804ec5f0b5957dbd431149f6e0b0b9033cf8ad683510c582
diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild
index d9316725fe8c..0723e8244bf6 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.1.3.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-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
@@ -29,7 +29,7 @@ BDEPEND="
 
 DEPEND="
 	dev-util/hip
-	dev-libs/msgpack
+	<dev-libs/msgpack-5.0.0
 	test? (
 		virtual/blas
 		dev-cpp/gtest
diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild
index 28fad2ffbe68..826e17c0e64b 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.4.2.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 
 DEPEND="
 	dev-util/hip
-	dev-libs/msgpack
+	<dev-libs/msgpack-5.0.0
 	test? (
 		virtual/blas
 		dev-cpp/gtest
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 45787f7306fa..e89846102dc6 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index 8da0cb4ae750..8e7c358b125d 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,5 +1,5 @@
 DIST eclib-20220621.tar.bz2 921610 BLAKE2B f53f0648f09e427ae9b208a17c93f9808c2ab859cc41db6b5acb3b1382e9aaee93b17cd9d94c14e7f4941f140749d91b2ad94ad684f8a2c0f6033ac042cc89e7 SHA512 45cc47256f6ccbf2a00711d14533cffe8a3fc0dfea3d94d9823ac43af8a56cfe95485f0559c9141203910e85b1d3fa3284ee12ca5e53d083b74cbb2907afca42
 DIST eclib-20221012.tar.bz2 922112 BLAKE2B 2a6e5dccdef7c3c3b8bb1a121706bbfbcaafa9fb50882e4e88f8fa826c3b1bcbec11dc55462cbd51da3ab263991ae357b151ff3bdbf453abfc30e82d2abdeac8 SHA512 9d04aefe9e35fbc1b18dd92b5ba872cf71f5ce1c94c9a0f1ff326c763bf144112d7d950ac80e2bd8d3780a303edeeac903754b4eb5fb241e87be7ef3f2738c19
 EBUILD eclib-20220621.ebuild 869 BLAKE2B 46ca028cc712a8eaaf1a47fed105473d27abc2afeab903e4d91ef42cf79cce5783dab01387a0ad0ed291a5f65bb3fa28d01877fd4fe3a564d24d71acd62eb65c SHA512 67437c82d90b0f75a4e4f4a6f3fba489b7b1a7fa363b615d0ae71307b8fead2c92db005dfd37e708a983177ac6e5360442dd30990e864ae4c92a6d61e828e135
-EBUILD eclib-20221012.ebuild 1029 BLAKE2B d4ff0a197ee0a2d8450c6ac4e03e65d54682ed57dea61ef2970fa4dc4cc50f98eb9fe583cc1746afadc9629ae8179f6081b448ef7243f1491ffa47c8a1a6b2fb SHA512 35e7aeffd230b3ae950f3931abafca7534ff847cccfbc064ae7c324c0174e9a98ac4a45be3ce59681558b9bd11fc9a04f0221e0dcb52423c6e2f91852eb6998e
+EBUILD eclib-20221012.ebuild 1027 BLAKE2B 8d6b0aebf0558475eb1190d37c545977b67f22c5c781d8b2c291eca25b65f63f4c14e0d23632028c70257285e210932d8540cd837c4ab56f9ff5a93376a69f42 SHA512 d91fb3677e456480e6b02f8ec643007bbbbc3a339ba03d4ee6a952f1187e743ea13379a671cb26dc5e7d3e3fa244657cc89d366193f829589dbe35bbd785e901
 MISC metadata.xml 1089 BLAKE2B d10f9af5634478f0f13595abd10d9eefc437c27955cd3f504165beb4219e55c3997f16271148c1c2fbb5c9ae71e08665000836658bb954b83db06aeffa2b4098 SHA512 7111f3231464624d356611372934d0604fdd7a05c3531342a372979292a068dfa2edf49c4de5840cbf07b6f4819c22b8d87d54d7cacefb28ce0f53576d4620fd
diff --git a/sci-mathematics/eclib/eclib-20221012.ebuild b/sci-mathematics/eclib/eclib-20221012.ebuild
index 0266953df5d9..f37e55f7be21 100644
--- a/sci-mathematics/eclib/eclib-20221012.ebuild
+++ b/sci-mathematics/eclib/eclib-20221012.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
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # but it's actually still at 10, probably due to a forgotten autoreconf
 # or something.
 SLOT="0/11"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="boost flint minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index dec8af805822..ed8bb84c60ee 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,8 +3,6 @@ AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c
 AUX octave-6.4.0-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c399b0bf7af26be7f79e35c29fc2963124852067429f7ee25325402ad6983c047398a5c43c2d9f44d3a96e5c3db49282f826ecab82 SHA512 a1edd69d06aadd5c9772b12f32468bcd25b181883d3c303cd5ff58175e95021ed661d363137002a50073ec9c90564442c8b968ea1a3ad6fe56a80cf27e2efc3a
 AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a25a7e25d4f6c76088c3703259ab4899a354b0cf67eecb989bf4c4c05836be09881cce72145b3badca1393bd386a85f SHA512 cac0d183b3c555a25db37df250b2517ae4b762b7bc0d65ba0cb1093133f6f7ada42f6745b060d17f59c2177976841dafabcda61cf03d9cd14028399472f28ed7
 AUX octave-7.3.0-docs-texinfo-7.0.patch 1623 BLAKE2B 36a6ceda753083171ece9e4045af8551121f7073901d9f32facfd6c2bb88a10226f5aa719a79e8677c7a0cb7f26a226f2da190d9b4281b3fd666f570af3ac761 SHA512 0ac71393c59681a2188316356235ddb876e5c7cbf4a2ff1752bd3dddde7babeb456e0619ed65e32d5048d754416fb33c949aa0979748f7282e3e9d2589931612
-DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
-EBUILD octave-6.4.0-r5.ebuild 6098 BLAKE2B c4587e22f1154fc6e56b45141161868cdf58401f8a6ceea6f03ed10c24082c07331a4ab22d563e921e3dd759b1370d3f49e26ab4ad7e34d14a19fe9ca2864480 SHA512 5cc86da1f2ea8af04c813a92e8d7ecc05172033c1c29bb3b27ec061f7aafc13925dff05fb8ccb44f1fb6eb8fd2cbb00cfddc7f567d23cf22db1f061b623fc72e
 EBUILD octave-7.3.0-r2.ebuild 6727 BLAKE2B 2de036fb8ff4ac1786aba15d3a115b61317a6f3262e39758840f07f96063a81b6b0f035439422f7b329ace56f4d63ab4891d7add71e1491d7a749c934054da2e SHA512 f1d39df10bdca389a8a9ca7dd477bd9897ed6ec9a0f36569ec0ce27521721ce67f9dc8abea214d52a9bf58eb1387e97b95d5110112fd5aedc2a88c3ccf8cfa95
 MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8
diff --git a/sci-mathematics/octave/octave-6.4.0-r5.ebuild b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
deleted file mode 100644
index 9c173fa095d8..000000000000
--- a/sci-mathematics/octave/octave-6.4.0-r5.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
-	portaudio postscript +qhull +qrupdate readline sndfile +sparse
-	ssl static-libs sundials X zlib"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
-#
-RDEPEND="
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-text/ghostscript-gpl
-	sys-apps/texinfo
-	dev-libs/libpcre:3=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/blas
-	virtual/lapack
-	curl? ( net-misc/curl:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-libs/qscintilla:=
-	)
-	hdf5? ( sci-libs/hdf5:0= )
-	java? ( >=virtual/jre-1.6.0:* )
-	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
-		virtual/glu
-		>=x11-libs/fltk-1.3:1=[opengl,xft]
-		x11-libs/gl2ps:0=
-	)
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig
-	)
-	qhull? ( media-libs/qhull:0= )
-	qrupdate? ( sci-libs/qrupdate:0= )
-	readline? ( sys-libs/readline:0= )
-	sndfile? ( media-libs/libsndfile )
-	sparse? (
-		sci-libs/arpack:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=
-		sci-libs/colamd:0=
-		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0=
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	sundials? ( <sci-libs/sundials-6.2.0:= )
-	X? ( x11-libs/libX11:0= )"
-# bug #846968 for sundials < dep
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	java? ( >=virtual/jdk-1.6.0 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
-BDEPEND="
-	virtual/pkgconfig
-	gui? ( dev-qt/linguist-tools:5 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
-	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
-)
-
-src_prepare() {
-	default
-
-	# nasty prefix hacks for fltk:1 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# libstdc++ bug, bug #887815
-	append-cxxflags -U_GLIBCXX_ASSERTIONS
-
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	# tell autoconf where to find qt binaries, fix bug #837752
-	export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" RCC="$(qt5_get_bindir)/rcc" \
-		LRELEASE="$(qt5_get_bindir)/lrelease" QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
-		QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
-
-	# Some of these use_with flags are a bit mismatched. The configure
-	# script offers only --without-foo, and detects "foo" automatically
-	# unless --without-foo is specified. Passing --with-foo is not an
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	# The --disable-no-undefined flag is needed because otherwise, the
-	# build system appends --no-undefined to LDFLAGS and then proceeds
-	# to undefine things. GNU libtool ignores this, but slibtool (for
-	# example) does not (bug 776583).
-	econf \
-		--localstatedir="${EPREFIX}/var/state/octave" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--disable-64 \
-		--disable-jit \
-		--disable-no-undefined \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
-	default
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc $(find doc -name '*.pdf')
-	else
-		# bug 566134, macros.texi is installed by make install if use doc
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && \
-		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
-	doenvd 99octave
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-mathematics/primecount/Manifest b/sci-mathematics/primecount/Manifest
index a4a0028764c0..468b32e191d8 100644
--- a/sci-mathematics/primecount/Manifest
+++ b/sci-mathematics/primecount/Manifest
@@ -1,5 +1,3 @@
-DIST primecount-7.4.tar.gz 372374 BLAKE2B ca16004e1a1fe209452d1c4aa9d4dfe7816ff581ffbb9717ae9a8224815df0b672871ec3d749000099a91c8ee50bcc3c43cea3dcb9ff999436544bed2c2f5fde SHA512 20b33a1c0d2338f422a0da8723bafd35689f9c93918c7dcf64068aee1cd5e03f41d0ef49e39a7e920828b478e8faeda4fea477dacca1145c852f24d1f5e6ab5b
 DIST primecount-7.6.tar.gz 382074 BLAKE2B f665db8724b32b2f057db96fdd6421d7a996ed4bda7f43cd405e6c05b59abab8672407c41b6fafdd9c68dae3f51b65305112c0724c95ce3fdb33b9dbfaadfbff SHA512 643372d9a011dba8a49f21eabc00068b77a5ef5dc6d12e6b55230b97f14dc9d1d855bb7ad662beda548e4ff1396f1b06d473e2fe4b81e7dbe9926aaadc4da360
-EBUILD primecount-7.4.ebuild 1283 BLAKE2B c6f3a9262dbbf92d9ecb1b5c8cb797b65959dfcbc060b272be73e884122b21b6cc41375de4f0d88419c33f77a94112c5822b75f1e93168617f461178225a6756 SHA512 b93f008da408ca75be8107e2089fe704f5ab5a1ee9865f91817365cd5d581b80492603c504df0bbc336e10f9fd35737f6107f47b0d2e5b82d12f72a2c5636681
-EBUILD primecount-7.6.ebuild 1285 BLAKE2B bf47b2829baa0225873621d9e7273b132043c9ad568cebbdaf41cd6db24e3e6bac0e0297647f3388b06931c1c607ecbc03486a9bf70bc5b3bc46b34c1b0bbf8a SHA512 ac8fa955f7823f0e011c80a83c4a78153de258f7f2b12885beac179ff23ef277ba65ddafe1086b43d95526efa1dec025eb34f68b0ece932e2088996669fc1777
+EBUILD primecount-7.6.ebuild 1284 BLAKE2B 899f461eb37ae77f62bdddd5650cf26d89b09c7b5ba043c786c1787adb24bc3ac1aef05c01800372895fea5d4c5303745917a86e29be361261839b8eef19e277 SHA512 299160fa362a1720ed11ae0bfad56e600a44c4323190d394e75b83fcb849e55a735b862fa9c234a8ac6b0319a435c578ea04eadbd44e47a2647b80d95372563e
 MISC metadata.xml 674 BLAKE2B 2d8321166afee1e9d0a20723ae6849f17a7ef0d5d474dc3ec0b1650519b197ad5b1360641faa6985a60121501741a137812b8bcf03cd708766278a1b014615f7 SHA512 7a4fa0c1cae4880bdc230065c98ec46dfb5f1b1adae6ffa5eac275f6f04f38ce0c24042e62f5aac6117f9f816890244daec8fb1c920ec4b6a0a124385e5d7e33
diff --git a/sci-mathematics/primecount/primecount-7.4.ebuild b/sci-mathematics/primecount/primecount-7.4.ebuild
deleted file mode 100644
index 457c9e552afa..000000000000
--- a/sci-mathematics/primecount/primecount-7.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Highly optimized CLI and library to count primes"
-HOMEPAGE="https://github.com/kimwalisch/primecount"
-SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/7"  # subslot is first component of libprimecount.so version
-KEYWORDS="amd64"
-IUSE="cpu_flags_x86_popcnt +executable openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=sci-mathematics/primesieve-8.0:="
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	ChangeLog
-	README.md
-	doc/Credits.md
-	doc/Easy-Special-Leaves.md
-	doc/Hard-Special-Leaves.md
-	doc/Records.md
-	doc/References.md
-	doc/alpha-factor-dr.pdf
-	doc/alpha-factor-gourdon.pdf
-	doc/alpha-factor-lmo.pdf
-	doc/libprimecount.md
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIBPRIMESIEVE="OFF"
-		-DBUILD_PRIMECOUNT="$(usex executable)"
-		-DBUILD_STATIC_LIBS="OFF"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_POPCNT="$(usex cpu_flags_x86_popcnt)"
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-mathematics/primecount/primecount-7.6.ebuild b/sci-mathematics/primecount/primecount-7.6.ebuild
index 4675e44b1d5d..7ea70f3af335 100644
--- a/sci-mathematics/primecount/primecount-7.6.ebuild
+++ b/sci-mathematics/primecount/primecount-7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="0/7"  # subslot is first component of libprimecount.so version
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="cpu_flags_x86_popcnt +executable openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/primesieve/Manifest b/sci-mathematics/primesieve/Manifest
index b223a9fed609..99a97efddbef 100644
--- a/sci-mathematics/primesieve/Manifest
+++ b/sci-mathematics/primesieve/Manifest
@@ -1,5 +1,3 @@
 DIST primesieve-11.0.tar.gz 125086 BLAKE2B ac425b6435bc95efbfc3d7458b59719af390508db811e0a993a606397166771cfcb9c0269249341fb6f678aafa8bae4a89e7a914176f61a608e6ccdfd0cab22b SHA512 1be9ff9d07068cab1ca69315010238ab15e5ba3b674bd45e9a0e11d20418810ece05a8df3853796118193468ac2ac6e24391f82d6db9581658ce59ddabb5b7fc
-DIST primesieve-8.0.tar.gz 119635 BLAKE2B e769cfe35752e809cf1611b3a9034bc79d16311c73d5065880cbec9c8179a2149ee9a3a6e277466691c44adf07781e1c7f9aa53f140714c4c9d408b24df17848 SHA512 213785c89868f224091fe76a74b98a896c374a7a96e2bdb44b07f4c6288bd50e22d9a563382fb512e71a1ad366d8b94e74fcc8b5f58bb94c85b4d435fbb6a571
-EBUILD primesieve-11.0.ebuild 1038 BLAKE2B f55a8f7a3f6bd3fb77be1043b3ef2c646d9ee3af362ba680dd464c09af828efc8ca9558edaf119853a7d40466b9c6d412e28ea88f51f0f666bb0c6597f764f39 SHA512 0ec2f17b790c6cfa07d422ed10f0a52b786d49cdfa1ea89e8e54b68aec02025d84f864b2137da2d5a02fea490904d8ce7787121cfd2f3b4dccd44fdf5b250bdb
-EBUILD primesieve-8.0.ebuild 1037 BLAKE2B d562e362f0053b2b1e87a947d238f2e47c0e53254cac2ac9e8be0cebfb4707c76be66388b62af55ae2a56ab23c9f58051c692a64f306178accb5176c386233b7 SHA512 269e6cc602f2f72187319b0523383abe8cba15fb26a8d56432489b21e6b03cbaf340573a5cfeffc4faa2287f3729991491e86e7433e38ab94c7dc08e05df97cd
+EBUILD primesieve-11.0.ebuild 1037 BLAKE2B 8ae90aed14d4fc6ee6c835b52dc292ae7e1221c5335f7189776d2b021ea84d96a990a0651875842c5feeacb49b00c4eedc4bb624058f1e88d7a167fc04575204 SHA512 a08793e6c44607704592681a7b6b7d101f382c9216f84e68501cdb27754a46f35210cc9b419337fe863d46242be324f99bf79b48c3fc1b61ff8aeef3fdf059e6
 MISC metadata.xml 672 BLAKE2B e580c88061b6dcece5a34fde2cd13ce8c55264f3bac16fe3af6374df92d6280993452ebeea3d8446d9f8afcf7c1cb6927405c40e82a1c01a153d5060c77392fd SHA512 8ad3dd50c172ad3333d30a01b0e7ddb8f0f96b7666b61a0c6a1644e92abc49fa75f4f54c4c88eb72c2c8c7104d5e720d852bc7319fbc1a9569fcc5de85529b02
diff --git a/sci-mathematics/primesieve/primesieve-11.0.ebuild b/sci-mathematics/primesieve/primesieve-11.0.ebuild
index 44fb41efb869..311cdce23898 100644
--- a/sci-mathematics/primesieve/primesieve-11.0.ebuild
+++ b/sci-mathematics/primesieve/primesieve-11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/kimwalisch/primesieve"
 SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0/11"  # subslot is first component of libprimesieve.so version
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc +executable test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/primesieve/primesieve-8.0.ebuild b/sci-mathematics/primesieve/primesieve-8.0.ebuild
deleted file mode 100644
index 70bfdd3e99f2..000000000000
--- a/sci-mathematics/primesieve/primesieve-8.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="CLI and library for quickly generating prime numbers"
-HOMEPAGE="https://github.com/kimwalisch/primesieve"
-SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0/10"  # subslot is first component of libprimesieve.so version
-KEYWORDS="amd64"
-IUSE="doc +executable test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz )"
-DEPEND=""
-RDEPEND=""
-
-DOCS=(
-	ChangeLog
-	README.md
-	doc/ALGORITHMS.md
-	doc/CPP_API.md
-	doc/C_API.md
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC="$(usex doc)"
-		-DBUILD_PRIMESIEVE="$(usex executable)"
-		-DBUILD_STATIC_LIBS="OFF"
-		-DBUILD_TESTS="$(usex test)"
-	)
-
-	if use doc; then
-		DOCS+=(
-			"${BUILD_DIR}/doc/html"
-			"${BUILD_DIR}/doc/latex/refman.pdf"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_build doc
-}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index d9ee5189433e..fa5a7eb62149 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-openssl/Manifest b/sec-keys/openpgp-keys-openssl/Manifest
index 183618c0adb2..97a6c2d02a62 100644
--- a/sec-keys/openpgp-keys-openssl/Manifest
+++ b/sec-keys/openpgp-keys-openssl/Manifest
@@ -7,6 +7,14 @@ DIST openssl-keys-20221101-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc 5194 BLA
 DIST openssl-keys-20221101-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLAKE2B a9913d00635a73636dae7ea30bf16ade55a8f56d6fa3a804ebaf736705cfb3628b4838289c9b9847d1809da94dd4c9c23d01fe0521701dd164ff5036cfa78ec3 SHA512 c7927ff7643ac4aa12f516103d76af4c56e25f3d3a3d4064ec5d11f30d9447899b18c22cfb7217488b2e5b912220269e78668655343db52f486d29788e4759fc
 DIST openssl-keys-20221101-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD.asc 1534 BLAKE2B b572d5893a44f120b5ddec55d96d53cb5bd490e563253906f597fb8253c198f0fa318a955b4f30db3b93565ea87e0e423db661de17253fc2255843513a86b6b6 SHA512 359acc73f14e9c6ba68729b234f0bc94d67bc16eec7a18bb641bdfc8d51e19c2afa96292e99c97308ebce4bb5e4aa040beabba051f08b42fca242dff2e99b7f7
 DIST openssl-keys-20221101-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
+DIST openssl-keys-20230207-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc 3050 BLAKE2B 5c785d9ed3019865fac34a0b7647ddadda30ceaed57a711c32483a1309b2160209a50b89bc9a01a1696b691999e27808ef2a44e94242478e388d963b8a2c13b4 SHA512 583a32254ea46b89e348ad14f22a784920b6ca3c75b9bd681298be94e5d367a6beedf4b320212ddd5509881e1bc88a643680c9ff2829d7a529d3f27956e2e086
+DIST openssl-keys-20230207-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C.asc 5302 BLAKE2B 30ec164d0022c432747063e8aac63d51ba44d3f1096925376aed00d8b843835d891b01e2b4b46abd0e4567b4108ea96266a2a8949508e4767632bc01cf3901c2 SHA512 724a2ba71404c7bcb7aa6ec5ab6fe91b50c3294dc1b0791a369554505c812a142879a05663d098447f20a7383e039dcf4e0699740c4ab0ba4393c891e237bcc0
+DIST openssl-keys-20230207-8657ABB260F056B1E5190839D9C4D26D0E604491.asc 1531 BLAKE2B 7333259523feb8e79c00c8f0652544471abfc087ebbe149eed2413f8e55637fdb3138d39885a88aafecd7b8edda207542198dc2deba8a882253fd91cd5ab0ace SHA512 e3f9b5a77124fbecef6c37a1d4fe8292ccc3210eabf60d6349f704d22014dd4d3343e40dc26c65659297e2a713ddbec52662924ae93468a6e0e9709f724944a7
+DIST openssl-keys-20230207-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc 3505 BLAKE2B 10e4a6970366dd6c2b2633da3045cf3da0857b1ea1f84b40bf0b85b0424583030593d3eb85bab06fe9b1dcbaa7c4c5c7023cb8a5d82d9340b0741601b6a79deb SHA512 154f173c316cff4c325746de3c6c992f1a493315958bcfb6b9c273edb9921d78f8c5febb69d6e8a743d89427aacc181e90ccc8098deb97295c2c6b258867be96
+DIST openssl-keys-20230207-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc 5194 BLAKE2B e8bb04c8590ec2171f024c49439bbae04690f14db4dfac20ddc43d963659d2b3788dcd34105f8c987b0413cd5803222cdbaf5ca3b7ec8808eb43c3a8bf23da8f SHA512 fe14c26a3075019d9c876f23550d3c897b5773f4ce92d68cb578d2a266557bf00ced11a91d048d2e2448f0c453651f61faa42eb1608d9d0faed8ddd03ead7ec4
+DIST openssl-keys-20230207-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLAKE2B a9913d00635a73636dae7ea30bf16ade55a8f56d6fa3a804ebaf736705cfb3628b4838289c9b9847d1809da94dd4c9c23d01fe0521701dd164ff5036cfa78ec3 SHA512 c7927ff7643ac4aa12f516103d76af4c56e25f3d3a3d4064ec5d11f30d9447899b18c22cfb7217488b2e5b912220269e78668655343db52f486d29788e4759fc
+DIST openssl-keys-20230207-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
 EBUILD openpgp-keys-openssl-20220316-r1.ebuild 946 BLAKE2B 6b8ac9655a53640847401483270e68c1841f91c1c29fac69c8a40298854881d02306ab5c9725230e622f64cf6c642276bc8bc797f682bbfacb202c871d7ff81e SHA512 c6efc3cbee447ba2e3d3708b0c3a68787d475458a57f7c3f3d0743a72e259f8c517054678d01ea764c5fe59b6a745bbcdc45cb81e47978a28f20fcf30ce71341
-EBUILD openpgp-keys-openssl-20221101.ebuild 1879 BLAKE2B 4f5752ddb775d2f4d7e346e6bc5d3125593146d58c1b059ec649c042d62d57f1793bfd5d4a3263eec58f97360bc3dc96eebfcf5e871d09c992955d92f29edc93 SHA512 7d6b9632bd1271eb8f3bc38a615713708d042f2ea65cc5010980943ca12e7d26cc6a539b77a54f2b0c8c65ad0dc0df3ef62ae4f27888c8bc023851b06db6b7a1
+EBUILD openpgp-keys-openssl-20221101.ebuild 1924 BLAKE2B d78a943602a99aa0c18c7537f58cbe2f41050ba006135714a893a88802f8b62d7aaeb20b8ac5dfede4395f64c27783123a5b49f37fda993ef97be4b9968690a8 SHA512 92c3cc7beae6d76daa8ba5354704be45108ed0c9b89c267ac14858d20edce786a4f26449783b0319b1c2c9b873d367567a99271105c742fb423cc57ad7d3cc84
+EBUILD openpgp-keys-openssl-20230207.ebuild 1953 BLAKE2B 393623d201f03323b39b0f7c9b9eb2a05d9590cdbd228bdc8e9b6fcbb12751ba6673c337708cd5a75d867cbf139ec2b44a5350b1804ed17f1c72c2086660377b SHA512 43762438c4c8c4c39c96156197bd451c742dc4d596885000106caf4fc91caa3df8dce9a28c29c46e9adc33c02bf4e433e58852cf865bea817b21caf0545e5dea
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
index 31738282d033..1df7f769b9e4 100644
--- a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,11 +12,11 @@ HOMEPAGE="https://www.openssl.net/"
 # - https://www.openssl.org/community/omc.html
 # Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8657ABB260F056B1E5190839D9C4D26D0E604491 etc (unstable results)
 # ```
-# gpg --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
+# gpg --no-default-keyring --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
 #
-#for key in "${OSSL_FINGERPRINTS[@]}" ; do
-#	gpg --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
-#done
+# for key in "${OSSL_FINGERPRINTS[@]}" ; do
+#  gpg --no-default-keyring --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
+# done
 # ```
 #
 # https://github.com/openssl/openssl/issues/19566
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
new file mode 100644
index 000000000000..f4f965bc9856
--- /dev/null
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by OpenSSL"
+HOMEPAGE="https://www.openssl.net/"
+
+# See the following:
+# - https://www.openssl.org/source/
+# - https://www.openssl.org/community/otc.html
+# - https://www.openssl.org/community/omc.html
+# Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8657ABB260F056B1E5190839D9C4D26D0E604491 etc (unstable results)
+# ```
+# mkdir /tmp/tmp-gpg
+# gpg --no-default-keyring --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
+#
+# for key in "${OSSL_FINGERPRINTS[@]}" ; do
+#  gpg --no-default-keyring --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
+# done
+# ```
+#
+# https://github.com/openssl/openssl/issues/19566
+# https://github.com/openssl/openssl/issues/19567
+
+OSSL_FINGERPRINTS=(
+	# Matt Caswell <matt@openssl.org>
+	5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33
+
+	# Paul Dale <pauli@openssl.org>
+	8657ABB260F056B1E5190839D9C4D26D0E604491
+
+	# Tim Hudson <tjh@openssl.org>
+	B7C1C14360F353A36862E4D5231C84CDDCC69C45
+
+	# Hugo Landau <hlandau@openssl.org>
+	95A9908DDFA16830BE9FB9003D30A3A9FF1360DC
+
+	# Tomas Mraz <tomas@openssl.org>
+	A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C
+
+	# Richard Levitte <levitte@openssl.org>
+	7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
+
+	# Kurt Roeckx <kurt@openssl.org>
+	E5E52560DD91C556DDBDA5D02064C53641C25E5D
+)
+
+ossl_key=
+for ossl_key in "${OSSL_FINGERPRINTS[@]}" ; do
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/openssl-keys-${PV}-${ossl_key}.asc"
+done
+unset ossl_key
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - openssl.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-yubico/Manifest b/sec-keys/openpgp-keys-yubico/Manifest
index e05fd45d802e..797e9f792166 100644
--- a/sec-keys/openpgp-keys-yubico/Manifest
+++ b/sec-keys/openpgp-keys-yubico/Manifest
@@ -10,5 +10,5 @@ DIST yubico-8D0B4EBA9345254BCEC0E843514F078FF4AB24C3.asc 22919 BLAKE2B 067364f6b
 DIST yubico-9E885C0302F9BB9167529C2D5CBA11E6ADC7BCD1.asc 13110 BLAKE2B 84d6e1ce46f1565045fbeebc16c40a42c118f0241c131545f9ebb1978e97a51d2ae2f72016d927f52af2fedeba70411b43574be9bc17f062bb20ad6f74790937 SHA512 2a87b0bafebde8e893ecbc119cff7ed705d6691a40945a95a1a690046d0a4a743dd885ab768b280b8d8c33f12870ef11c4589a2196fc59c9537a5e82b7bc2b62
 DIST yubico-AF511D2CBC0F973E5D308054325C8E4AE2E6437D.asc 7004 BLAKE2B 47dcba04cbb6043531d780931380b6fe85c6399049c85ff9b9a92f258f4b3e8bd11afdf28fbb395b25d9f19d98de01ac870db6369c4f94f816042e4a604cfd9b SHA512 9398e7b684958d88bf02588be592978622343c4c4ba9cfdc9a789a397cdb7834b343832825255919fc96d58057326ed13d41453171bb2fc8384fe6421178d71e
 DIST yubico-B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A.asc 36922 BLAKE2B b3de3c3ea8e90fe507339191ec8cbf2b2b730982e3ddd57d04f2e46fcf6652172d0a301da08e39357185039be2bd793008f5bf2588f6d34fa9a387069fd5a2fa SHA512 d304dbcf9c27bc2ef36d770a6c99c6d97996f989644323a988ef80e020bf0b98d4a15ef315cdddd8aad0644153a098c9ced36153d285a80220c717a97b65d04f
-EBUILD openpgp-keys-yubico-20220824.ebuild 3006 BLAKE2B 0382b120d0888ebc973e1ad1e320b40f3ebd86638439e806b59844783a0af04748ff2b528e02a67abba39f2cef4f2275fdef217c0a2af9b9c4f45934b65238c9 SHA512 246e9b72f6295887d3ae9ba3a15c154befe5ee5dcaefcbea6861ef548e759394cee81f4cd45e69c245bec3b6e7ab0794e67b5c5e2f27f3ca2957ff9dbf749ac0
+EBUILD openpgp-keys-yubico-20220824.ebuild 3004 BLAKE2B ed38ef9d0df6e19664892e58bb55814fcddcfacfc808d2e9925188647bbf95a57822b46cdc66e4f6c5d072c02e4bb3fa2d04583a7f3e619ea763125d8ad5e436 SHA512 c7e278abebd33f80ba6996e10b0c986efdf18dfee695ec365cd3aff331643a8004dcdcf6ecad84ec616f7548c8deffcaf1173ad38f45a2fcb73d83573bd7cab3
 MISC metadata.xml 270 BLAKE2B d90b48ed01ae5992ffbc202f3986e25094317fad7487f19dd94522a125654901ab9530e2e968019e914fca406b14128723d976f4135fbaca04a2b940e153a225 SHA512 1227df9b05e8c78e076c45e582f308979de96289b537eeaf49eec613d0149ea62fbed862310b6496f39af5d935039c64d5fedc9ba82be4023cbe6c9b44a61dc5
diff --git a/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild b/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild
index 012ce84ae3bb..c4fe050d9f88 100644
--- a/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild
+++ b/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.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
@@ -47,7 +47,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index f6032b4c3703..7f504ad2b1cb 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 079310c7c92c..0aeb148eb714 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,6 +1,8 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
 DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649
+DIST xwayland-22.1.8.tar.xz 1273668 BLAKE2B ad1f3e0a6a3782b271653864380d0beb0db60293fb96ab8f218caaeef245967ad46ca505fb516a936115c9d49e6a32bffb725bc6c95dc98a6c4c24521c6022df SHA512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a
 EBUILD xwayland-22.1.7.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
+EBUILD xwayland-22.1.8.ebuild 2154 BLAKE2B 4a2a30b487dd1d7ffdbb8e962ff10e282169bc298979ca213a2c20530c85b532f29c052e60ae97276d5bc85e6536676afc898e1b395a22dcb9acf7c8353228e8 SHA512 78af78fcb0ce3b71ddb5d21a9c5ed5e499e514370e96695dc8a9acd81ce446dd899e4acd2aacf1fc2984aa63c3deeca1fd83f23bf5a142252d3f9b63e485fe51
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.8.ebuild b/x11-base/xwayland/xwayland-22.1.8.ebuild
new file mode 100644
index 000000000000..29a75c9fb37b
--- /dev/null
+++ b/x11-base/xwayland/xwayland-22.1.8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+	inherit git-r3
+else
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+
+IUSE="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.20
+	>=dev-libs/wayland-protocols-1.22
+	media-fonts/font-util
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	media-libs/libglvnd[X]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libXau-1.0.4
+	x11-libs/libxcvt
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	x11-libs/libxkbfile
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	!<=x11-base/xorg-server-1.20.11
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Ddpms=true
+		-Ddri3=true
+		-Ddrm=true
+		-Ddtrace=false
+		-Dglamor=true
+		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
+		-Dscreensaver=true
+		-Dsha1=libcrypto
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxvfb=true
+		-Dxv=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Ddocs=false
+		-Ddevel-docs=false
+		-Ddocs-pdf=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e9fbfc118f96..e32c4d9432ba 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gammastep/Manifest b/x11-misc/gammastep/Manifest
index c9d7e67ec2a4..37fd054c4b18 100644
--- a/x11-misc/gammastep/Manifest
+++ b/x11-misc/gammastep/Manifest
@@ -1,4 +1,4 @@
 DIST gammastep-v2.0.9.tar.bz2 540120 BLAKE2B cfc29b157ad2dbd3d6bb0ac4bdb26c958ba07cad3e817931c2ee4c2e4d15c157b7c0b8b891869ddcc2cdfc39c1d52afb8437991ae60501afee84500e1f28c694 SHA512 d8b23e5890d6135cef79057408e1b7c1dbc36444dfbfaf7c80a3f36c46df19eaded1829c2cd52365413779cc752d0911a44669b5abce16d7e266b92b15c035fb
-EBUILD gammastep-2.0.9-r1.ebuild 1942 BLAKE2B 45af25c0aedcc5e2e0924e058302e05d6dba29115675f747ffe7581e674b81b468e0bf124782faa9852a8a6111ce7b6f4289bf69c05ba57ccb00ba17e50c0c1f SHA512 4d7077c761ebb27b8047bc50a20dadae056c9183892f15f3ecc72b93cbb40ec3e197dc8e22b5e436cb34062680f0a3eb8b4802324a9f7f2cbcc71f5d0abb024c
+EBUILD gammastep-2.0.9-r1.ebuild 1941 BLAKE2B 7d0040d270cb5818b4f5a39a69db3aee9df9a94ad0a102904748c2fced3bca12a2c9252ab907b3261d7555337140358367e1d345a228b0d3b3229c335f2dc2a0 SHA512 cfe0f5d682c3323b242c6246f07c555dfd8a7d274211ba6e8def4353aed891abf2315547b2541595327cc7f1516f17931ffdd17864487f38cc5a8fc6a4d30d2f
 EBUILD gammastep-2.0.9.ebuild 1951 BLAKE2B dc03e43cbca16e98165aa5d8110d34c7a495b4564eecc668578bac3cecb1ff0828b1e0d496d85fbe2cf29b72f8e2b886f584c68f76a141d457139fbe10da3636 SHA512 b049f991c2d3227ab84cadeb0f97daeff47d769dad35ddd9662681cb6524a08261e40d96ea11c040b3a4a372d76d7b553450abfdffa2941f9ee2f59b3aa38cfc
 MISC metadata.xml 408 BLAKE2B 76e880ceff79cafe0ee71c2b2bab4c2977a43eb15bc2ffb26cf1431b6c9303bd3b95801e501d01134e546e20c0c83239864eb32e4b8bcea0c7eb8191bc191d8b SHA512 dfd49b49ec66241adb4e53941455d4e1df8af068f894748973fcafab0f8e87238fa3d358b222366efb897558dd7f05e67274a11799169470b5ea3d2663b10137
diff --git a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
index 6024a5b52019..92f8e6965471 100644
--- a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
+++ b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="appindicator geoclue gtk nls wayland"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4