gentoo auto-resync : 23:04:2023 - 00:06:15

author: V3n3RiX <venerix@koprulu.sector> 2023-04-23 00:06:15 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-23 00:06:15 +0100
commit: 0e1abc96fea41c994e56391bd01c5c9298236783 (patch)
tree: 53f4297b17f44131f819fb0ae2ce606dc7121108
parent: cf59cc78468c9bcfef9e16b7b27c115896d805fd (diff)
267 files changed, 1480 insertions, 5874 deletions
diff --git a/Manifest b/Manifest
index c14a29044959..851f1a374450 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29475 BLAKE2B f3b93c78871cc8cd705a17f251a98330f7940fcc6ce29dec17b0a1b9605dd31c04c4cfb059a6296414cc8540575b096a202ac76295c748933e51639df80cbb36 SHA512 e7aa5abc919e7ed8090c437c3924edc68bf59f28dac769ff8dae1b644f30b9c7fd177a283bb8f3268909a0fc6de1ae0b169e0edfbebd7645ff3fc83eff9f3b01
-TIMESTAMP 2023-04-22T16:40:10Z
+MANIFEST Manifest.files.gz 29454 BLAKE2B f43ac67a30e8a1f80b39f33390d95a0cc01540426952c10f5a18e3deabb62f4eb61d0b53d7f12d6389a3f8d8849bfac3aac0c02f2265e424f558f29df995379e SHA512 8990ee001368d2c5373f1896434ca6f67d21c56ab71bb53f73015e55db0110352bbd5e5022dcd563556f1cb1547858b7294e104b0fa7b68baa91a2ce6592078b
+TIMESTAMP 2023-04-22T22:39:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREDepfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREYihfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCvOw/9FhbTuoiQONrbavro7u2yZ0OlwzQ3jSApSx9wl0FBWXMFGXRYTD4s8f+c
-6aH4O951uwH430rioDm3yCdQmC+ecHD8ubAL7JyJRuf3Fz1p+afVfBUinidgbAqC
-ksQ5aqh+zQI3HiPWejV4IQ3mcGJaaykYLRoJD2izTChPxTXvKiCh4NwrFoPDKuC6
-2E2j1CXjswRZtYMr8sv/cKKgA/0QVbhvVJsJHTilSL8TvmjK7oIrb8pp/WH0quxg
-pH4QgyJAiOYzvna0aT1/5N/5zGnQXCe+rQsjMIUf0mUjWe2tie1RjBjKgJVebIeb
-lJOXf8wSbUIVyEnivUwSxRQLe1bAUMfkDZW+lpNaG8xCyrbqDSOfSqfeIqz9v08x
-L0Cp9w2x32yC9rjYbPdUZF36AQfF+whyhpmLLW0Ir1CUlr0lmmLzUGwRelW20tgr
-cWbG5zG1ianDTMmZ7jPpJs1dkhtFv34YjSJhVQie2ivn6QBvrKnK2XJr9U+HkF4f
-x65CEnCcfGyN4mhK/oX2c3kDhXNPb41aflXq+Jb3Jo4ywewZ2hC9XyDV7uOU67dB
-gD4/Xzj8MnWlrAuOIzbXCmkahSg907ex7Pc2MN9gJqmlacnwPq0FPMigJfcc1Xke
-PcNEtMSoycbTxbiYtGQ+4Hy3Iovb8S9bxAQVm84SeRH2ktBG7xA=
-=bHjC
+klA3/hAApeRxlbG9Hro7ryFMZsAZUUL4DPxvVPe/68NJ3F2p/eu/UhLCEKxVjzoM
+uGWP/xAMhqCJcl18vbu/CMZgT5JxaqDueZ3CRKefo0+ANUNrP+OrqhO3CA6kbdra
+yUPslBObYyoeOBrvi3UDd4aW6+nzuWnYdvB1V6QS523YdhEBk00ex+f23gKjp2im
+TZRQbe2eEzU8sQ1ALxJe8KN+q1JiwnrB4jlJaP1J2X25JtgajSczEr3C/iT4xIOe
+PvTGj7Y3N141yBOvytkT8xCZBtxl43CAfqshFcoOuSJBNT+OIwIdmRqw6keQzAgN
+Mq4O+U6Y7Ybqtcnyn/DeBIndrCGViddJnizrGThCuOuqhWS1gxzw1tQbaYv/VhQf
+1/1nGUwDNdsfD9I3qZeWcia/LxHaPbNwQq12XdjJVVPqleVDAri1h0/vALGpVKlw
+jUdCs9IALzyN5OXV0fqN7JA1kW6k/QnhE2/L1/FeEf0g2kl0cOAKnqgJ4XesVZaa
+QzcLJrykSCYgkLB0B3Y0y/aLjN1iUW9b+ZrmUXCGQWYwW9O0sCzD8IlaBgne+Sa3
+2yTURVvtymwEHO8bKjZFNTLj74VzSBJ62edSY63oi5ZM+dvsBhuAQyrLPCZoJ1Jg
+fFDKkwQDgyCj7lyUy9xeZ0vgHNV5ntwauaGjPKhmEiNbqH3sl7Y=
+=EFJ+
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bd21a0875324..03e0fd2a8d40 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index aed61fc3c3b1..9dc5749313ed 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index a7acb03a2ef2..dd554d4671e9 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,6 +1,7 @@
+AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146ac3296293f1f612846e61fb19b9a1df626ecfe9ee350291cf2e35b4441335297adeb0257c3b93cccac1019a504fd63e94de265a2 SHA512 65053589a8ef5c269fb96b6493141c448189dc45e3f765955731f9cd64be85d86303c949ca494afca1b303952728a2ca6a4d8cffb798c766037cd4e514697c4f
 AUX calligra-3.2.1-use-cmake-FindGSL-module.patch 975 BLAKE2B 8d9750be1f74d0ad099a9d2f258eb8b1fb73f3a891b7cf2e2822c9f50126aa0aaf21188845b95e37c1fdfa00efb33ec49a8b3b824b148d9df29f1e30e299cebd SHA512 e346c71767a07686d18f64849822f54efd5f70f72e871d8537e46b22a646c2d225800632d01b6cde6afa86bae57b1e329991a1d906648c9328f58f4e3ec3c7ea
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
 EBUILD calligra-3.2.1-r5.ebuild 5740 BLAKE2B eee68fd25820fc31aec3ad18ec302b077e1801eef3236d204084047165ca58db1508ac1cbe0a58d8db1775a1515547459bf3153a67356b3f0ac1b220854b9cd3 SHA512 7b06e50abd506e5e1ba761bc1281bbaed0ebb3a42f078bae0f84abdedda00ba0065280fb0ecc96507a88e74559dff235b86032ddd55eee825d93866753e15a4a
-EBUILD calligra-3.2.1-r7.ebuild 5887 BLAKE2B 139c769659a90e11e026a72f059510d6c2e8280ba8684afbc487466795463fb37ba0db48a726395e6a849d693d04ad3e1506fdcc6d5f6b1078d4576137392e70 SHA512 e4c700d534a9a09d9bc79c5ddca754c533379cc612d7fca4538b2760ce0dc72a531f8a9afa3cd1eac8c8d3400dfd2d15e5c9b15777b87fa09a24fd9a4f2ba112
+EBUILD calligra-3.2.1-r8.ebuild 5932 BLAKE2B b6ff2e573f663c27a02b8cf09c4acc1f2be4abeb09afe19580c07b30cc406cd0f1723742ce2699688f1e431fcd45c6e8854d7e99ea3740784ac8e52d961b9ff3 SHA512 2cb60f8417ed4f81e879362fee0c68ccff5a4885b499f3eaca91a5380e5d050a9cb75d4f0ca1b25d861ad89a95fbb5c6477c734820d6dd6ceea3eee84791e440
 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8
diff --git a/app-office/calligra/calligra-3.2.1-r7.ebuild b/app-office/calligra/calligra-3.2.1-r8.ebuild
index 27b0ebbf1634..d757ece3bddd 100644
--- a/app-office/calligra/calligra-3.2.1-r7.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -126,6 +126,7 @@ PATCHES=(
 	"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
 	"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
 	"${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
+	"${FILESDIR}"/${P}-clang-16-configure.patch
 )
 
 pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
new file mode 100644
index 000000000000..c723eca0b75f
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
@@ -0,0 +1,19 @@
+https://invent.kde.org/office/calligra/-/merge_requests/81
+https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586
+
+From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 19 Apr 2023 10:34:25 +0200
+Subject: [PATCH] Avoid implicit declaration of atoi in CMake check
+
+Future compilers will not support implicit function declarations by
+default, so include <stdlib.h> for a declaration of atoi.
+--- a/cmake/TestModernZlib.c
++++ b/cmake/TestModernZlib.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <string.h>
+ #include <zlib.h>
+ 
+-- 
+GitLab
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index da7ce11440fe..621ac4ca8c35 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
new file mode 100644
index 000000000000..d86e6f32e1a2
--- /dev/null
+++ b/dev-libs/apache-arrow/Manifest
@@ -0,0 +1,6 @@
+AUX apache-arrow-11.0.0-shared-lz4.patch 456 BLAKE2B b6c8263ac0cf52e49004836ebd10095aa35e5261265f273d7c22dfc6b7a90ceae5882b9c4de51674f11e8b96e84f881141212e197a80dea9db567da7c033a3ea SHA512 11fab04e1c1da46b6407c52a3bfed12e7bffc36046dd8dc379d1a368010f01eaf7b5f791ecb9fb4d15dd778106b401663ea8c1aceb80e799201b71837c18203f
+DIST apache-arrow-11.0.0.tar.gz 19956186 BLAKE2B dff0faecbde9e2d19f092fd0c48a7ac7a401da6dbfd17f30af1b35c9e3fd3e1ba5611311f5bcb08383368de195cff783a178a9397a63a1c4f740a81349f8b8d3 SHA512 46df4fb5a703d38d0a74fde9838e9f9702b24b442cb225517516c335a5ab18955699000bf0b2fc7d1698ada6d2e890ba3860933b6280f5160b0fce8a07484d0e
+DIST apache-arrow-arrow-data-11.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
+DIST apache-arrow-parquet-data-11.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
+EBUILD apache-arrow-11.0.0.ebuild 2258 BLAKE2B b8cc1e4d4a8da6e05272f60e48932aea007f750c47d1a59db923e733df2dba264d75c8de8edc92075f2dced03630ede9bda9c7602c48facf9cce0ef31bbc66b0 SHA512 d391805e18a4d32d33120e856ca530f7e0bfd78eeb12e12f361236746e3d153528c698ff04ac5b1e7d9646c0c3fd96318c26fd17da7fcce7264f60a241a1e405
+MISC metadata.xml 543 BLAKE2B b5daf8e9028b74697416b7f29c9e1894e70faa985b62d1f6ff4bc92ce090fe5208666193f92662621732cd1b4024c092b92b18820452e8bd1cec832383063fe6 SHA512 710ce1906d4b90b37db8728dc614146cbc264c3a955830023f18e8edcbe3499a1668ea97bce7790c660364ec26558f8eab5998410296b17e7c0d684b1a5e1b5e
diff --git a/dev-libs/apache-arrow/apache-arrow-11.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-11.0.0.ebuild
new file mode 100644
index 000000000000..6d70b765d4d9
--- /dev/null
+++ b/dev-libs/apache-arrow/apache-arrow-11.0.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929
+PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac
+
+DESCRIPTION="A cross-language development platform for in-memory data."
+HOMEPAGE="https://arrow.apache.org/"
+SRC_URI="
+	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
+	test? (
+		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
+			-> ${PN}-parquet-data-${PV}.tar.gz
+		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
+			-> ${PN}-arrow-data-${PV}.tar.gz
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bzip2 dataset json lz4 parquet re2 snappy test zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	dataset? (
+		dev-libs/libutf8proc
+		re2? ( dev-libs/re2 )
+	)
+	lz4? ( app-arch/lz4 )
+	parquet? (
+		dev-libs/libutf8proc
+		dev-libs/thrift
+	)
+	snappy? ( app-arch/snappy )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/xsimd
+	json? ( dev-libs/rapidjson )
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+REQUIRED_USE="test? (
+		json
+		parquet? ( zstd )
+	)"
+
+S="${WORKDIR}/${P}/cpp"
+
+PATCHES=( "${FILESDIR}/${P}-shared-lz4.patch" )
+
+src_prepare() {
+	# use Gentoo CXXFLAGS, specify docdir at src_configure.
+	sed -i \
+		-e '/SetupCxxFlags/d' \
+		-e '/set(ARROW_DOC_DIR.*)/d' \
+		CMakeLists.txt \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARROW_BUILD_STATIC=OFF
+		-DARROW_BUILD_TESTS=$(usex test)
+		-DARROW_CSV=ON
+		-DARROW_DATASET=$(usex dataset)
+		-DARROW_DEPENDENCY_SOURCE=SYSTEM
+		-DARROW_DOC_DIR=share/doc/${PF}
+		-DARROW_JEMALLOC=OFF
+		-DARROW_JSON=$(usex json)
+		-DARROW_PARQUET=$(usex parquet)
+		-DARROW_USE_CCACHE=OFF
+		-DARROW_USE_SCCACHE=OFF
+		-DARROW_WITH_BZ2=$(usex bzip2)
+		-DARROW_WITH_LZ4=$(usex lz4)
+		-DARROW_WITH_RE2=$(usex re2)
+		-DARROW_WITH_SNAPPY=$(usex snappy)
+		-DARROW_WITH_ZLIB=$(usex zlib)
+		-DARROW_WITH_ZSTD=$(usex zstd)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
+	export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
+	cmake_src_test
+}
diff --git a/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch b/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch
new file mode 100644
index 000000000000..fdb26196d0bb
--- /dev/null
+++ b/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch
@@ -0,0 +1,14 @@
+Index: cpp/cmake_modules/Findlz4Alt.cmake
+===================================================================
+--- cpp.orig/cmake_modules/Findlz4Alt.cmake
++++ cpp/cmake_modules/Findlz4Alt.cmake
+@@ -32,8 +32,8 @@ if(lz4_FOUND)
+   # Conan uses lz4::lz4 not LZ4::lz4
+   if(NOT TARGET LZ4::lz4 AND TARGET lz4::lz4)
+     add_library(LZ4::lz4 ALIAS lz4::lz4)
++    return()
+   endif()
+-  return()
+ endif()
+ 
+ if(MSVC_TOOLCHAIN AND NOT DEFINED LZ4_MSVC_LIB_PREFIX)
diff --git a/dev-libs/apache-arrow/metadata.xml b/dev-libs/apache-arrow/metadata.xml
new file mode 100644
index 000000000000..78102c94fc52
--- /dev/null
+++ b/dev-libs/apache-arrow/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<use>
+		<flag name="dataset">Build the Arrow Dataset Modules</flag>
+		<flag name='json'>Enables read/write json format</flag>
+		<flag name='parquet'>Enables read/write parquet data format</flag>
+		<flag name="re2">Build with support for regular expressions using the re2 library</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 325feaba52c5..07d3cb73dd6a 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,6 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
+AUX chmlib-0.40-clang16.patch 786 BLAKE2B adb8075106bcff50ee6643c6ae05befe11223a1f973c8e76e0b62ad910b5c6ed864a6d9cb6cf3e07144893f0f030c7818bab6009b0cffbddd461dc4147cb6bcf SHA512 ad5a6d10a18c34387db100f2049283f1dc176b58e06943a29062744b2bdb7f93f6d84ed523567bf5216441728f728adbdd744b39cae6faaf23c53a39d7d1f079
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 832 BLAKE2B 4825ca357d357835fcd342394992b2946155a8c25bcecffb9fd94665e48f81d2519b3fe83bf471028d36261644ea7895771988b46ba0a632ab6ce0f211e2aed1 SHA512 d93e41fcabdb1bb7ae5b3403133add141e4e7f8350bcc87eff75e080feddc69f2fc6ddbab7ffe307814c464b3e90d2f0f290b5d09d0dd57b4e359df7f722673f
+EBUILD chmlib-0.40-r2.ebuild 866 BLAKE2B 9fbfd1715310c26af84531b536946059edc10b4c5c13541b0787ff964e1d0f4549e70ff9032c24ba910b8224901529c543dfc7c25a006c8d8e614cf027025920 SHA512 e5c269aab3508de881707f10d8b1ccafdded3c30b4039530377cb20e984e2646c19232d92daaaa85c80f67754ec6a92ca959288cfea038e5a8a62e5e37098245
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r2.ebuild
index abdf79cf4f16..cdbdd764997e 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ IUSE="+examples static-libs"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.39-stdtypes.patch
 	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/chmlib/files/chmlib-0.40-clang16.patch b/dev-libs/chmlib/files/chmlib-0.40-clang16.patch
new file mode 100644
index 000000000000..eb66b91d5556
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.40-clang16.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/871177
+https://github.com/jedwing/CHMLib/pull/17
+
+From 5877959e3eb9a54e131608c52e2d6f4c89bc0189 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 19 Apr 2023 09:47:03 +0200
+Subject: [PATCH] Avoid implicit function declarations, for C99 compatibility
+
+Define _LARGEFILE64_SOURCE so that <unistd.h> defines pread64.
+
+This avoids build failures with future compilers which do not
+support implicit function declarations by default.
+--- a/src/chm_lib.c
++++ b/src/chm_lib.c
+@@ -48,6 +48,8 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#define _LARGEFILE64_SOURCE /* for pread64 */
++
+ #include "chm_lib.h"
+ 
+ #ifdef CHM_MT
+
diff --git a/dev-libs/libptytty/Manifest b/dev-libs/libptytty/Manifest
index 9c0c3a4292a7..b36369f7ba56 100644
--- a/dev-libs/libptytty/Manifest
+++ b/dev-libs/libptytty/Manifest
@@ -1,4 +1,5 @@
+AUX libptytty-2.0-configure-clang16.patch 353 BLAKE2B 12f0219b6f185488b77401eabc94de87e5c66b384ab0ba0a04b1aa54ca3e9c6b85c8c8bc8c2fed15e1093568b94ea1ecc443ff2619e5df7bd2077b385db8d1f8 SHA512 f92f05432c7ec55507c4264fb2d79be22ec84da16f88f508b8ac4c8dfaf888d84be4d2d729e0dfbb596fa421e159d019c9bc77eb6b399abbfff9425721844c4b
 AUX libptytty-2.0-rundir.patch 183 BLAKE2B 51316869ccd9b490b3087ac1a825d7a7e570a79fe7e5758e76be756b8135a0af2b4a518baefd19f8c0e8f71b95488035f28b6bab9b42eae473f644ca2f8bff83 SHA512 266fd3df8aa88894f832ecff15e88e4f08cc2b188ce585a779b58d19bcdac83b8e7ea921cd96226ea74c402a4e7fc873a7764029af72a81c5ddea7efd307eb51
 DIST libptytty-2.0.tar.gz 45673 BLAKE2B 81112267157c1ba785052b2e1667c4af251991816005375d44efd1c4d9c58cc5e59324df35e556d45e46df6bceccc654d71e6c264dae5a15ea100cc9db63c5a6 SHA512 9cca5fddbcc4025c2bbe043e3367ac902d0024a34301258dafcf0de70935c055279d88227168d112d0e4c0dc37f1f49e1ea587bd6bddf0b9d92400657bc7be08
-EBUILD libptytty-2.0.ebuild 719 BLAKE2B 99f5bf213e3966e290304f2cd88036ae586eac44e0dbec0ad9d0dacdc8452d0843f46404ac1020f20826e0bc2c703ef5ef32e9c76b7a2816801bbc30c491a1de SHA512 0ee8c77db0d81480bda00aab55cac4024866bdde1c24f65760fbdbe9c2bbce1c97d299aa990f349af47b2e5db789608e9aa0509aecaee1725d13f5d7e04ed48c
+EBUILD libptytty-2.0-r1.ebuild 768 BLAKE2B 54bbcf348e7d3d40396c04c7270428ae352b933f9d7c894d4ba152cd6b756e87c3f06d741baa1b60666d5b3ad7bad7b95cae5b10c3f806e751d4df53ae3b1639 SHA512 281e8d561fbf20aea13f39b40a2842aa9cdfd0724fae10a67b507000f9cad851acd281d1f34a6b9e5cf644c4755caba7cb5699b96dd9d51f7449705256cb4e21
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/dev-libs/libptytty/files/libptytty-2.0-configure-clang16.patch b/dev-libs/libptytty/files/libptytty-2.0-configure-clang16.patch
new file mode 100644
index 000000000000..99b49e26e737
--- /dev/null
+++ b/dev-libs/libptytty/files/libptytty-2.0-configure-clang16.patch
@@ -0,0 +1,15 @@
+http://lists.schmorp.de/pipermail/rxvt-unicode/2023q2/002652.html
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,7 +95,8 @@ check_function_exists(setreuid HAVE_SETREUID)
+ check_function_exists(setresuid HAVE_SETRESUID)
+ 
+ check_c_source_compiles(
+-  "#include <stdlib.h>
++  "#define _XOPEN_SOURCE 500
++   #include <stdlib.h>
+ 
+    int main ()
+    {
+
diff --git a/dev-libs/libptytty/libptytty-2.0.ebuild b/dev-libs/libptytty/libptytty-2.0-r1.ebuild
index cfa4b8a6b1fc..6622e0666ff1 100644
--- a/dev-libs/libptytty/libptytty-2.0.ebuild
+++ b/dev-libs/libptytty/libptytty-2.0-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
@@ -15,6 +15,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-rundir.patch
+	"${FILESDIR}"/${PN}-2.0-configure-clang16.patch
 )
 
 DOCS=( Changes README )
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index e5ce1e412050..4265c7ebe44a 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,3 @@
 DIST plasma-wayland-protocols-1.10.0.tar.xz 43268 BLAKE2B 1f0bc6fcd822ed8f010a1e9144b4e423e44de04c429e39a465e2ef5e59553d22db08fc379b84cc93624fa5dd64ca00ddc7d0e788251809036bfd09c8fe6ae0b7 SHA512 ddb09de9b3320f8e10d21c5d201ffe43d7e1f2f6c0d0c1b33aced28d8c324c9439800b4bd1516e7a34e45b1ac94e252c825216378d52b5cd6d671d73baa24c03
-DIST plasma-wayland-protocols-1.9.0.tar.xz 42920 BLAKE2B cdf277f0fad842b018bdc05cfcb7834b81750784d395fc24ef1c906d828d178268f524af5e3383d0f2f799a73aad44d78a82c4fa333f420cdf89674ed98d373b SHA512 96157622e22b19da9b2b842a9996595d75b792c179127e617347429d01bc8236d44cc12a5c34dd2ed903d4b43791ffaedc44cf773b82da9b60a06f711353a68c
 EBUILD plasma-wayland-protocols-1.10.0.ebuild 463 BLAKE2B b0bd9912164d0f7a0d6982a0d62827e2f7809e4e0775761e65c31534ebd2bd1d551c24f3435ab6485b68d6ec5b60cc6f79bce7f0119518b9469cbb24a2b3e746 SHA512 f097ab26a1936abbdc2a94b60c29972b759165a007c9f704ea9d76604c79c9bb984fdbf7152f70ebeb800af83d297ca89248e188c6d39b527158afec19160c66
-EBUILD plasma-wayland-protocols-1.9.0.ebuild 463 BLAKE2B ebbd2ea3d8d0746c04a4ce801abb5050f25bf6c0ef6786f8aaaa1d3626d4ae6fb5fa67cbca345c8e1f4f4751176a46afb5798540e8f5f1bf887d2bf13779deb2 SHA512 e0ba5c569b09efcec3ea0cd6f625dc9fd1c3eaa6ae90e8055c7d349aeaf17e492b4d79b1da9469775b73bea4868fe4eb3430fbf3e25ca7303d504f53647fc41c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.9.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.9.0.ebuild
deleted file mode 100644
index 0cbb9ba6f14c..000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.9.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI=true
-KFMIN=5.82.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/dev-libs/qcoro5/Manifest b/dev-libs/qcoro5/Manifest
index 628aebd18d23..b7e8a473a706 100644
--- a/dev-libs/qcoro5/Manifest
+++ b/dev-libs/qcoro5/Manifest
@@ -1,3 +1,3 @@
 DIST qcoro5-0.8.0.tar.gz 139254 BLAKE2B 979e1744951742c7a3f5a70d291e0e63d6be1d73794c9af32ef48b8e440c1919ae487cf07d1896cc2a8e7bdf8a51cac14f81a6e17689b57a93cfb71db3500282 SHA512 bdcf6f9113e5dde57fb56abdeb5106dbba8892ecc6c11d9f4b8b653570ffb0e25f63ee0fe87cd9008e02b99b76f959b9af00b2875420517b13295d6b108db2cc
-EBUILD qcoro5-0.8.0.ebuild 1381 BLAKE2B b057de43c40938d86266ea98519f9fd639e5683bda04a35894fc5061fe2bf90bfc94186af88768d17765b87baa196c505b29630f57df006bc2d5370ea67764bc SHA512 8d3065f0a3e8ee4913428d2686b649274869c738833b81015eb740e343257762f2e78403116d86b32545f10d57799c0d24f4e6b2ffeb8518ef20ed71700e751e
+EBUILD qcoro5-0.8.0.ebuild 1388 BLAKE2B 70a98d40fbdc28724d63beca826e337925238d97c9e71ceb881043b67b8a26e91fe0e89024d6a19d6c0cf96d2274a5081ae9c9ceb625a1c7b83c83ef2fb99291 SHA512 1cceba5a40bbe1de2acbf59d3c90bd9ff52d2ed3f5da83f065c00be993120bd691877485b8882d0c740e14c8315e75f04133eedc891a7464d28b5d57b73685b4
 MISC metadata.xml 647 BLAKE2B 99bb798a9950348fa169dcd61f759a2e5f179a7ffe70037be3657e0d01174d75694878355baa40256293380511decd804e1a0ee5eaa136d7279b99c78be64269 SHA512 9936b38eba4cdd71221bd5eb370bf782d9aee4665d6be6784fe0ece893e0deaaff8aff978fce308264d956e813185dc16b4bd0b3a7b36ebdd674f5782e166585
diff --git a/dev-libs/qcoro5/qcoro5-0.8.0.ebuild b/dev-libs/qcoro5/qcoro5-0.8.0.ebuild
index a150b86d5d4d..a2483ad86a89 100644
--- a/dev-libs/qcoro5/qcoro5-0.8.0.ebuild
+++ b/dev-libs/qcoro5/qcoro5-0.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/danvratil/${PN/5/}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/5/}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="C++ Coroutine Library for Qt5"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8bc6d1ef2335..67bb76af1ccc 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 76672693c9f4..34c28f59092f 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,15 +1,7 @@
-DIST cfn-lint-0.74.3.gh.tar.gz 3456672 BLAKE2B 9cc68ddefda86ee26e900989e40c7ded067fecb35cf077d559ebcacd6838378028010630e340dd52f04750dcc12094fb800e8e48a4c9e0607645463d3ca55827 SHA512 aad2209fa16f717d20127b2cf47d9aba586b85ccd41caf3ad8a50a6894cc3402d929be4cf9f76530223a3d69d79d843ef0edf802e53984b5c34563cf766f8189
 DIST cfn-lint-0.75.1.gh.tar.gz 3487870 BLAKE2B 26aaf3b24023260d7a7d8f2b89fc9135e0c34786540c21d1c1763decad42167f1a29b01859bfcb17fe5ac1fbbb08aebf04191c6d1b21b335c92e2424c986cada SHA512 d4dfa9331c77f7c323b217203c470e15b4a62a86b42497934a4f9609d54a499211058cba4c561034f6c3dd6ba52ade30084e9a9d25da135289f783ed972a14ae
-DIST cfn-lint-0.76.1.gh.tar.gz 3631194 BLAKE2B 95d395369fc230fe4e6c5d5e2a0e4bf246f1f312c6595e998004d43a7662e43ed0612a56893956fbb15e99ed197d9af2723fc1c2ea9b14fc27d8b4ff7b29e484 SHA512 5c65111fa7f57b268f2f3f52157d464de467cfdf16cd672e399ab7b2d23d648346c6754c45cd169f993ae15180ffafc710c9f2fa0675a7ecb1d8fc5b3d0ec5ce
 DIST cfn-lint-0.76.2.tar.gz 3402554 BLAKE2B e5f9405d2852e3b81140a24d94c90a3bf8c919eb6823280a0a887c6acc56ec71d991cbc76532cc49d1189a8f64750ba3e9db02fb3b46b27a28ec3468f4dd268e SHA512 96351ade16308be18baace1351e263a179eacc0b3635e9baa959baadaebb6a08825f6cb9cd83cb83b8635785c7f54405bfcf00f85d6d95d101d3298919cd1ea7
-DIST cfn-lint-0.77.0.tar.gz 3474124 BLAKE2B 5715618f6b44a7a88ef3af8d21d038fa4ce4707973e64eb9712ff524cd5276e71802ad4b9a55580ac469b6474c7d48a8ccee04660bcaf7934df7a23cab1e5a9a SHA512 6509197ef29d8bcbfc416df0a63f89736f704b147bbeb489586b6a06e1818f1d91e59429c73a9e9e23dadb20325a3c79d0b8e1b4637cd0e131f9673422e36734
-DIST cfn-lint-0.77.1.tar.gz 3483399 BLAKE2B 6eaaba9cf70044c673164bce3a062b00ae7703b091e2c0e8d5065e815278fdb88d75f2592695cd1be1612421f95c806f6eaf3be9f4725abec0cf5e39070ff175 SHA512 0d18e7bc19d5562c88194f834267fa6d2fd8125754399ef281598beb68752e7935a653fbe3a0573f4887cb7a76c41b49ad8e268d390db59dd79794cde4939f31
 DIST cfn-lint-0.77.2.tar.gz 3483728 BLAKE2B f7c3cb5be3fbc81f10515bec145030c21c9a754ecbb887267ee85ea9fecd41e57be8572d30f204a54c3e22191c58d2c7d7112115e2c6cd0a23490c4c7633d270 SHA512 8e901564b34e601e62a276b8f8a4b5687de651aafa6da6dc295e846b04e703bda24e6a72b71797c82d2c2f4c93978da92a08999cb73be6a48c9ffd4a40ccb0e6
-EBUILD cfn-lint-0.74.3.ebuild 1623 BLAKE2B 07a514b96d3f3b0084e82698f7c50c57d7c592573c964aa5cad35681347b31035bac3ba580764b5538bf71b35622fd697e782162fb4796cb60afb69d8f3bf11f SHA512 5b8ae5749d2bcf6faa296cb046185888b6e42213341d990839a3de496b0cd3dce699a0a7fd318537b9405a5a6b7a2104ea7b40adfbdf1f4f63721a28e32a5988
 EBUILD cfn-lint-0.75.1.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
-EBUILD cfn-lint-0.76.1.ebuild 2157 BLAKE2B 57d16cabb2460f7161933f9ca3814baccad5e3c0ebedc0332e07574db35c4432a916415fba17e063da1d71f09436663450b0ab42d19eefcf16c7b24f940fe71f SHA512 511eecc772689a9e13a80070c96670ac0b45bc207ca90b228e8b0acd36c73cc9df7a33ff4714512f59e0221e36be9ba3099c1711402bc39eacd5e0a7415d7b92
-EBUILD cfn-lint-0.76.2.ebuild 1977 BLAKE2B eb75179972626397fd5d225f0f228a69eee61257c23bc63685a96e495183b733ec146fad85ca4e821fe6f1cfbe55b079329a4d52fb83f0391f74cd124a6637f2 SHA512 656b2acf67cb7944a727297cd6df99cc9640177304661b9626d075499b50d60b7941ac3473430cc2f9fda1b19b693a056d52da6198b2b73e4eac634070a794da
-EBUILD cfn-lint-0.77.0.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
-EBUILD cfn-lint-0.77.1.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
+EBUILD cfn-lint-0.76.2.ebuild 1975 BLAKE2B 8e742d614fc2f617a5ec1b7e20cd767231b05724e4f9ecdb980542bcde3ca8b4a126af20cbda952d373d19191e7bd38b59ed70f922b2e0b6d934fcb55770b730 SHA512 4610f75fcbd512720636ff27101d8194af99462f62ab811066ddb8c53ab525b5ac5727b5378e452d3226b8eb1872abaccd238359ade4f8afbf665c3213bb1aef
 EBUILD cfn-lint-0.77.2.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild
deleted file mode 100644
index d861b6dcc3db..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-# pypi sdist is missing tests, as of 0.74.3
-# https://github.com/aws-cloudformation/cfn-lint/pull/2630
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.60.1[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.76.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.76.1.ebuild
deleted file mode 100644
index 7fe42da63f22..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.76.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-# pypi sdist is missing tests, as of 0.74.3
-# https://github.com/aws-cloudformation/cfn-lint/pull/2630
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.62.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild
index 1f880341bf0e..29ca4e45dba0 100644
--- a/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.62.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.0.ebuild
deleted file mode 100644
index 2b6753f1c840..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.64.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.1.ebuild
deleted file mode 100644
index 2b6753f1c840..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.64.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index d78f41502f6c..b3baf89bd455 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,3 +1,3 @@
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
-EBUILD colorclass-2.2.2-r1.ebuild 829 BLAKE2B 6fbf4567f351be1bd2dd5baea02f2e207360eda9cb2518b39cf562f6de0a9432156c011858621c2243bae52e42f2f82512cc1aaff4f05edeee356db9f0214b4f SHA512 276dfe585d0aef49339d8610b63e34f854437c1da910df206e835b67c94c3ce8eea0a7119eb4faa0e9ad117abeb410e4135f78b744251c37088ccfeb14881458
+EBUILD colorclass-2.2.2-r1.ebuild 827 BLAKE2B 1678c1e409e9d473ea7e4f24abed875aae9b65fb14b114001428d62d846e499f255e3e4920e0c0d9d9bb21e0268ce07eb9fffdc67581ab36db7d9a674776b6e8 SHA512 54c22650fbac88350eef99e41f1a1052a0271fa661c56e0575bd9289ea1c76f975667a2c166d7cdf47248a06b13ab3abc18ea93f54d30bc18f0eebf8141de08a
 MISC metadata.xml 375 BLAKE2B 80d8bedbdd9260ff3c0113c3ea75df61ddc166fbc36033289531d0a9e704c04582ca1defa3107ee5f0d5c1bf0510b8739b19b28d00cba655988486c45bbfbce9 SHA512 27ad28c11c7b5114d0eadffe08ba4378bdd0e756dd3193e331e66dc4974c9543640b5530c4e344c263b5028bcde7ff87339a1627b87b9c715649bb6755e12d7c
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index edb8d591eb91..c7dd32b27148 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index a25406e09fe8..3a193e207ea1 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,4 +1,4 @@
 AUX docopt-0.6.2-pytest_node_from_parent.patch 958 BLAKE2B 0fc4437f92f9410a47823a28b1b26057bfbc1687923ee56b0c69b4d921128b7b868fd793098b8399349906a4353aed9e2801ced0d458cf121af31b209df118e3 SHA512 74a384b1e62128df781c5c24bfa6a0f01de63610fadb51349f8f094375b84ab090209d86cde1a65116c735bb90eca61cabcef60e608297bb6976da2f5b510529
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r5.ebuild 681 BLAKE2B b769a7e08e14e2470ffeb0f3b4f1ba3bd133f46e6dbe85f34d1fee711a97b2b39dcc22cfafc114d0059971b5b6c3458cb301681502956d253bb22e7957790399 SHA512 60c8fd387f51affb5b320710e052a0fdd2d1139b1948fb4bc68fe85c43e667f2a3f15b4bdf3f078fd03c8d5fac6a80d0af081ab45308bc7d2526003ed10c846d
+EBUILD docopt-0.6.2-r5.ebuild 680 BLAKE2B 9c0f0bb85248ae1f79a32b6f02f6376c8934fb2c265d91ad1924d3ea1495cfa9ff85a46eddb46ee97ad59c2ec6d4a26d66c149301a8ad40dfcea50e9669d13eb SHA512 70cab738fbe429e301cb17f3c5e23f6f9a38083c13536f40c7a7aeedca83ed973e777111fbd4f3ecac0256f97a731d2766d65fff990dad16431828eb55975cd8
 MISC metadata.xml 387 BLAKE2B c190df1ef516cca0d259568bb7c371b007f0bdb34dfaeda4c9cf6fca58773ce5db43eeb526e4046797d8b7c367a8aab060c29ab042b51f0f3f7df4e0fc896345 SHA512 c65933341a2f83c779ec8c9557aa35676a04ee748aa007da93294154c8df2471194c2c03cd88a10edbfbc1255c9732ef1a3aad4208a917c095fd1a8ed8ef7843
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
index 95b1ac9f1bd8..3a7148927427 100644
--- a/dev-python/docopt/docopt-0.6.2-r5.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index d5087285c97e..0de83674b37d 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1087 BLAKE2B 136e4d6b29673796f7008bfe469dded536a2b21b9bf6c2e1b15df941cc365e25a23bd551dc8cbd67b1153c19639de4f294651be683346ee9174e518328b82477 SHA512 8cbd85ba172c38e424af720fe617379c602818fc9c72f97c202b793229fd7cea137a608d84f882fefc47f53c962720a3a6423d1a9b09014a34d4362b9ca8b332
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1085 BLAKE2B 148c2ca17b07df2fcdfb9256e45c91c8b80cbca793ac3e3a5b566560a77c7b7419622f208d2c67ca244aa4b13926d1ce5f266e4f66f0d3df5eca654712da70b0 SHA512 bbf26b46383cbb75df436b50f3e86df9ed132b8efa240ffbe42162cf14de68fa5b8eaf7b6f68dd938837a27ad3e29e8dcd566f0bc7d02aeca6154817db2e7904
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index 2666df035ac4..733e4dd1792a 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 5014c4d38075..e2bf4e77a72d 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1,5 @@
 DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef SHA512 306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-EBUILD nbdime-3.1.1-r2.ebuild 2948 BLAKE2B af57a8209bec904b602d80de4a2b3bf3bd2ec8f6026f0b7343d94458f63ff18105e700fedad3315f5a6b782a4e0d6036a618e7e97b3fab6efef7ff71b222e707 SHA512 6f4cc3dab0e967d9ec24dd8c73dd708694ed6a1f4fd922b6af290e3856ee2b26d0fdfd992426c2cd45d23ce57ea314edfeabc02d55d630060ebbfe7666dae3fd
+EBUILD nbdime-3.1.1-r2.ebuild 2946 BLAKE2B 7d00b3862d80fabe1328a2707282c13d8cb762aa32858f4d60218fa204e746a60069a5e0ef27bd59603e0a26c728e83602525de2dbf965d1a1f4d76fc0ec6ab2 SHA512 d99b834a93f9594c6e2b39ea2965c472523fed801c696675f68d506b690ea84981167b361634d85076151781da6926d1694e625d13df739e5263444e8fe7357e
 MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 662431f60f33..5f0b124c03e6 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index a5658861f86f..904dccc79d67 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,6 +1,6 @@
 DIST nbval-0.10.0.tar.gz 62727 BLAKE2B 5b8d2815ec38481da1c0b3b5b62f809a231c4d136499b73ef13dba6a5214c87a5d4f77db1d81488e1bf13bd3ff365414e75760763a56a3cc28e752dd316ac009 SHA512 3e0e495db40aa4969e03ed1359f0c509b7470a54b3d8b6a85731601af5da0407bd44b3f069178f1a6b3aca7bf243747aaeaca4cb2332912e917e360f705eae61
 DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
-EBUILD nbval-0.10.0-r1.ebuild 1047 BLAKE2B 17f3c9d3929768c34ae0241c506fafb5562fb971c5ca6710ddfff8379d2510c025154969efaa0854f4991ae7fd4e7f5e1de530488e07868bc1c7b510461253b9 SHA512 885f6a8383e93343f4fa3ec05ddac8dfd062d0504e905bd33882cdc35bf994784928f4f7730c9ff240bbcb718d6b4f8dfc3bedb90340afba26600f3530c5fc0c
+EBUILD nbval-0.10.0-r1.ebuild 1045 BLAKE2B 10dee943e91252cbff38f445bb843c78c98c899f0cce83282b1e690462b87d7aaa8fae856bfc0125a0e572f8b6b6b7744e409d6e69ca31cce4f7fbf06d878388 SHA512 79162c945bdd2bdcb7becd579ce86cc5b72365ecd30d9ef0c3413326acd4680263824ca49fe9c96f1bb0c85054fdea31d5dc9038b93d1076d72d8244835cedc2
 EBUILD nbval-0.10.0.ebuild 982 BLAKE2B 2cdf4e4513111076ec62decaf10b4931445239e29528c35ccd4a672087f4c59c9e04e5c8af21db81fa5fb46bdd50d2fc00188c56be830797cd9b872660890798 SHA512 0115387da679b9d11f378e9c8a59c4af78ca8d2ce3b35f57bd5a834e6678cc3b99a01eb77a663c70e21fbf84606e167f7b2dee2380dbc294fb9bef0db38e5108
 EBUILD nbval-0.9.6.ebuild 978 BLAKE2B 2ff41fe3f14119a897ba2a31959b17ba1537d3528c4ea18c9f5865dbb23ab671082d49665dd00439a79500ead951f5ad738998851ecbf87493fbe2703e88c832 SHA512 18b47f5a8a56d5df04b5243412a394c51feaa19c510675bd103bf4dde4167a805afde61081ef07e47f3eaf6c42d12cf65a87d26b33f8271f7ba3a92c98260e7d
 MISC metadata.xml 984 BLAKE2B 1f5a69806d70ed9aa5c0cf2a7f3466afc76e8b5078923142d10aa8ac5a68ab41dc54cd2345cef061236b7b68fc13fc76ff7a072b9fec8697eae259272a32aefc SHA512 13284c08e700976e1da78dbfe0038c2cca1d1e3f286726c4096ad53ded3b6ebbaabd51e105f70781be57293a46d8e2de3116e406cee4ac35d2dc80f1a165a7f8
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 4309cdf2aa35..1f68800e7c97 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/computationalmodelling/nbval"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 7f0ba39cfe48..0ec3a9a85a9d 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -2,8 +2,6 @@ AUX symengine-0.9.2-cmake-setuptools.patch 2629 BLAKE2B 625278ad90c6ed44c1ba99f8
 AUX symengine-0.9.2-setuptools-61.patch 566 BLAKE2B 362c880be08c98da85b1ae2a13ca7cc422af5f07730eebc6d9eee6bbcab703df3baf88925e10a417e261eceb83ee36ff6b8e8b824bc1497e1a462b746712c317 SHA512 dc2c85d0a39a58bb0011aee4cc0852815568eb0a310f39ee0aa8b2500a6266ddab2cb03d7bbcf317897c64cf31f3909a40d12cba1c0392291ffdbb7b348b1c98
 DIST symengine.py-0.10.0.gh.tar.gz 112272 BLAKE2B 8d8262c1abc48e3b84e14a5c825f0c19335b7374ecb8f641b20140467709c199af542a7e15036a4264d885ee0e425665faa97a2b320bfaf45e8de1ba469b53a4 SHA512 7e3f2554ab79d92d7247b573c383c2ac0dda421b5421d088362007f70b055bc59d9879b8f6d4c5788ddf127ea0974ad9305d23db701f3b9b32a17d6b03000e7d
 DIST symengine.py-0.9.2.gh.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
-DIST symengine.py-0.9.2.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 EBUILD symengine-0.10.0.ebuild 1083 BLAKE2B c06b35c8d16fd50e5aad29eec701fc0cc3bb9cb46e1fc59c8f58c339ac67d23d8e4d3d5539d8a772cef466897d70d7e0f36b535fedba5bfa69b912d78d2456cf SHA512 37b1c653fbc8006fbc1af80765a29c6ff6d93a2162924964895822acf4eb0788596aa2f3ee32c4b12e257f6fa05307278c322fff175b9e6b8579562d3921fa41
-EBUILD symengine-0.9.2-r1.ebuild 1203 BLAKE2B b5b7a45528031359d386d35a5b79f82248027cfa80b4a8c1fbd86145791bafea52ccc1626ba594958f8b0b87cdce95559dc5835f74c85476bbc3a0979cfd6a23 SHA512 dc92dcd46f8b913c6a4d14a725bf1681dff6f595c16ea4845d03cd6cade9a970949a8d82e5a91073c466b8fb8dc84a5edb2a95485a18b002941d602758cbe05b
 EBUILD symengine-0.9.2-r3.ebuild 1177 BLAKE2B 5fdc464791232e58cd986849bc1ae2d0f8736db6c7cc6a3f75019a4dd48795cf89a139ab68b8af492a90be272db28cd157dded55a9f8aa4b4cd432fc6746eaa8 SHA512 78ada4d688ef0b21e24584b1dde917d63637e1f5e8bcfeb6a2f11464871dff5626d51ee88083ba45ff616badfa2c553d02466f595981a91bb9529fd44e5256b9
 MISC metadata.xml 505 BLAKE2B 9c9b44455691ec31e5eed2f355dc4633ba05548c6e00fe49e665ad7fd1867bd6a7345f84409ea14049cc01818ef67d7795afff4e01fe88c25b1977f4d6f0fbff SHA512 6a774984cef49d82908bced7cf61bb5550207503335ae09abd9c08cdde5396cbf123d7ed5d49934ccf7dbc5167f0c13f2e6ecf31bca9f5af0a2f7c46f22bf9df
diff --git a/dev-python/symengine/symengine-0.9.2-r1.ebuild b/dev-python/symengine/symengine-0.9.2-r1.ebuild
deleted file mode 100644
index dfa352562a36..000000000000
--- a/dev-python/symengine/symengine-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_P=${PN}.py-${PV}
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py/"
-SRC_URI="
-	https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-util/cmake
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)
-"
-# See bug #786582 for symengine constraint
-# See also https://github.com/symengine/symengine.py/blob/master/symengine_version.txt
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-$(ver_cut 1-2):=
-"
-DEPEND="${RDEPEND}"
-
-# the C library installs the same docs
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setuptools-61.patch
-	"${FILESDIR}"/${PN}-0.9.2-cmake-setuptools.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 567d5271dc0c..53240be4ee10 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,4 @@
 AUX sympy-1.11-no-deprecated-threading-event-api.patch 1985 BLAKE2B bed11566b12fb49e7f52d176d536b15872a1b7cf8e570c17a068126f38cdf13f1d94d8f6c2d74e086d9e6c4ecfc6498613318f4e2f9f8a261224f1cc8bb4b908 SHA512 5df7337eb1c4bdc66b30a5a6db9047a9ed590fdcd7fb7cbc82a4c7342c4d2d047cbfd8549748ea3e0e4db8dc6e1ad97984fca87d85489dffe78599f7e2e29745
 DIST sympy-1.11.1.gh.tar.gz 13462495 BLAKE2B a45320d087057595d3574490c6dc07bcdf7870543e9adcbaca9abe293d84875c123bbc91a7263a87b0b71568dece4e1304b6bf76f60ae64e353520f0ca686b1f SHA512 6cc720b673cf31a2e8f56a5cae24ec15024ea43dee92196adb0a87f28561b5d2404fbbfd3d55a8414930a31d4d0f4a731d458ad528c8cbb03c37555f5c14ce4a
 EBUILD sympy-1.11.1-r2.ebuild 1810 BLAKE2B 6c2682ebccdb3083351cd1e5f6d16ec0f02e64b63e859a063e28a07679aee1582b316458e55b58d5e6217e345e203f29a952efd8600a7a49b00c26f011d41bc1 SHA512 a912f80b41cd68c9b5d21548d2c1f134e374b5dd820577cd2a43e5bcef59e124c10f12016ee18cdca5caa0cc18f492ec776e01697b4b643863682aed51d3880e
-EBUILD sympy-1.11.1.ebuild 1686 BLAKE2B a2f2b3bf4de552715033b9e0944a5b5c21b3c2bc35c216a097264b7e60f3b71eaf90eb754be662862d1b91b3f5fa01cc64954cee02a5c94ba61eaeeb75e26d25 SHA512 b239558442e8bb7b41dfd2fde26ccefc2a041fb228e1c89f64e833be222f340066350293d3353c2ea5c63f77fc2a71cd40f073f278f6c6a4762b3449a228eb01
 MISC metadata.xml 1722 BLAKE2B 09837a8e4ed0d70cf62a2e5028d480ffd7d15d821220c771dec04380e9707da56625651a49ac656a7de27ee3e8f395091abe763d2d3c59cfe32bf363cdba60cf SHA512 fad83c852dd953709e20056b0da38a0f0504bc70a99d9a9fbf295d98ed462811ee6fcf755d5ad1aeb515fd62fafe35a609f6d2892af2ed921870b6f5c38edc5f
diff --git a/dev-python/sympy/sympy-1.11.1.ebuild b/dev-python/sympy/sympy-1.11.1.ebuild
deleted file mode 100644
index abc403f75124..000000000000
--- a/dev-python/sympy/sympy-1.11.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://www.sympy.org/"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs"
-
-RDEPEND="
-	dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	aesara? ( dev-python/aesara[${PYTHON_USEDEP}] )
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 04b9d8318f7d..b56e84c03c49 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,3 +1,3 @@
 DIST python-tabulate-0.9.0.gh.tar.gz 59342 BLAKE2B dc101ab8d1411196619c3d77dd83c84e48f31e148ec3878c2b844a1e26ea1187cc948cfb1eb740d61a667d6b669806a5288c397ea7fcbd59685fedaa9bd0bd2e SHA512 26b0f079f1aca48578883147cb1a2e30e96e0bb85d5af3b72b26eba5f73cea41cf1a0686f666487c8374f95ca0412703168e480c947f1567e6408f941756498b
-EBUILD tabulate-0.9.0.ebuild 1382 BLAKE2B be7fd5e6c3fcf53018a7419a48009ee7f03dfedf68cb3d2961c42921ad865283576f16d1df3c2b13c5eba0ce894a4820ea54f2c7fec8fbf8602c59fb4d8d056e SHA512 3b6a3ee57ae3ec3afc15c4b03b7f2a6ee5a4a07c8fa5e74fd1ee684a95562725dba1e0778fffa52e6561f8200075ab4fed0fe8a395024e08da9375168c9bdbf7
+EBUILD tabulate-0.9.0.ebuild 1380 BLAKE2B 83bc106b5522f5b347f5b19a835671dc0df0c45326e1cb6be7a4c27fc5fb71587524941d7eca4a5b4b1e01bfc30f2029bf8090468344ff4df66b5d46fc911c53 SHA512 0106b768ec5a23abf3ba65d054bc9ec4df29e1579ad601063793a07ccedab06680c796037b46516f97204d37bb189834ed1beede8ed748389ab96e0169fa7bfc
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index bb357b73455a..2f5ce21530d0 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 5ad8fdeecc56..578fa60e7c06 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,17 +1,5 @@
-DIST trimesh-3.19.4.gh.tar.gz 12673418 BLAKE2B c54e0e1a946b858371d5de2f028bbc64a353a06859f428d6e221058a46e853bb7f245d7348b1cc7fbbdb930ba9600e24a39c2884a9acfa00b9d31d6576b87959 SHA512 b490e6d021a41c0a094c5e3596033a189d08310c04a2ce70c9b72d492e1cad1b5c9f110487c66d0a37eed97754e979c7b449d10a6a6abdbd81241099c248d5cf
-DIST trimesh-3.20.2.gh.tar.gz 12683352 BLAKE2B 3ed73e426fd72723d19b668aae790f44ad46b310b6ddbbedf1e87aa56880037fa09b43921131ce2a5bff02022e6630222c63fb205a4345e81959e14b0013c3fa SHA512 fb6ca184b9d62e7820f1b92c8ce67a02eed6355c49dbb209b328e149ab6e600c306a10bcbae3bceaaec0244874eebc8bdf06709310f8458e9f72ee9ad213ad65
-DIST trimesh-3.21.0.gh.tar.gz 12688064 BLAKE2B 5ac8c4cd3f087b63ad6e224a693380a7f5cad5d1e09e2d21d91410f462d51833baf09ac7015c52fa85e475832122c0aa61e8bfa340d42fb08c9e9fb0e5d8dbdb SHA512 1805213b8fe19fa5716ad8da1c23d7e23d06e96de13a18f59907a62fdf5b67ad9fb7842a7f19b4a315444261f210bbb312f6b0bbf728ee015f9d489e2dce4f0a
-DIST trimesh-3.21.1.gh.tar.gz 12689151 BLAKE2B e0d04a6003656f096404ec8972907381f5950f7a6ac3864963fc9a52dc015ad42d39e88ced8d125f725333ddde722358ebac9f263fda0cd21d663af42318bd50 SHA512 08716a310db8cae86a725072a6626b3703ffac3532182ce22389cf85fcdf5853ad8f17cfd8c34afde0e6dc0f2125d910d130810c3cce8e8dcb1605737074a3e0
-DIST trimesh-3.21.2.gh.tar.gz 12691646 BLAKE2B 0ec2c1e9afb607984b92d339fa07dd8b92bf0ac50c56704c98ce3f6c35449794b595640d68c67dc2ce59f236545f5df72238aef21103fbc1f432bbe285332a46 SHA512 e9e692c6dd20c787c9262e148aaaffb81c8ef3decbeb16e3c008a585701e9e71c73487e8226b159e86d550019f297bb2163b3be3006dd08c2df932d3dcd0b403
-DIST trimesh-3.21.3.gh.tar.gz 12692861 BLAKE2B 8e3f9cc28b26371bc46b31c48c1e79345cb6f27755999bf99cc793f83706ab559cffb3788101995550e112b77617c0d112c06f636f0f4c3047b966f669b419b3 SHA512 ab72b8b61643152d5fdcf5326b1c8a6f8e54c4bbc0653fe8c1dd379ecfa8510ae542c85adde8200abcb863ec80dbeb9046d6d7d4ec5f1f9aadead8871841b948
 DIST trimesh-3.21.4.gh.tar.gz 12692752 BLAKE2B 47f83c594318270c1594bad9c877de2cba71d44eccae7f755418aba785ce21c36946e482b38020a79417c4e346cd60cf3b31ee96bd489501a9dd88c2d433c68c SHA512 749f208b91f55b2a9581fa953bd984fc71a7c54bcc3d00ad1df8af2489911e966d2821dcff3d673e8ba55a83c9cce75625aaaeeddff817a16bb09b82b2bca549
 DIST trimesh-3.21.5.gh.tar.gz 12692813 BLAKE2B 31f3933b4b76f55783dceb32b8079383d84439cc0705ae47b5e0062a8192a88123264ce0a803cf4bba6f3c0fad12b77cf524bf03b2ce5c1b2b4f6146eebcddd5 SHA512 4bf6879294042aea9bce65a79c1717de1bec92a0a9f6f420ed98dbc4cb5260dba4656ee0074f77d46d37c910838c7a4b7c7dff0249aa38109bb677993f886291
-EBUILD trimesh-3.19.4.ebuild 1908 BLAKE2B fca44800b00390609a488c1d6ed4167a162c5e0f8b03d37d06c327f1f3516f2cbdcc51c5954df0dba0a8f99493bcd3ea5b8b404e6152d38105139a4c8935bfdb SHA512 5db0b712d9c1cd0bfa309c0018c0a0bb4a8b28f970e76a18308640b0a237b5e68fb8c23320ad2f0674eae050da0913942081da0ba00c18dc9f7596655abe1460
-EBUILD trimesh-3.20.2.ebuild 1909 BLAKE2B 34fe461b88e583ac9981b590db715562151e7faa2a31bd6596c0455f329f3e7f81c06ca9e994c6a20d1ca75c88003901beca7c77578aa60ef3880a35bb20183e SHA512 253b8d5652d031951198bd51f657984d7c65c8f0e7f9a2a7628905d8c88a761411f04824cd6f09014b3cdc7ba40581f2f100aec3e5dad6fc1fdcabc8c907c7cd
-EBUILD trimesh-3.21.0.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
-EBUILD trimesh-3.21.1.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
-EBUILD trimesh-3.21.2.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
-EBUILD trimesh-3.21.3.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
-EBUILD trimesh-3.21.4.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
+EBUILD trimesh-3.21.4.ebuild 1870 BLAKE2B a563dea7d00401f901d5551ff43ebe8abf7de18b74ab906c0bf55a7819132b57903270654c48f4694ba37fcd64c481482548a9bb4aa3e01999196de2659d34aa SHA512 0a4c0d01cfe7322d508ed8a0839f4ec42f4d0d8411f7f7a1c30696999e8424e2c4cfda76645dcfd809f2ae1cd4858484ff2bc5d02b565ace1a30571f115a75d8
 EBUILD trimesh-3.21.5.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.19.4.ebuild b/dev-python/trimesh/trimesh-3.19.4.ebuild
deleted file mode 100644
index bcb8cd7851f8..000000000000
--- a/dev-python/trimesh/trimesh-3.19.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.20.2.ebuild b/dev-python/trimesh/trimesh-3.20.2.ebuild
deleted file mode 100644
index 842ffb868e16..000000000000
--- a/dev-python/trimesh/trimesh-3.20.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.21.0.ebuild b/dev-python/trimesh/trimesh-3.21.0.ebuild
deleted file mode 100644
index c876396fccaa..000000000000
--- a/dev-python/trimesh/trimesh-3.21.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.21.1.ebuild b/dev-python/trimesh/trimesh-3.21.1.ebuild
deleted file mode 100644
index c876396fccaa..000000000000
--- a/dev-python/trimesh/trimesh-3.21.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.21.2.ebuild b/dev-python/trimesh/trimesh-3.21.2.ebuild
deleted file mode 100644
index c876396fccaa..000000000000
--- a/dev-python/trimesh/trimesh-3.21.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.21.3.ebuild b/dev-python/trimesh/trimesh-3.21.3.ebuild
deleted file mode 100644
index c876396fccaa..000000000000
--- a/dev-python/trimesh/trimesh-3.21.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.21.4.ebuild b/dev-python/trimesh/trimesh-3.21.4.ebuild
index c876396fccaa..895e18a2d093 100644
--- a/dev-python/trimesh/trimesh-3.21.4.ebuild
+++ b/dev-python/trimesh/trimesh-3.21.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 1e6edb9817d2..a83185483541 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,5 @@
 DIST watchdog-2.3.1.tar.gz 123140 BLAKE2B a49307b890b9f69eda760c6285d325fddc7281347740b36d7c840a5e28ef496498420c21424f1553bf1dc0d47a928194720ef1ae542e7c0f6f58085760c2e8f5 SHA512 a492c818fcc8b21ca4052fecafdf6b4d00f441034d73b10464fc9c09a89d539acd8304e591ded96e5d992e2c9455be018373ba4f06a33b047e606c083f9061e8
 DIST watchdog-3.0.0.tar.gz 124593 BLAKE2B bc8135dcbe9b1000fb7befc85ebf62518222b0470676cf94aabbe8f871bb05064a46ae4d11ce34f8030d35268c073fe82757b911e3983a8b683ffbd09227395c SHA512 fa1421b01af99d7fa676c9077b2330ead17c004d9bb9e9edd78d4bbf87cf41624ecd669ca48613d99be2109373bbab4e004b69665d2ca42e082573e4740c13d0
 EBUILD watchdog-2.3.1.ebuild 1058 BLAKE2B f8b3604c4702ecd9da7f6eb8ad3c26430939f27c052da39cae3dacac7c2f71fa11cd8e8d1cb7a706e61b940ed4fcd295ed5ed293acebce7d630d1bae8442c804 SHA512 56ceb3e077685b271b245c7634f69311fe0b55c2bddb51f4999f9c2a3f9b312f897c3763dcb4aa5deec5fccf8101b03be5e31f087486182ec91cede25e018293
-EBUILD watchdog-3.0.0.ebuild 1061 BLAKE2B f54b48c2cfd86ad47240e76b289ce27c8179ca9122145f6db20c1ac27c6dc3f2bb57de22a394431df340008cba97cfd17b870db4f0d9de95b08c1984977f072c SHA512 fe0c14d35edf61e940fa436558eb8ab38c1c4ce82e4464c71666e998199148edf0189d1c550880ed2597dae1f61fb2809be517004af332a5bba4e6a13d70c3e8
+EBUILD watchdog-3.0.0.ebuild 1060 BLAKE2B f411d20ce268c176ee88f811a781e8398e83cd7d9af46776663c7d3de77a87b181d9824866cf71f3e678a866f5cc163819806322f7237a9e698efba0c6c20c9b SHA512 5bbfb3b2b7670f0d75d025940931b078d7c3bf9be030632eacf6056502b454b08371f50012c7d08c2dfca2898118c0d417d5ed3de713716a1359f15fb507b274
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-3.0.0.ebuild b/dev-python/watchdog/watchdog-3.0.0.ebuild
index 332a54d25ff5..8db51699de47 100644
--- a/dev-python/watchdog/watchdog-3.0.0.ebuild
+++ b/dev-python/watchdog/watchdog-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index b90deeadaa2f..8259e6a49fdd 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,15 +1,3 @@
-DIST python-zeroconf-0.47.3.gh.tar.gz 151413 BLAKE2B eff81832a029cf173c55290355207bfd17b1701f85c60be544252d00579ad835eb2b7c0a29c967ba62b1293d9efae953bc3b564c5ca134c2a898621584cdf544 SHA512 e1435490ba6890d9f0fe8efd7be64f0f9fd20a6ae723b176861865a8a795593db7cd797062f9977a5b1df4107781011d25bdf69dd4cc54dd94ef6e891c425df4
-DIST python-zeroconf-0.47.4.gh.tar.gz 151640 BLAKE2B 4591135e81fc0c1c22444fb8823f5ad246f234a79a9aa2697a947a7838f5880007e2acbfe8c60a3f69c0a1cf803e35b35b17b7cf013dc7408e759273bbca94b2 SHA512 2b8438e0832cfc6ac40d54eaed75749389fd9287b82b074f129bba76e7f31e3cfd58e5de28c54b3cf3e14d3c8540ff09b5f10d85f705ede2ef18718b1a87ebf1
-DIST python-zeroconf-0.51.0.gh.tar.gz 152236 BLAKE2B 2339bd47e4f8abecb5b56c722e275c0cef63d4ab389c58b9a50e22e2a450b527f11727615a9c61e6e23d275195353121c5697f2fd496fbf9370465db5d9258c8 SHA512 e62d74ce164cd92913382e5a5530e2732a739e065f3f2fa7bc5cc7f62e863c98e8979ab08f5527f301e833cd1107c2d1c412db1dfafbf2bd1546b6e197d2c43a
-DIST zeroconf-0.53.0.tar.gz 138658 BLAKE2B 9a0af4a08a51d8b39d6eac30a1ad92d5e7c14bdaa3a7d8b57b3664c91c0c740af6f08c3bbe1d5ffb4a950e4cc1bec12b9426b595f76232d48510dd5df25c1b57 SHA512 9309b385a1acdcdb7d2812e0b554373fc2a5324f804636cf32449aa158ac629387f670c1770bce5e11245f9e482a6bb379f7e3cbf935a1977fca8158181163d5
-DIST zeroconf-0.54.0.tar.gz 139937 BLAKE2B ef8e8ad309a73bd725ad1aa8af54dd14d338f68c5f23643a45cd88a2e8ec8a64b6c589ec0d00a341769003e858554da0edac49722d81c92ec36638cfe4d8d0e2 SHA512 ac2f2c76e8d551102919ae27dcbcdaea80e4ec1b0514edab7d9776feb20466933669590af5f9de90395df909c371a6d30cc086daa8861464ba51f2aafd3a0592
-DIST zeroconf-0.55.0.tar.gz 140032 BLAKE2B 02de3a67e687d2fca36983fcabb1a781c81b2bd67f58497d9e1c847c0411987303dc5a20133dfa5332e660a59c27264001d884248996964e1706703c08b2df15 SHA512 79e263828d66f5110837e3a38eec595375fcd4b7f07272e1f22c00970b343781064ebcf6faf3f488c8326b6e455359ef53f990c9152149520bea5f1dee4c834d
 DIST zeroconf-0.56.0.tar.gz 140060 BLAKE2B 3199ebb995754f4c7a2b4881564664d95d2483f6307cd898ec1beb7e12fed0bc3ce501a0f4732a3f1e019db1641d08804d2f38ad769277c95a41b8c266860126 SHA512 8ba2cabc58ae5586b6e89f2771e4483a488bf4ef5201fe8684befc2930d34f96f5fd07040da7ec850f9450b2166ad22ef571821a56e33222cf5708c11f5f4aba
-EBUILD zeroconf-0.47.3.ebuild 1714 BLAKE2B d5a5092327d4de61e1bec37c6d963030c5703ed4fe3360ab91f42133456367390bc547fb8f591512d86093078f2a279b16fcbbaff49252b6589498c55ac805b3 SHA512 1d6fc8b09de6aa52049ae8bffa2cde9d5a1299495b8af075805059d55c1a09d206b8cc161fc32728cb3cfcfbff4757f28baac6ced0ab3cad3dab7f88acec9fde
-EBUILD zeroconf-0.47.4.ebuild 1716 BLAKE2B d8ab5caed8f2a6af3e2d2de5a1e57d4a9a1feb1406b2d9e3f2c33aca8d32c1bd5d1ec157525de42c134c78f657f60b657497ce1225ae8daafca7e51e570a49df SHA512 9a319e0420919cd2220f727decbfe3ccc04e7fdd9a1e7afb64e4dad04ca7550fd64a5f08f33b20cc022b9dae248d45d233c6a3e97ce0d7c329238932f608cd9d
-EBUILD zeroconf-0.51.0.ebuild 1716 BLAKE2B d8ab5caed8f2a6af3e2d2de5a1e57d4a9a1feb1406b2d9e3f2c33aca8d32c1bd5d1ec157525de42c134c78f657f60b657497ce1225ae8daafca7e51e570a49df SHA512 9a319e0420919cd2220f727decbfe3ccc04e7fdd9a1e7afb64e4dad04ca7550fd64a5f08f33b20cc022b9dae248d45d233c6a3e97ce0d7c329238932f608cd9d
-EBUILD zeroconf-0.53.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
-EBUILD zeroconf-0.54.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
-EBUILD zeroconf-0.55.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
 EBUILD zeroconf-0.56.0.ebuild 1563 BLAKE2B 564a89a18f68fe349cb6072c9c8698dd106e6af1c767e379547a8c3b9a7535345a8cd4b21ae17210741ec88331c4853c822734c5bd149f086729c1e5cbf9408e SHA512 ad09350127528e9043a1115f6d12801f4fad416e692301eb1e0a8e5f3b291f2c43a24727c06be2ed87ae25596768aee0e953c0bf8e87433925de45afc2cee5b4
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.47.3.ebuild b/dev-python/zeroconf/zeroconf-0.47.3.ebuild
deleted file mode 100644
index 70781d4d3bc3..000000000000
--- a/dev-python/zeroconf/zeroconf-0.47.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/python-zeroconf/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.47.4.ebuild b/dev-python/zeroconf/zeroconf-0.47.4.ebuild
deleted file mode 100644
index 2b08539fe6eb..000000000000
--- a/dev-python/zeroconf/zeroconf-0.47.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/python-zeroconf/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.51.0.ebuild b/dev-python/zeroconf/zeroconf-0.51.0.ebuild
deleted file mode 100644
index 2b08539fe6eb..000000000000
--- a/dev-python/zeroconf/zeroconf-0.51.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/python-zeroconf/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.53.0.ebuild b/dev-python/zeroconf/zeroconf-0.53.0.ebuild
deleted file mode 100644
index 18c772b8a425..000000000000
--- a/dev-python/zeroconf/zeroconf-0.53.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.54.0.ebuild b/dev-python/zeroconf/zeroconf-0.54.0.ebuild
deleted file mode 100644
index 18c772b8a425..000000000000
--- a/dev-python/zeroconf/zeroconf-0.54.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.55.0.ebuild b/dev-python/zeroconf/zeroconf-0.55.0.ebuild
deleted file mode 100644
index 18c772b8a425..000000000000
--- a/dev-python/zeroconf/zeroconf-0.55.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6221c26c45e9..9028b7182e9c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 04f350056551..8ce24808b6a7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,15 +1,18 @@
 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-5.15.9_p20230404-gcc-13.patch 900 BLAKE2B 199729979a0829e0c2dd5c8ddf505eb30b65ed24c49ca17ba171204f3495761bda9c27fa8925276472f5fa2e44d72e3174a5dbee1ea3eeab3dcfe698bfbd6601 SHA512 fa3478696a08e1016d9068682b5157fab3572a60097d7f0ddaab0e211540a4fc5d6f1c7b20716aedd5bdf548fb701c70b54e0fd9a23032d9784a7f1fd3d8765d
+AUX qtwebengine-5.15.9_p20230421-gcc-13.patch 5591 BLAKE2B 6de2f080457870720f948d2ce69ef9ee218b8481f5ef478ea5333029c8792dfe6d5983ec3ca7bb51659f0ed4edf77c90ded6614a19f719db165e1963a35484f6 SHA512 c5d246ecd0329900c17c4e6635806a425eb38d2c7cca1ceb71acd583fa391675ba58c325ba333aa5142d28aa8b8e7284e41606b0e79c1a36457abc8da32b09f8
 AUX qtwebengine-6.5.0-gcc-13-build.patch 17896 BLAKE2B b8aaecb917e3375027ec0a7feffe0842c2e393c597362ef01317ae05744baa837942d9021aaa152505a46af325add61d22d3218b8a32b1b5a80e539d3b88ff5b SHA512 fa7ff29cee454741916b83732b86738e10925c62826e3f5db18c6becd99d27b2523622bd787706df876c0df7fd3b385c59e7e7133bc0e393a4e323a3a0cd1e11
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
 DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
 DIST qtwebengine-5.15.9_p20230404.tar.xz 298175824 BLAKE2B 8a260c6d39d99698871154f59e86dece89ac7cb5bd08797e7f42aced638ef528c4272beb46346d39b3df14aac08f7ab4d286cc12688cb4ff62ff327258c3b841 SHA512 d97eecd3b2d0b4ad198f7c8484ed70ca6b2751ee9167a3c51c3406acbd18d06265249902c4c7b7ccd8285d7dd8dd2c8fbe4022612f5ca4b1a7972e1577059996
+DIST qtwebengine-5.15.9_p20230421.tar.xz 298205148 BLAKE2B 2969f37af6c53dab5847dc46a9b64f5756b4ea45f9ef3c48db980a1032e89ebd48e9ba4fdc8c56cb72044ab4f48477ac1f9c1171f333390155a7304288b77a0c SHA512 a78dd781056c63d98438186ba256ad03b35fe3870b877e56bce41ec135defc29ee9230a3482a69f8680cedc9328a683ffc62dab45a202b709d2a4017a1188cf3
 DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
 DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0
 EBUILD qtwebengine-5.15.8_p20230313.ebuild 8252 BLAKE2B 5490ebd0c7ec96948f6ecc0a5305f1d09fc87dd16498a0ea70e3a88f7b9902fc5f4221a83fe883ec54c305b7cd0d75fceb9580ed1d41a56fb04d3d4ecc8b8596 SHA512 92aac8358b6777bfe1fbac3329b79fb862673cb119a446cf31732bbc09f454e08652c0bfb92ed5f10120dce1c405e614c7d91629baeaf4f087cb182f9a37103b
 EBUILD qtwebengine-5.15.9_p20230404.ebuild 8324 BLAKE2B 7bec96d0d71f75486e440ece7fb75b4bc8de9d2f2b96578b82cbe8a09a8bc24d32e8518647f5bebea986a2700eec623d678de80a5d4c111193e8bc704a93bf86 SHA512 12ed566f5e91ebb006834f5a6494bb3606f3273e98a2f9c2b8886ddd0997353f3b6fd00e69692c576f9e330fb6955ab60ffa61bdf50d390c67b2c2f9ecdf441b
+EBUILD qtwebengine-5.15.9_p20230421.ebuild 8461 BLAKE2B 0207a963558106aa3091f41ce771d2691b7b35ee03259b08a32c58f9e6217bfc3f1cf7b7312dc1f7f245da12cae953031ab06a1c9d5ba8a7e0f4423773826583 SHA512 a2b5a5ac282d2bb98ff4a70bd25bcdfae8b2df510e817dc8a9ccdbcd51ac0cc6cc37c2088b02e401a5a79c5b8e36f3211511b89265e8f6b63819104caf2c2e92
 EBUILD qtwebengine-6.4.3.ebuild 7634 BLAKE2B b7a9e50c5653c8fbe50d180e48de9c52c6135ffe23869d58b9b703b52e667c24afe918b365fe9c0397834d4688d54fca1432985f6f5b848a3d21416ce880f3a6 SHA512 a10a58f330d9dbb480107cfe67fe79747c98fb70451c14e87430759ce49e902cad791cdd919cf1218baeba67dabe3a1835d64d70495f5522758e7657bdaa4d0f
 EBUILD qtwebengine-6.5.0-r1.ebuild 7504 BLAKE2B ff533e29743165c07e619fa0247219310965a21a7c455d014f22e60d5867e087cf6ab09798048c241e8cb9587115892687d9584d2ab368246cd48b9a49985195 SHA512 244779092fbb1e3d4f99669fcdedb6791662bb4da31d89729f7118fc0c5e390610d0a6e7caf5e343502daa4dff7e5a0a4fb4cfebce24c5364aa1d815ca2db3fb
 MISC metadata.xml 1258 BLAKE2B 450cb9e683a52475729881c910e7b0b79587d3d672d4eb90613b91194ec19ab7c0fb86bf4ff4bf631686ed3cad49859eed07405b1f7d6129f40b5f4edba68e43 SHA512 971dbe74479e6bf3ed3cda00724bb4a60d6382c4020ee6ce3a730646a69af0a66785fb135706a2a0cc00ff3190674e724aa3def03f43c8e9ed5e5d317ae271f0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230421-gcc-13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230421-gcc-13.patch
new file mode 100644
index 000000000000..f8d180e97037
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230421-gcc-13.patch
@@ -0,0 +1,134 @@
+Pending upstream:
+https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/473909
+https://codereview.qt-project.org/c/qt/qtwebengine/+/473911
+
+diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
+index 213b630..98266a1 100644
+--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
++++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstdint>
++
+ #include "device/base/synchronization/one_writer_seqlock.h"
+ 
+ namespace device {
+diff --git a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
+index 286a41c..25d2413 100644
+--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
+ #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
+ 
++#include <cstdint>
+ #include <string.h>
+ 
+ #include "gpu/command_buffer/common/gl2_types.h"
+diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
+index bcba574..f4916be 100644
+--- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
+ #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
+ 
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 
+diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h
+index b4d6dfb..0dc300a 100644
+--- a/src/3rdparty/chromium/gpu/config/gpu_util.h
++++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
+@@ -5,6 +5,8 @@
+ #ifndef GPU_CONFIG_GPU_UTIL_H_
+ #define GPU_CONFIG_GPU_UTIL_H_
+ 
++#include <cstdint>
++
+ #include "build/build_config.h"
+ #include "gpu/config/gpu_feature_info.h"
+ #include "gpu/gpu_export.h"
+diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
+index fa755dd..040656b 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h"
+ 
++#include <cstdint>
+ #include <set>
+ 
+ #include "base/memory/singleton.h"
+diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
+index 8c8f4fe..4e8788b 100644
+--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
++++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
+@@ -28,6 +28,7 @@
+ #include <cassert>
+ #include <cinttypes>
+ #include <cstddef>
++#include <cstdio>
+ #include <cstdint>
+ #include <cstring>
+ #include <new>
+diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
+index 74cc958..098433c 100644
+--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
++++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
+@@ -17,6 +17,8 @@
+ #ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_IMPORTER_MODULE_H_
+ #define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_IMPORTER_MODULE_H_
+ 
++#include <cstdint>
++
+ #include "perfetto/ext/base/optional.h"
+ #include "perfetto/trace_processor/status.h"
+ #include "src/trace_processor/trace_blob_view.h"
+diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+index 0a19810..fcfe94c 100644
+--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -9,10 +9,9 @@
+ #include "include/utils/SkParse.h"
+ 
+ #include <algorithm> // std::lower_bound
++#include <cstring>
+ #include <iterator>
+ 
+-#include <algorithm> // std::lower_bound
+-
+ static constexpr const char* gColorNames[] = {
+     "aliceblue",
+     "antiquewhite",
+diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h
+index 37cab78..4220eac 100644
+--- a/src/3rdparty/chromium/v8/src/base/macros.h
++++ b/src/3rdparty/chromium/v8/src/base/macros.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_BASE_MACROS_H_
+ #define V8_BASE_MACROS_H_
+ 
++#include <cstdint>
+ #include <limits>
+ #include <type_traits>
+ 
+diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h
+index a10409f..5adfbbe 100644
+--- a/src/core/browsing_data_remover_delegate_qt.h
++++ b/src/core/browsing_data_remover_delegate_qt.h
+@@ -40,6 +40,8 @@
+ #ifndef BROWSING_DATA_REMOVER_DELEGATE_QT_H
+ #define BROWSING_DATA_REMOVER_DELEGATE_QT_H
+ 
++#include <cstdint>
++
+ #include "content/public/browser/browsing_data_remover_delegate.h"
+ 
+ namespace QtWebEngineCore {
+
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild
new file mode 100644
index 000000000000..d78c39e5f62a
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+HOMEPAGE="https://www.qt.io/"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	if [[ ${PV} == ${QT5_PV}_p* ]]; then
+		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/${P}"
+		QT5_BUILD_DIR="${S}_build"
+	fi
+else
+	EGIT_BRANCH="5.15"
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt/${QT5_MODULE}.git"
+		"https://github.com/qt/${QT5_MODULE}.git"
+	)
+	inherit git-r3
+fi
+
+# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-patchset.tar.xz
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtprintsupport-${QT5_PV}*
+	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc(+)]
+	media-libs/libwebp:=
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	designer? ( =dev-qt/designer-${QT5_PV}* )
+	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
+	kerberos? ( virtual/krb5 )
+	pulseaudio? ( media-libs/libpulse )
+	screencast? ( media-video/pipewire:= )
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	widgets? (
+		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
+		=dev-qt/qtwidgets-${QT5_PV}*
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/libglvnd
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+	ppc64? ( >=dev-util/gn-0.1807 )
+"
+
+PATCHES=(
+	"${WORKDIR}/${PN}-5.15.8_p20230313-patchset"
+	"${FILESDIR}/${P}-gcc-13.patch"
+)
+
+qtwebengine_check-reqs() {
+	# bug #307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+	fi
+	eshopts_pop
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# (check-reqs added for bug #570534)
+	#
+	# Estimate the amount of RAM required
+	# Multiplier is *10 because Bash doesn't do floating point maths.
+	# Let's crudely assume ~2GB per compiler job for GCC.
+	local multiplier=20
+
+	# And call it ~1.5GB for Clang.
+	if tc-is-clang ; then
+		multiplier=15
+	fi
+
+	local CHECKREQS_DISK_BUILD="7G"
+	local CHECKREQS_DISK_USR="150M"
+	if ! has "distcc" ${FEATURES} ; then
+		# bug #830661
+		# Not super realistic to come up with good estimates for distcc right now
+		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+	fi
+
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	case ${QT5_BUILD_TYPE} in
+		live)    git-r3_src_unpack ;&
+		release) default ;;
+	esac
+}
+
+src_prepare() {
+	# replaced by new patch in FILESDIR but not spinning new patchset just yet
+	rm "${WORKDIR}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.patch || die
+
+	if [[ ${PV} == ${QT5_PV}_p* ]]; then
+		# This is made from git, and for some reason will fail w/o .git directories.
+		mkdir -p .git src/3rdparty/chromium/.git || die
+	fi
+	# We need to make sure this integrates well into Qt 5.15.3 installation.
+	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
+	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
+
+	# QTBUG-88657 - jumbo-build could still make trouble
+	if ! use jumbo-build; then
+		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+			src/buildtools/config/common.pri || die
+	fi
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | \
+		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+
+	if use system-icu; then
+		# Sanity check to ensure that bundled copy of ICU is not used.
+		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+		local file
+		while read file; do
+			echo "#error This file should not be used!" > "${file}" || die
+		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+	fi
+
+	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
+	if tc-is-clang ; then
+		if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+			eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+		fi
+	fi
+
+	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	if use ppc64; then
+		einfo "Patching for ppc64le and generating build files"
+		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
+		pushd src/3rdparty/chromium > /dev/null || die
+		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+		popd > /dev/null || die
+		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
+		mkdir -vp source/config/linux/ppc64 || die
+		mkdir -p source/libvpx/test || die
+		touch source/libvpx/test/test.mk || die
+		# clang-format is used to re-format sources
+		# but we'd rather make it a no-op than introduce a clang dependency
+		# https://bugs.gentoo.org/849458
+		clang-format() { : ; }
+		export -f clang-format || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		--
+		-no-build-qtpdf
+		-printing-and-pdf
+		-system-opus
+		-system-webp
+		$(qt_use alsa)
+		$(qt_use !bindist proprietary-codecs)
+		$(qt_use geolocation webengine-geolocation)
+		$(qt_use kerberos webengine-kerberos)
+		$(qt_use pulseaudio)
+		$(usex screencast -webengine-webrtc-pipewire '')
+		-qt-ffmpeg # bug 831487
+		$(qt_use system-icu webengine-icu)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+}
+
+pkg_preinst() {
+	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
+	elog "with additional security fixes from newer versions. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tldr: Your web browsing experience will be compromised."
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index f89449033d17..1e124389a4a2 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -5,7 +5,7 @@ DIST qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz 260972 BLAKE2B e485977
 DIST qtwebsockets-everywhere-src-6.4.3.tar.xz 267624 BLAKE2B 4b33f472b7ef3745fe7e85cb942203de6139d3e0e2a553e92bb3659473e9ae12d6f7460da78da925189b202a65df69788882c7bb3ab0fd9b432d376082774091 SHA512 231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3
 DIST qtwebsockets-everywhere-src-6.5.0.tar.xz 266852 BLAKE2B 1354a5c5d6cfe6b016c78541271e2327a73886205fad1124ace93bd8e60d0a07b1ac763205d0259e43db21dabe028c10140ce00f634c3d3054db8d3e4fb58cc9 SHA512 b13a6c385573cd19cefa48dfd6be1066c09b046f5a54d2c61fda3ab83903dc75b2f3fa0aa45f9e56610526214a64416f90d955becf2aff90611387a605314b67
 EBUILD qtwebsockets-5.15.8-r1.ebuild 578 BLAKE2B 7fdd1091164c81cdf972e95caacfcd2520c7201597ed16580b91a11c3a26af86bf97a45ec95cffbf6348ee80b563b05497083d99e0eea7ac23c5c634f5ab93ba SHA512 f46ea8af383efb3c0b4e9a671296e4b585bc6bde71abede3b8eb6303e203af3e74228f110cf8544113d24178ff11abbe5f111e18ee4c301f212af7dbac0027aa
-EBUILD qtwebsockets-5.15.9.ebuild 576 BLAKE2B b8a0c67ee452fb4a6e1644651ccefe5a74c797cf6d3dd5346508f7c570cddac9b0a24015eb987534d6b544a6af57ea301f54f7c044c0629a434b2c32255e41b9 SHA512 32bcb1eb5c4cb94290d7d37e0f057d3d44f2a2c08484613587dfffb080537eb2a7032b7e4c4c1f15cda1d9e0bd2024057e1aff171005b048df0f3cc571b0a36a
+EBUILD qtwebsockets-5.15.9.ebuild 583 BLAKE2B cdfa1bf484d7c20be7bb29ceb6ec79c456d34e2de00c610c20d46f85cf36032aaf4b1356c941f8d8869dc4ce4a0a94204fccb5f55bf9049e2fe1132ad27374a3 SHA512 fa62147710d6609d2b650859500f538937edf048d005f3d777b53e1a5361fa95267c558cd009cc209bad18fc2abc91f38be77cbdb5de37b4f05bda24766a6dfe
 EBUILD qtwebsockets-6.4.3.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 EBUILD qtwebsockets-6.5.0.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild
index e2360b7315bc..2a8b5a147209 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit qt5-build
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 25e054a71353..7f6e9dd6ee25 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index b2598c672894..e667166c1822 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -2,6 +2,6 @@ DIST connection_pool-2.2.5.gem 14848 BLAKE2B d3e21e5d3c330fb501e9890260c0fed003f
 DIST connection_pool-2.3.0.tar.gz 10656 BLAKE2B 235ddcf6956c53bff276c27b47f3dd21f008cad4eea07692cad186117e6d6a986acb1fa1e2eeb29a9bb72f5ee5e3b7c80927e711ebdf00ceec9af2f02ca37e25 SHA512 8f9c9c1c738b5321b52c28033bb7ac8f6697edfe584f858ce4891514c65730ccb950db9136f059991c4fe1d1386b18883d7b61557aeeb687c602a09229dcb38f
 DIST connection_pool-2.4.0.tar.gz 11243 BLAKE2B b8fcb164473863dfa4d4cd0a2f511f006ab0369a3890639115b42755eb6a50f1e8e37e1b2bdba0a4ac203ef05e5fde84cc95b0f10f547b56effbaa19df0ee64e SHA512 7b3d732da657ecdd1ebe2fa1600c0d723496be9c89397db3da06d854daba07aa959750527ec2c08bdf5a41e30df2ee04407fe76260440848db9b426c508a3544
 EBUILD connection_pool-2.2.5.ebuild 771 BLAKE2B 9a1cbea11bea0f33cb19d07ea2f83adf0b190be605b4837783562b5959ddae606d36dab38897846c5662dce51564efdf6783154fda5b6a0f3d2c40ac58e8b68b SHA512 20c2f5366a0ef29f49949b1321e6cb8889e230a8cf0ae3656c28b371da43b446ba93a2c182e7da78825e1e785bc8aae612a64f846dba492148a7a7352248ff8e
-EBUILD connection_pool-2.3.0.ebuild 906 BLAKE2B eef14f538d1d98aac2ef5ca112a0334cf0b49a863ffa47fc984fda0751a8819b7241558beb076f721015464669129ef40bebfb770482c6e2a13f5eeffe36683d SHA512 6db882fa44bc6a0ea9f9eba5f6f5c0e0f02b5b0ba82fd288df62450f17613913c82182cdb62d39097273355cc69a2b542c41750aba2ba726656b19dd8cecd243
+EBUILD connection_pool-2.3.0.ebuild 905 BLAKE2B f8d15e910f1c3f02ad954fe4ab87516853846a59f0da255fd6c57bb423a716bf84c48841683e058e7faad09af9855e89852c27fa06514a48f6ed0538baf730b8 SHA512 4c396fc37b8f48deee0493a39bfa9a2613bd80e5ad1027a7c973e4fbb9808c81f49d058b9bc0f900f266efed90e687f211d572bb082db92a1796c5a7f7d5dafb
 EBUILD connection_pool-2.4.0.ebuild 910 BLAKE2B ec95cb63c7c5a976d769e75681a944acdb5401470f00ae65cbdb1a8060fd106ac6aa81cd0eb7da888df3274f451be532cc9ce957629c63a39b5a4492385924a5 SHA512 7e0aea27b9e571c35c60b5e96fae43a7ee9756266350d216c26f7066a5cd486fd5e1264b8dcda278b23efde1665316b8887b559b5d0e462efbf5ad977bba2fa0
 MISC metadata.xml 350 BLAKE2B 9a703bda88725974dbaaf272241eed5ac6da6789fd05221852d904b53b506861c85b93f7a8a0c43c6ae4f75864ad1a9e8686f1edd44231f55671b2be80745dd7 SHA512 7cf078db32bc0d8f6f5b02516027dd0231b2276cfae19b7ede7adca0342e96a994233c78decf9ba83ec7bf4cda66525192cd6fff0f27fd4e3689e557b97d90b1
diff --git a/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild b/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild
index 9937d3537269..8c8f663f5818 100644
--- a/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/mperham/connection_pool/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index baca1f59fbe4..ea1ef135a428 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -6,10 +6,10 @@ DIST rack-3.0.4.2.tar.gz 788276 BLAKE2B 9934c4e448ee09c9a910ef8259957737e4d213d7
 DIST rack-3.0.6.1.tar.gz 789191 BLAKE2B 1431e6e97afa503a03dbf3deed67e438b00ad0b74d93df91d248235bd135c7bc6f45da3d488f531b9f00a62f9c193bfec0e301507250543abc1f66db6fe69b8e SHA512 afcc93723c797bbf7a231e70ef8336053443dc8028bbb26bb58d4e1c17ed6a53d178d56fc9b2d33be5bde88ab634fbb233ac133b8a991258469c564afdd5758f
 DIST rack-3.0.7.tar.gz 788611 BLAKE2B 99f4b7394c7b7d78ca3c7888369355437383ed5e3f3bea1bae7117019df5588a2c778270308309908223f5c509c97e6792b2edfeac6b3e3d6815e147bcdab375 SHA512 7ed94b59a4c8886ad94898eb1a7dd3e363fd1b2cecb79713ab744853e7c3da7a1d10034235a1aa5da4cb50c1a5d7c86c4d524ba2a328bbbb6289e9f1f7e37edd
 EBUILD rack-2.2.6.2.ebuild 1672 BLAKE2B 441836edc1a44c888fcecbcf6b462913e4734ecace1155ee3a4d63d865257d81e060c3a72f6d2dcad0559ee6270f6eccb6702174d76ad44e646bfdd52e12ea8f SHA512 d37cc4af348ca5faaa1d7267d0816b7e930f501bb82d3d6637d89cf37fd5485485bcb818977e143e799c67c3122b6b84eb0f5f6c4bd395a2329a54c24ce159a6
-EBUILD rack-2.2.6.3.ebuild 1678 BLAKE2B 6b92d20291be10e21d22c8172eeb1c18d40be1f47e1a11eb94cd10a099e6e3f5aa20e4c9bdb8ad37fbd152a7e9f2407fa935bd494714de21ac0ca135b2d2ae6a SHA512 4c3b828f484cd3ed2d966db199778c22d1d98daf85a9ec284dea541f6060819aa92e75df755dcc3d8f7149cd6dc6301ed21693f9d2639d08279f0a245b077dae
+EBUILD rack-2.2.6.3.ebuild 1677 BLAKE2B f1cf212a217ff88c0b07ee60906c5ae1734bf2dac11e76843249a4decb3dd7fbe6679e083abc4dd830a8623c7b1f1f16fb57b4471b735a76425a82cb2b97eecc SHA512 d36e10b0635c25f58f820d8b1fba7b79f3206c6d150f9a2940c124d468d5552c1420dd796ae679db1345147d3a2bba5cac6303e7443cdac15c4e513d67c935b4
 EBUILD rack-2.2.6.4.ebuild 1555 BLAKE2B 5e446143227bff5322d935cc1d3ee36d25584532e3152f0ef848b46850680e63073af86d50a56e4a7c3968a71f4be3ad08a3a0d42f39eede59ab14a55e02174c SHA512 456a52ae46898d656f498877913565cec18866d8faf0f39b5b356393a62d49007f7253b158166fc0506b35b1d95ac241ec277439b2e1dd35d1097eaa42f1c986
 EBUILD rack-3.0.4.1.ebuild 1293 BLAKE2B a6c99f5219f0a4b4fc194667233ea0a10e4cf4dbc0bf6d6f54d6caaecd6d42e0481ee5f5c9c35febfa0a6887addb90944772c36285b66240a6c7627aa3ce2ceb SHA512 3c908011fe5682f09369588d333b4d844e3d50b9f58f734dc5bb4f436d4221df222368f8625835e798ce5f139a058e58cd94871aca2a1c2c2a3072f0572925f4
-EBUILD rack-3.0.4.2.ebuild 1299 BLAKE2B ef991d44682264c850ac659d46be89fbed2975a92a423cb3d23ba728bfdd6d0a40e28a960aca3f5c66974dbcf4cb2d1da2be3acba316e3a8b107d863153d80f3 SHA512 7d8c08de19897df2b120a564acce9f66f75e9c5b6b8507abc88b0b1d6ab8e53b9e42f7d68196dde8eb900aa5faf91d3b9e48f6a2cd2cc5deb7bdd255e8854891
+EBUILD rack-3.0.4.2.ebuild 1298 BLAKE2B 1b9d08d3d1d1a0151f111a213f110aa27b5bd399f3e1dcb4c47b9ba4b275ed1b0135090a44e26126db06c2202bd8bcd4fdb133206e657852d7126f878392be63 SHA512 90d07071951ea138ab93717a7333bd40c671ae2a185d1cecfdc9345374eae9b66aa083764aa450428b8d1d119c11f8a29422c79365fbad3788b977977c3185f9
 EBUILD rack-3.0.6.1.ebuild 1300 BLAKE2B 77d4266dd5fe42759f88a0380718334b034918514bd8a9825816045113280fd37a7370ddac9ebcc262bb743eac6215032a9adcf78746feb1a1022f69734877cb SHA512 1b5711d7d327a21fa8539f27ef29761e88f633126372675398e3f6d83a7140f97139b4c5cb96edc6ec36978456881c68c2f8041e7ee6a502cfe41b86c66d7c49
 EBUILD rack-3.0.7.ebuild 1300 BLAKE2B 77d4266dd5fe42759f88a0380718334b034918514bd8a9825816045113280fd37a7370ddac9ebcc262bb743eac6215032a9adcf78746feb1a1022f69734877cb SHA512 1b5711d7d327a21fa8539f27ef29761e88f633126372675398e3f6d83a7140f97139b4c5cb96edc6ec36978456881c68c2f8041e7ee6a502cfe41b86c66d7c49
 MISC metadata.xml 537 BLAKE2B 998152d25abdb228da5fc7b39719693fd0811ce6dc0d831cf90a5ecbb88e540d76dfb6cfddb3584748f46f6d66aa2d1bc73d492c9e810db1c0e44895108d5e17 SHA512 4670ef4b5b33270c48d212fa995b965305f558c5f670e7eccbe2e44f9ba8d1628c112de5a9305c2ad90adb6e2996cab6da385e5f473d850b287e92f7594e0d21
diff --git a/dev-ruby/rack/rack-2.2.6.3.ebuild b/dev-ruby/rack/rack-2.2.6.3.ebuild
index d2c8fe25e3f1..0493b87d025b 100644
--- a/dev-ruby/rack/rack-2.2.6.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.6.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-3.0.4.2.ebuild b/dev-ruby/rack/rack-3.0.4.2.ebuild
index 72de79c31b18..0a9760a2a503 100644
--- a/dev-ruby/rack/rack-3.0.4.2.ebuild
+++ b/dev-ruby/rack/rack-3.0.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index fb68bd128617..abe51acad8c2 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -2,6 +2,6 @@ DIST stringio-3.0.4.tar.gz 43654 BLAKE2B 08f0d41577cae1acba36acc3823218649342c45
 DIST stringio-3.0.5.tar.gz 43822 BLAKE2B 5b79def3cb154f4bb1f4a50b8eeb95e0841279d8500b0ad0cdae1f3029c2b53e8e3f46583ed0b5e289afe6636bb4610bc27a25e24acba5c7c1e679c5e4283f3b SHA512 d881dea34738e46fffaceb9a5e88fa3148979eff3571a6693d1d80bd01fbe236c0eb65bd8b2003abc0241bceff93d87fd3acd27b038b3a7bf6da65d492047153
 DIST stringio-3.0.6.tar.gz 44971 BLAKE2B a143fc01e7b9434db3b444f6049b002549a4149b9573ceeab4bf8955555290b1f41ef6ff012c7f58d1bc0559ca864e83aeb34f0cb75c3133ea91ac51f55008ff SHA512 118e7672fb347b111f90f4380e49ad01aac617fdf6afc9317f2242e942e68fa55ef5d71782c15156ed7b4c91d1eff75ac68d870885650ac4505d6a17b368afab
 EBUILD stringio-3.0.4.ebuild 923 BLAKE2B bb99fe0718f884ac84faf133bd190f46525a5f05e7e062fbcf78bdc99a94a6b2b1de92b3d31cc8549daeda54bf61d7a18f3033b630673f0f28a262fda8b1f367 SHA512 5a1b18e503619082cd7ea16ba2d9a439b7eb349f1aa24d3c1cf7801290800b0294afffc47701968982bb74bc8e5c4203eee905d350ddb778127163b3142ff71d
-EBUILD stringio-3.0.5.ebuild 931 BLAKE2B f090fb961a173fba696ceb48b984757850f5bd89a80f6871a6d4a6061d5376740225d1acdf0368c58eb2635e379cb9b9542b3d238d499f6400c805d07ffdb990 SHA512 35743d25b608df3cda5b8a8b2bbfba08eae04a3892a6732e1f06b9b4030d26647db360570dd5fd9340fba8abd77ae9c0b7aaf47b4b4423c86f17943e2974d56d
+EBUILD stringio-3.0.5.ebuild 930 BLAKE2B f0dc2add146d867b8c4c7eae5c060b22913b734d45e2ab8a81124326f7e32c054123431c1207328fce7858f303f13cf7e7af3c0f8380731c651f908007a573c9 SHA512 0705e5cfdaa2f32f4029a24bb8ef713cf31e64888bfe12b92f56ca12b985759c90696d93b8ef05cddef576fb261aa493becab19b317b0f6423fb8911aabd4a7f
 EBUILD stringio-3.0.6.ebuild 931 BLAKE2B 557e06e333c986f6807eb8321280e5ee95d2da5a3c3a27050df44fd9093542fbfbf178685d6a60cdd843558bfb13e608f8169522a349f495aeb93c4cc236a716 SHA512 becd6b7b10edcef6b1aaced89603dd8dde929a414e0e95241d5296189a36ed00d51d030b3ab3b150c5ad50c5bbc7d725b9dfea4925a39382ff1366a8d8aa063a
 MISC metadata.xml 340 BLAKE2B bd5f8222a43eb391d2d14a1b878fadefd9f8a322e87b5058d482df79d95d70f7ef19c54e7ae12dc29e7ffc84c72e630f0ca46ac095059263cdcf6047cb4fa4d9 SHA512 f1f32d2c4c13e19500a7ff23b684b180d3dba8a79e49b8cb57b80e265d09e06cb8b7a9e6b743158a140967b7ccbb991fdf51cb3a6e95be4e24378a5f85efcbb2
diff --git a/dev-ruby/stringio/stringio-3.0.5.ebuild b/dev-ruby/stringio/stringio-3.0.5.ebuild
index 701e2800531d..ba512b7a3ef2 100644
--- a/dev-ruby/stringio/stringio-3.0.5.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/stringio"
 SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index d47aac778022..9f2961490ed7 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/elk/Manifest b/dev-scheme/elk/Manifest
index b411fddcec13..d81cc5fb8944 100644
--- a/dev-scheme/elk/Manifest
+++ b/dev-scheme/elk/Manifest
@@ -1,3 +1,4 @@
+AUX elk-3.99.8-implicit-int-incompat-ptr.patch 1647 BLAKE2B 56d4797a37e9945e8a6d5c2665251abf9bf7ba866be5f9f4092947c0a865501fcdfd70e21c98a6f2651d3536de343f551601ffab16c0cefd9a02fbaabaf4ee23 SHA512 e620c98e8c73cc0fc2a1924aa2a2372d4a223ab0ad5f5d3758b27b340e3751fa0ba2f863bbfd800b161ede4ac7e52c68b93d68ff27b6bd85e4e8bff3e8c1e07c
 DIST elk-3.99.8.tar.bz2 701206 BLAKE2B 93105702c2d8796fe0d1f7f4c1d0f4b128f01755d6f4366840978ed2224a2a3c27d261dc0cb6a3f8d0e199e9ba9c2ff1a5a61dbc5d593b122b40585c0fe631d8 SHA512 dd966bf6063b4e04c0947e56381cc9456ea81cf4ec66d04e80cb79485d39414f0b713520278a62fa4630068f245f33b28b08b5fd4a7defd0bcb20bf2eba4ed49
-EBUILD elk-3.99.8.ebuild 868 BLAKE2B 93c7edfee4dac2ca95f9759ac6936a51af0a34929615cc32a49be20fe9319632063873a92121b550b55b71189c94a629762c5f5c8964bfeca91576e9ac48fb6a SHA512 9933eed5134bda1716b108eaa6c33376d71d80139ac2e0c1359f8b40f4055ff0d9d0f655584fa61e8585414d7b35610907a07ec7e0413878de9112bdeb67756d
+EBUILD elk-3.99.8.ebuild 933 BLAKE2B be170521345f639fc6a3d6aa69297835e8cd51ee563141c614fe3ebb3db72454bbb9a5745dc269561c810f1f53fc2ce5e7f94d158c14b22b69eb1057f5a4f88c SHA512 13c2ff214b1c3d35dd6002cfb3e729e284b36d092a3ea5d069e3ebe34373e26988d520c3da95fbe443a31f773b34a7aa10e526ee2cd53e257daf7f7470c8d35b
 MISC metadata.xml 548 BLAKE2B c1f848acc03457f6d921beada14f021027297ea593eff6cc9c04422e89a7e50b8e12cad7c995d8bd3de675b95caa5f396db0e34c9e193fdd9afe1ab7c57a1df1 SHA512 3ca8499f8fb0f7b2052fb41b2dcacd41b107aa16c541815681daa6997ab3e1b207b4611b690b011a48f7fac2d2d83979ca45e42de66a8480d43e8481a02d49fa
diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild
index a9e62f4c49fe..80e1909b1571 100644
--- a/dev-scheme/elk/elk-3.99.8.ebuild
+++ b/dev-scheme/elk/elk-3.99.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,6 +11,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-int-incompat-ptr.patch
+)
+
 src_configure() {
 	econf --disable-static
 }
diff --git a/dev-scheme/elk/files/elk-3.99.8-implicit-int-incompat-ptr.patch b/dev-scheme/elk/files/elk-3.99.8-implicit-int-incompat-ptr.patch
new file mode 100644
index 000000000000..24e91d0a5651
--- /dev/null
+++ b/dev-scheme/elk/files/elk-3.99.8-implicit-int-incompat-ptr.patch
@@ -0,0 +1,52 @@
+--- a/lib/misc/gdbm.c	2011-06-18 07:24:06.000000000 -0300
++++ b/lib/misc/gdbm.c	2023-04-22 14:28:35.200400436 -0300
+@@ -103,7 +103,7 @@
+ 
+ extern gdbm_error gdbm_errno;
+ extern int errno;
+-static char *gdbm_error_message = "";
++static const char *gdbm_error_message = "";
+ 
+ static SYMDESCR RW_Syms[] = {
+     { "reader", GDBM_READER },
+@@ -144,7 +144,7 @@
+     return TYPE(x) == T_Gdbm_fh ? True : False;
+ }
+ 
+-static void Fatal_Func (char *s) {
++static void Fatal_Func (const char *s) {
+     gdbm_error_message = s;
+     fprintf (stderr, "gdbm error: %s\n", s);
+ }
+--- a/src/heap-gen.c	2011-06-18 07:24:06.000000000 -0300
++++ b/src/heap-gen.c	2023-04-22 14:14:51.977052826 -0300
+@@ -872,7 +872,7 @@
+  * determines whether the object is immutable.
+  */
+ 
+-Object Alloc_Object (size, type, konst) {
++Object Alloc_Object (int size, int type, int konst) {
+     Object obj;
+     register addrarith_t s = /* size in words */
+         ((size + sizeof(Object) - 1) / sizeof(Object)) + 1;
+--- a/lib/xwidgets/xaw/list.c	2011-06-18 07:41:13.000000000 -0300
++++ b/lib/xwidgets/xaw/list.c	2023-04-22 14:32:58.923738362 -0300
+@@ -2,14 +2,15 @@
+ #include <X11/Xaw/List.h>
+ 
+ 
+-static char **Get_List (Object x) {
++static const char **Get_List (Object x) {
+     register int i, n;
+-    register char *s, **l;
++    register char *s;
++    register const char **l;
+     Alloca_Begin;
+ 
+     Check_List (x);
+     n = Fast_Length (x);
+-    l = (char **)XtMalloc ((n+1) * sizeof (char *));
++    l = (const char **)XtMalloc ((n+1) * sizeof (char *));
+     for (i = 0; i < n; i++, x = Cdr (x)) {
+         Get_Strsym_Stack (Car (x), s);
+         l[i] = XtNewString (s);
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5c403efef6c9..157d1b92520a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index ea5010ecd5ea..4facb77c36b6 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,6 @@
 DIST pkgdev-0.2.5.tar.gz 76886 BLAKE2B c1f5789ab7d9ef425d5fe444e046e0f9df8c5725e663177f997e9e8849b95af9a3ad022bf474791eba37b74e369028471187cf2b2d62aea0a1246e8d6cfa4a39 SHA512 29a271b92e9272428f28b7a4530fe8cb1e392b5c9ef46dbd98ac130e4ec01eb8f584ca297a7dd3bc4dded9713823dafd8dc0b722d066d6360befd6637388284f
+DIST pkgdev-0.2.7.tar.gz 77938 BLAKE2B 86cd05dad2e2c9fdea4a27cb804224ede75d84c3b7558ee42946ef38fcb2efbe7660951bb83047a9b48354b0d25638c8afcd760226c6a3af9ba61b299a98e3ee SHA512 0103245a4c79af80af9eeaa634cb244c4ca0ddfcc07534821dbc9300a0c406296820a0afd77e837548c6ed5954723d01778ce0d63987642043a79df4a54efb91
 EBUILD pkgdev-0.2.5.ebuild 1700 BLAKE2B 2fe20bcd552d30768595fd811a679be44cfc2fa6420b9c6580c045c9b54d3c6328e493dc089b7d356d3cdbf1bc09f86fd001fa92f1a25c61ee9826883eb28c13 SHA512 d0f6860edc78a57f5d4eef1e125cd2cd0bde7ae0c3abd57593d2545ea8020c9a422a14ad1bb0476ef135d09ac668bb84274cea0e36a05ed6b9264324368f6587
+EBUILD pkgdev-0.2.7.ebuild 1708 BLAKE2B 2f5fd1564db12336d5f5484f1b8fdfa2040c01720ad54d81b915b5b05615a0a3e85dc9067977b0dc84d9b1182421d17893de8db9466592f721b2fc7b48ff9124 SHA512 c3371e564e13ea7c5aae570326a6ee322b60104f6dd896831bc205b507516877f740ae35a0e583c03164ec1c96207ff840f10c54776c92869e8a6ca37e660f48
 EBUILD pkgdev-9999.ebuild 1708 BLAKE2B 2f5fd1564db12336d5f5484f1b8fdfa2040c01720ad54d81b915b5b05615a0a3e85dc9067977b0dc84d9b1182421d17893de8db9466592f721b2fc7b48ff9124 SHA512 c3371e564e13ea7c5aae570326a6ee322b60104f6dd896831bc205b507516877f740ae35a0e583c03164ec1c96207ff840f10c54776c92869e8a6ca37e660f48
 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/pkgdev-0.2.7.ebuild b/dev-util/pkgdev/pkgdev-0.2.7.ebuild
new file mode 100644
index 000000000000..5119faefa1c1
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="doc"
+
+if [[ ${PV} == *9999 ]] ; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+	"
+fi
+
+RDEPEND+="
+	dev-vcs/git
+"
+BDEPEND="
+	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
+	test? (
+		x11-misc/xdg-utils
+	)
+"
+
+distutils_enable_sphinx doc \
+	">=dev-python/snakeoil-0.10.3" \
+	dev-python/tomli
+distutils_enable_tests pytest
+
+python_compile_all() {
+	use doc && emake PYTHON="${EPYTHON}" man
+
+	sphinx_compile_all # HTML pages only
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc || [[ ${PV} != *9999 ]]; then
+		doman build/sphinx/man/*
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sending email support" x11-misc/xdg-utils
+	optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja"
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 56e36bfd45bf..6b61416ceb40 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 4a4e2be1640b..b795f54e21ad 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-22.12.3.tar.xz 89072 BLAKE2B 16abe611582a1fae05f6c3b61af83f8d6f9a89c3b6f5384acad4a1c44a6fab4721a689af73b2a09066176bc3554fae42ef6c33e2c2cb1e2e6dbc96b961992324 SHA512 a1ce6d3f0707e203cff84812792fa7ec6122a1d5bb2117f27ab13f5d76d108f4026a2266d06eb39595b6dd54dab6266eb9245a528f6344a354faef8223f3ad8a
 DIST kaccounts-integration-23.04.0.tar.xz 88764 BLAKE2B 88473eca8b44c63a76ab64d90eb8a7318097d14ed971769aa3b19777b8674c06e8d0188a605eed44a3a8db60fa75be902b92c7242707e7ef8abe0e4cba9dd6b5 SHA512 57aabfc9c22502eebdb946911c0efbcb60a1b297330b3a48e9a9a5aa5871147e2328915cd0702aabef8393f10ebb15e9a7a9c2bd400b3bf82fe2cbc2170f50d6
 EBUILD kaccounts-integration-22.12.3.ebuild 1214 BLAKE2B f6a4c6b157450cbe998c54b4ac7748e23b6e689da62cc528df56e4ff34ef575fa1a4ef7c252423af7bf8aba15d8dcca58e1225923d2341bcf895891bbbb6028d SHA512 0cfe9779bdfa4be28ec1de7399e6929fa47fe2e4d429423ae146ec0f881a7060678f6d0f94190d58551f6741c083f7e68e1a1b89799b17bd44cd0b28918e5975
-EBUILD kaccounts-integration-23.04.0.ebuild 1182 BLAKE2B 8b4db763ab14243745e167ade58ea79bcbcac75be904f0765b3ad9f3ef9a0d3e8a7a6011f1857513812258e8f8e4c7e95fba56fd1e8fbbd710a85f813546d93b SHA512 229749354982bd959f59c532aa9c0607a6ec4f995996d2250bc400aceaf1a7148c0d364bda45943338d4157e71746570389d7257c7d8df26c29b182ad432cb9d
+EBUILD kaccounts-integration-23.04.0.ebuild 1189 BLAKE2B 9f76cae6931b81734a8d51dfeca1d0e88d9b59aa9309bbab8b6e0d9fa3794695ec0b211496fae6e49b14a1a0468db2734f41705ae6a9c9bb9f7f51f07a9afca5 SHA512 04ca50c9d3b920133df81ed069b20a7cf0cd84bde4c43f56310c18c26acd29231d19922b5a60df7eefe3d72116526577a05aeaaa7ac2d41bd4c6a1fdeb383685
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-23.04.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-23.04.0.ebuild
index 6ad6c172231a..69b340f69947 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-23.04.0.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-23.04.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2f7c39fcb7cc..51056de535fd 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 688228233d5b..c0368f3c8b97 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -9,7 +9,10 @@ AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c37036
 AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3
 AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38
 AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868
+AUX superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch 5193 BLAKE2B fcd3b72d51a67dc1670526f7b40e10a1b364f59201724db2739ad85aa99ae5184c6491c7d825b75df608d30d407be4a0c39e5b023ae9a320c918bb0f1aec5ea5 SHA512 385b017212241c4daa678fa4f83ec11833f2aa17294a68d2a6ce60deafe03710dfa55f262072fe8ef96d06247a9c2dd55433091699b173c5b8c49c8f8ad1bf98
+AUX superslicer-2.5.59.2-fix-spiral_vase-null-pointer.patch 1228 BLAKE2B 2eb5ce866cd6f3489fa635b10fd096ee00538131f52c8e6c67c814579a7daa39dd044b5d57e1e08bb20d951fd5bc899ba9e56ac5b715344f76dc5e5153ff1b37 SHA512 3701b003ad206c5b4f813e2cb82ed680d8bcb8fea5ddbae8374558f6c94a43c4707612fbd324b5b7bcf52629466f202f91aa0be4b457cd3fd602e7c1eb09f538
 AUX superslicer-2.5.59.2-gcodeviewer-symlink-fix.patch 686 BLAKE2B 869ba2516ecfb72cc59b50be5590ff07879b146dcec7b5b7e9cebd6d42d5bb011f353e89bf921b825392f4b0dbaa0cef5032f0a5a5b691e829ae7ad84e4e31a2 SHA512 5eb73e13d691e9b5a89a5f06181e7b8a5e13e7b26a9ce80b33618ab945aaaf2d7a29bf85aa4cf702212f33994ad28f19e11359ee29055175194e13173704f3ec
+AUX superslicer-2.5.59.2-link-occtwrapper-statically.patch 2916 BLAKE2B 9f28ba510235b20ad5cc8cd919bce00137b62ac1b64141ccaf0559f2e5d263b9c71539cc302a7e2ed046b3965aa5de36dff6131491a666fd90275bbbee95f450 SHA512 b49f2db32814c1bc467751f6d1b73bf22bba75e37b84b42bb0b8f42b5aa712a30cc9bb70f2210abed124509ca3d037e2450700a82d0994e8c3e4bafe498c6dc9
 AUX superslicer-2.5.59.2-missing-includes-fix.patch 2165 BLAKE2B ed39e6e2e07e7623a7dfc87f5127f310ae8d7847597619634d162bca73cbb39f0fe08e6ea64e0965d5bbc3c06c9fc61b14c808b8c97f227599cb94dfe88d73dd SHA512 7deacf27bbc17e847b46cea00193c76bfec7b3b885f3fefd67bc0da8ec1df0c284252833b09560d0a5240630c0e3d88cc49fe40a1fbf80295f39fb18139dc655
 AUX superslicer-2.5.59.2-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
 AUX superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5
@@ -19,5 +22,5 @@ DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970
 DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e SHA512 c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7
 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd
 EBUILD superslicer-2.5.59.0-r3.ebuild 2243 BLAKE2B dd9727cfb208c694890deccc696845ad8dc0ce48a17a244513c333854b782dba9103b713482909cfb6238ec3063514f68b960750c2a2a5a667355d8373beef91 SHA512 a8dca57479744a2de97e2dc6feb37a5b41a3a5e44878d8fdb37689d70895ff7eafd782ee4178df65738c4c995aaba81f1e4eaa2dbfd22f6d09c54e197315b61e
-EBUILD superslicer-2.5.59.2.ebuild 2227 BLAKE2B 3b8862dde38444cb54d7f9384d2f25287657fe31b1e67eb6d33ddff6fd3f029d27c0f18b6064d5c19af35567e6ea375180dc69adea2e006d71a87a87fc7c3586 SHA512 3d67564cb66d811ba2ca4c26c330edd1104fb8c622c5e116433088b90fd7e523232627a2574f398b26e2d2f5b490f9b68cb531ad704a58e6ee0e1f72998a086e
+EBUILD superslicer-2.5.59.2-r1.ebuild 2433 BLAKE2B 57bc52b87dd1688cf37f0b772a9d8672cb6cf9f5ac0a3cb9d398f7ec82dc926238f36bcce18e1f5ca7537bfacc12c344982dd598308f4be2f384cc6d5fcc03c0 SHA512 8c8115ae9e9a72bd42829bbb6807efe09dba1692454ddb0a700ae21011c6170a79b94e63d98ed338c79b8d231cf14c0fcd907103b993a1a6d66ca59531a9700c
 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
new file mode 100644
index 000000000000..4e93fca55e08
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
@@ -0,0 +1,82 @@
+diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
+index 68ec2ce..cd828a6 100644
+--- a/src/libslic3r/GCode.cpp
++++ b/src/libslic3r/GCode.cpp
+@@ -2081,31 +2081,30 @@ void GCode::process_layers(
+             }
+         });
+     const auto spiral_vase = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&spiral_vase = *this->m_spiral_vase](LayerResult in) -> LayerResult {
++        [spiral_vase = this->m_spiral_vase.get()](LayerResult in) -> LayerResult {
+             if (in.nop_layer_result)
+                 return in;
+ 
+             CNumericLocalesSetter locales_setter;
+-            spiral_vase.enable(in.spiral_vase_enable);
+-            return LayerResult{ spiral_vase.process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
++            spiral_vase->enable(in.spiral_vase_enable);
++            return { spiral_vase->process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
+         });
+     const auto pressure_equalizer = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) -> LayerResult {
+-            return pressure_equalizer.process_layer(std::move(in));
++        [pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult in) -> LayerResult {
++             return pressure_equalizer->process_layer(std::move(in));
+         });
+     const auto cooling = tbb::make_filter<LayerResult, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&cooling_buffer = *this->m_cooling_buffer](LayerResult in) -> std::string {
++        [cooling_buffer = this->m_cooling_buffer.get()](LayerResult in)->std::string {
+              if (in.nop_layer_result)
+                 return in.gcode;
+ 
+             CNumericLocalesSetter locales_setter;
+-            return cooling_buffer.process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
++            return cooling_buffer->process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
+         });
+     const auto find_replace = tbb::make_filter<std::string, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&self = *this->m_find_replace](std::string s) -> std::string {
+-            CNumericLocalesSetter locales_setter;
+-            return self.process_layer(std::move(s));
+-        });
++        [find_replace = this->m_find_replace.get()](std::string s) -> std::string {
++            return find_replace->process_layer(std::move(s));
++});
+     const auto output = tbb::make_filter<std::string, void>(slic3r_tbb_filtermode::serial_in_order,
+         [&output_stream](std::string s) {
+             CNumericLocalesSetter locales_setter;
+@@ -2183,25 +2182,26 @@ void GCode::process_layers(
+             }
+         });
+     const auto spiral_vase = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&spiral_vase = *this->m_spiral_vase](LayerResult in)->LayerResult {
++       [spiral_vase = this->m_spiral_vase.get()](LayerResult in) -> LayerResult {
+             if (in.nop_layer_result)
+                 return in;
+-        spiral_vase.enable(in.spiral_vase_enable);
+-        return { spiral_vase.process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
++            spiral_vase->enable(in.spiral_vase_enable);
++            return { spiral_vase->process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
+     });
+     const auto pressure_equalizer = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) -> LayerResult {
+-             return pressure_equalizer.process_layer(std::move(in));
++        [pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult in) -> LayerResult {
++            return pressure_equalizer->process_layer(std::move(in));
+         });
+     const auto cooling = tbb::make_filter<LayerResult, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&cooling_buffer = *this->m_cooling_buffer](LayerResult in)->std::string {
++        [cooling_buffer = this->m_cooling_buffer.get()](LayerResult in) -> std::string {
+             if (in.nop_layer_result)
+                 return in.gcode;
+-            return cooling_buffer.process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
++             return cooling_buffer->process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
++
+         });
+     const auto find_replace = tbb::make_filter<std::string, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&self = *this->m_find_replace](std::string s) -> std::string {
+-            return self.process_layer(std::move(s));
++        [find_replace = this->m_find_replace.get()](std::string s) -> std::string {
++            return find_replace->process_layer(std::move(s));
+         });
+     const auto output = tbb::make_filter<std::string, void>(slic3r_tbb_filtermode::serial_in_order,
+         [&output_stream](std::string s) { 
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-spiral_vase-null-pointer.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-spiral_vase-null-pointer.patch
new file mode 100644
index 000000000000..4dcc7f54a444
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-spiral_vase-null-pointer.patch
@@ -0,0 +1,22 @@
+From 6461985380814b92aab1caa791bee75d94e68676 Mon Sep 17 00:00:00 2001
+From: Tim Schneider <tim@schneider.engineering>
+Date: Sat, 18 Mar 2023 17:51:38 +0100
+Subject: [PATCH] Fix crash on spiral_vase.
+
+---
+ src/libslic3r/PrintConfig.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
+index 05bc79e53b..8c74880260 100644
+--- a/src/libslic3r/PrintConfig.cpp
++++ b/src/libslic3r/PrintConfig.cpp
+@@ -8055,7 +8055,7 @@ void DynamicPrintConfig::normalize_fdm()
+         {
+             this->opt<ConfigOptionInt>("top_solid_layers", true)->value = 0;
+             this->opt<ConfigOptionPercent>("fill_density", true)->value = 0;
+-            this->opt<ConfigOptionEnum<PerimeterGeneratorType>>("perimeter_generator", true)->value = PerimeterGeneratorType::Classic; 
++            this->option<ConfigOptionEnum<PerimeterGeneratorType>>("perimeter_generator", true)->value = PerimeterGeneratorType::Classic; 
+             this->opt<ConfigOptionBool>("support_material", true)->value = false;
+             this->opt<ConfigOptionInt>("solid_over_perimeters")->value = 0;
+             this->opt<ConfigOptionInt>("support_material_enforce_layers")->value = 0;
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-link-occtwrapper-statically.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-link-occtwrapper-statically.patch
new file mode 100644
index 000000000000..bb5b51f82a66
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-link-occtwrapper-statically.patch
@@ -0,0 +1,93 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b84292b..63fea9c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -19,7 +19,7 @@ add_subdirectory(libnest2d)
+ add_subdirectory(libslic3r)
+ 
+ if (SLIC3R_ENABLE_FORMAT_STEP)
+-    add_subdirectory(occt_wrapper)
++    add_subdirectory(occt_wrapper EXCLUDE_FROM_ALL)
+ endif ()
+ 
+ if (SLIC3R_GUI)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 36917f3..63c4201 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -435,10 +435,7 @@ target_link_libraries(libslic3r
+     qoi
+     )
+ 
+-if (APPLE)
+-    # TODO: we need to fix notarization with the separate shared library
+-    target_link_libraries(libslic3r OCCTWrapper)
+-endif ()
++target_link_libraries(libslic3r OCCTWrapper)
+ 
+ if (TARGET OpenVDB::openvdb)
+     target_link_libraries(libslic3r OpenVDB::openvdb)
+diff --git a/src/libslic3r/Format/STEP.cpp b/src/libslic3r/Format/STEP.cpp
+index 5165bb7..3ed0154 100644
+--- a/src/libslic3r/Format/STEP.cpp
++++ b/src/libslic3r/Format/STEP.cpp
+@@ -22,17 +22,13 @@
+ 
+ namespace Slic3r {
+ 
+-#if __APPLE__
+ extern "C" bool load_step_internal(const char *path, OCCTResult* res);
+-#endif
+ 
+ LoadStepFn get_load_step_fn()
+ {
+     static LoadStepFn load_step_fn = nullptr;
+ 
+-#ifndef __APPLE__
+     constexpr const char* fn_name = "load_step_internal";
+-#endif
+ 
+     if (!load_step_fn) {
+         auto libpath = boost::dll::program_location().parent_path();
+@@ -54,22 +50,8 @@ LoadStepFn get_load_step_fn()
+             FreeLibrary(module);
+             throw;
+         }
+-#elif __APPLE__
+-        load_step_fn = &load_step_internal;
+ #else
+-        libpath /= "OCCTWrapper.so";
+-        void *plugin_ptr = dlopen(libpath.c_str(), RTLD_NOW | RTLD_GLOBAL);
+-
+-        if (plugin_ptr) {
+-            load_step_fn = reinterpret_cast<LoadStepFn>(dlsym(plugin_ptr, fn_name));
+-            if (!load_step_fn) {
+-                dlclose(plugin_ptr);
+-                throw Slic3r::RuntimeError(std::string("Cannot load function from OCCTWrapper.so: ") + fn_name
+-                                           + "\n\n" + dlerror());
+-            }
+-        } else {
+-            throw Slic3r::RuntimeError(std::string("Cannot load OCCTWrapper.so:\n\n") + dlerror());
+-        }
++        load_step_fn = &load_step_internal;
+ #endif
+     }
+ 
+diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
+index 16de4e0..ad983be 100644
+--- a/src/occt_wrapper/CMakeLists.txt
++++ b/src/occt_wrapper/CMakeLists.txt
+@@ -1,12 +1,7 @@
+ cmake_minimum_required(VERSION 3.13)
+ project(OCCTWrapper)
+ 
+-if (APPLE)
+-    # TODO: we need to fix notarization with the separate shared library
+-    add_library(OCCTWrapper STATIC OCCTWrapper.cpp)
+-else ()
+-    add_library(OCCTWrapper MODULE OCCTWrapper.cpp)
+-endif ()
++add_library(OCCTWrapper STATIC OCCTWrapper.cpp)
+ 
+ set_target_properties(OCCTWrapper
+     PROPERTIES
diff --git a/media-gfx/superslicer/superslicer-2.5.59.2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild
index 304f0fbf199c..c29633c2bc55 100644
--- a/media-gfx/superslicer/superslicer-2.5.59.2.ebuild
+++ b/media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/nlopt
+	sci-libs/opencascade:=
 	>=sci-mathematics/cgal-5.0:=
 	sys-apps/dbus
 	sys-libs/zlib:=
@@ -61,6 +62,9 @@ PATCHES=(
 	"${FILESDIR}/${P}-openexr3.patch"
 	"${FILESDIR}/${P}-wxgtk3-wayland-fix.patch"
 	"${FILESDIR}/${P}-relax-OpenCASCADE-dep.patch"
+	"${FILESDIR}/${P}-link-occtwrapper-statically.patch"
+	"${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch"
+	"${FILESDIR}/${P}-fix-spiral_vase-null-pointer.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1ed4b0a43162..66863b76ea0d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 016dc7e631be..5c910ce1e154 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,3 +1,5 @@
 DIST xfmpc-0.3.0.tar.bz2 443234 BLAKE2B ee0f491baadfb6be9148de8060758f788f773bdbc0354d6061889e979fb16eeb7a44357b61e698908c972714616b4268ed443d1d6323cbf0f457cdfd6cdf0fc1 SHA512 6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3
+DIST xfmpc-0.3.1.tar.bz2 455660 BLAKE2B 2391217f1695ab0962a3ee52ea27ef44febbd8cf982d1bfba0c6952423c718f32dbea590930b9cef9cd3d932b2297cafb87870e27fb7579a764ad948e62918d6 SHA512 771835828cd89298d79c31cec2716b308889e6b835a2b16d0ef25eab6ed1667b055158f845ebf897df8f3f9f45a07fb6ad2994a9981695e74be2d56408e4abe0
 EBUILD xfmpc-0.3.0.ebuild 768 BLAKE2B 94c1ca9a19414e7b1d5cd217a4aa67b41525717227e76a267fc9c864c1635f96b1c94d877da81e21c505c6e515b9a32e02b7ae0bb74e681aae419cfaa5c70073 SHA512 5038a745344bed18aecfbf515dc7278935bc65ab0a81012f3df44dc1803a062a877dd8ab584369c7a7c979ed3f278a92b4328309d25af88654b4ca4ff1b0ea95
+EBUILD xfmpc-0.3.1.ebuild 763 BLAKE2B 9ec3f20a2fda11e0adf3e9915ca973d3321dcf3543dd3a995850bb747dc792158de87fd0805bd903991c9ad996f55bc8a3d396fbd058a0fecc7a5d3cd21eb0c3 SHA512 aa38187db387ea9c23a0dc21c4bdce75064ceffaa5f363b4b4009d8b0a2312dabc5d91a87e7dbd4596bb4a6932e48f4690f5e79e0c8965fa8616c2a45bfba555
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-sound/xfmpc/xfmpc-0.3.1.ebuild b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
new file mode 100644
index 000000000000..69378a9435cf
--- /dev/null
+++ b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/apps/xfmpc/start
+	https://gitlab.xfce.org/apps/xfmpc/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38.0:2=
+	>=media-libs/libmpd-0.15.0:=
+	>=x11-libs/gtk+-3.22.0:3=
+	>=xfce-base/libxfce4ui-4.12.0:=
+	>=xfce-base/libxfce4util-4.12.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0f79e76f248a..368311e8c095 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 4c388dcf4727..11aa5a89ba53 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -3,6 +3,6 @@ AUX subliminal-2.1.0-rarfile-4.0-compat.patch 971 BLAKE2B a26cd6ef8e2602abdcd8f4
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
 EBUILD subliminal-2.1.0-r1.ebuild 2696 BLAKE2B 5a93590849d168526574d5c8173d701de78c22dfb16b66619e762424a273743e788d1bad99d9bfeaf33d03a0b07f2a893ef5654a3f9465b1efcec7fc9232cf8d SHA512 8796852370c4a903e678f1f669ceb07de4be275dfea8ffebbdb57b365d4320078ad0aee282f93ab3bc0d35180719e9cab07009e9f41a58dca1ff9237b1987614
-EBUILD subliminal-2.1.0-r2.ebuild 2573 BLAKE2B 4f37498e938d04f196201eb5014574496594b6dbf2bad840de0923a54d743b257af006e9c4a54948746333f30d41a2c58d0257731887607352bdb912633d4256 SHA512 3d08e5b099c9beffe9b3d905b5fc67867da4d1ad0e3faefbe42dd166ecb403419ce3192d0c8bcb27cbefb89a534442562f7836fcb241a07705868f5c02252a54
+EBUILD subliminal-2.1.0-r2.ebuild 2572 BLAKE2B 6ba36e29a0212bcef16cdacae53a851bedfa970cfa3df4a5828488e6de467e17d47ea0eb5bd2b8641d6564901038f49ed57ba0204edb0bb8bf1aedaea45ae955 SHA512 419389652cf2e6cc21621f9de178355e6c0cee84e9332c5598ba5cb5d7a287a84e62a1cfe3fcd287a30024e712c90ce99922839bbec226222c476c51059ec9a6
 EBUILD subliminal-9999.ebuild 2573 BLAKE2B 4f37498e938d04f196201eb5014574496594b6dbf2bad840de0923a54d743b257af006e9c4a54948746333f30d41a2c58d0257731887607352bdb912633d4256 SHA512 3d08e5b099c9beffe9b3d905b5fc67867da4d1ad0e3faefbe42dd166ecb403419ce3192d0c8bcb27cbefb89a534442562f7836fcb241a07705868f5c02252a54
 MISC metadata.xml 447 BLAKE2B 42fac15336ea05ed85313259c5571f8e4101a39157973a2c43bc1a77bdb1e6610e9373646d485f8e5a5df1420b8fb3c780393e3191d4069a4e2ec5296733adc1 SHA512 fa0256091da7f65f41cfdd1b4ebd7e485c15c8a72cd916d553003e0d8beca479b0d0d877ad90c6c986b5c24070a89994d359f4672d2dfac513d06e9a8683d826
diff --git a/media-video/subliminal/subliminal-2.1.0-r2.ebuild b/media-video/subliminal/subliminal-2.1.0-r2.ebuild
index a3c58afc2d5e..fa63fbe0edd3 100644
--- a/media-video/subliminal/subliminal-2.1.0-r2.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Python library to search and download subtitles"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2319660fd1e0..2125eb6e22af 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 104123f3a84f..2fc0ef3b30e3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 22 Apr 2023 16:40:06 +0000
+Sat, 22 Apr 2023 22:39:33 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b5aadeb05f09..6613ce927b1c 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-04-22T16:40:09Z
+TIMESTAMP 2023-04-22T22:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREDelfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREYidfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klACoA//fdV0rvilg2/bkQsD6f4OBl1hpaW89d3kbabNu4ogvQ3PNy45tVSgpWYy
-AJFafPwrHZUhLrdQtqS3NGfeVDzn3cc2OkanHltKZ0smx8mST5k/L7Y6n8ATsbsW
-Bwx/hA6+UH4QBJuQu33j8WOEgyXSPGVKs+DPYXhjF3nJbRSbzLlIpthdy78P6H2f
-00DNMEJJxsL4VZUSDdIyC8O58FsP9mdrSH23tHfb9Ngv/J04S2b7IoYqjUOgz21R
-dNlvtFPbTzrQy2gtRcEKYnvIoKQfZWRlo3iB9yJjbop8Ei3DcD53/E2KqYgPLBA+
-UTPCdBadeDrDmmhDMQLgJbNZN0j8KsQfXIrE25GvDwrcWPIEwKVrEosdXs8oC660
-9k/EOAr7fVpm7Y4agbpEgNngkZBXtqYcElPQRmn8V6nt213WiaLDisB/O722kHZg
-r68bq3jGKAawz1TMpuvexQ2rkHZu35lZ/8N7wPXL66e8KfFkxXTjY2LDm5DAIaWC
-x3X8HqCgeizx6Td+2OWUjoa+dXkI6+17ZheASnyESIt4DcRRKacqoumJdMHP4I3o
-AJ7addgIhCIqmBYD9ad2bXc1kkqag0rGmj/+UrX9lesiAPtJuKrskh7MuVaoEkLF
-PuO5tWMIbK/zAOpYfznIu3gmvgVcgYarsvIbRUlXVoD8aAV1uH8=
-=9XSM
+klCTnw//R4sgIvmwYJa/XyVyRp7nK6v8Rg8uc/LKc9tpQqNs3JXY7LAjKlT+e47C
+2Toadwcste6Bc2rTZ3tiAw9DfhfSYtGRSMNiD0LTiOAvMN+HrTEBR4R/m+b72NCW
+EtuU39mHYF62bHj4gbYQFa6+86JpY+SHjKi4Hq6bHybosidQlpXYjdqUh3y5bqrW
+kWvNuAdZDgYf2dkG9SIezCiSkmGeEXcAo8kh03HvxX4v7bKjHYiUYF/g0HIC+yVz
+ZDmWWhoDMwM/OZSxCFbfZfvSXx4GJKCd0GHo9UxrB7Wlu/ZOtNIdxxF7oppa8711
+L5zBMWwmGukaEQArlQpRmGmJ2qpl//+V/FiaD/AI7Bp+f6EunVMytfd4VmEaBsnl
+FcbO+W5vXSRi0nj47tvah9Gy/+rKrVXaLKyUXyBr6jHXH2kdriuFOp2zTg35Eee4
+x8xh1YRV+jzWh9Nq++xUSWo0eGNANMRqX9zwoDutDvvN+XCAzxU/yq/GFRY8tPiN
+6rgoxbrtmfj4mdrzbEN85s2HX8GpTIQgKzDWtDIf9E4erE+3qIv/W6FZ8ZEWxy2/
+lIKUs7gfUrO+9aKKiw8/88/XMd3lP2bNsSMIXE6wLi2ZL/RAyKQVZhL7JH4FNZAz
+YCx1ns5MZVi0YZy8W9F0OIG2dwsX5XDN38G/ykqtRAknPI5mCqw=
+=AYBl
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 104123f3a84f..2fc0ef3b30e3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 22 Apr 2023 16:40:06 +0000
+Sat, 22 Apr 2023 22:39:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 44ab5c7793d7..f014a1e96d58 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 37b821c07480..a601e892d108 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/calligra-3.2.1-r7 b/metadata/md5-cache/app-office/calligra-3.2.1-r8
index 8e2c93cd4e1e..b87ff58dc6d5 100644
--- a/metadata/md5-cache/app-office/calligra-3.2.1-r7
+++ b/metadata/md5-cache/app-office/calligra-3.2.1-r8
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.2.1/calligra-3.2.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/calligra-3.2.1-patchset-1.tar.xz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6f25e140b17dea47d0b9bdd2135b3491
+_md5_=4112f69391eb52c6bde2d43e081e57d1
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 69919910b0dc..0948c621b7a0 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/apache-arrow-11.0.0 b/metadata/md5-cache/dev-libs/apache-arrow-11.0.0
new file mode 100644
index 000000000000..2955b0cf6fb6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apache-arrow-11.0.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bzip2? ( app-arch/bzip2 ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-cpp/xsimd json? ( dev-libs/rapidjson ) test? ( dev-cpp/gtest )
+DESCRIPTION=A cross-language development platform for in-memory data.
+EAPI=8
+HOMEPAGE=https://arrow.apache.org/
+INHERIT=cmake
+IUSE=bzip2 dataset json lz4 parquet re2 snappy test zlib zstd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=bzip2? ( app-arch/bzip2 ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+REQUIRED_USE=test? ( json parquet? ( zstd ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/arrow/arrow-11.0.0/apache-arrow-11.0.0.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-11.0.0.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-11.0.0.tar.gz )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=69b73e1245c62b9cdbdb3190fa0226f2
diff --git a/metadata/md5-cache/dev-libs/chmlib-0.40-r1 b/metadata/md5-cache/dev-libs/chmlib-0.40-r2
index cbfc3cee74d7..0975c6355d6c 100644
--- a/metadata/md5-cache/dev-libs/chmlib-0.40-r1
+++ b/metadata/md5-cache/dev-libs/chmlib-0.40-r2
@@ -10,4 +10,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source	15ce2b6ae214f3abe70892ce1e517abd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a0b615bc3aefb62c3d5ae4bc80bca6a8
+_md5_=f57c13ca19cb3c6ca95ebe29e95e3851
diff --git a/metadata/md5-cache/dev-libs/libptytty-2.0 b/metadata/md5-cache/dev-libs/libptytty-2.0-r1
index 0a46083085d9..40bcb251dfd9 100644
--- a/metadata/md5-cache/dev-libs/libptytty-2.0
+++ b/metadata/md5-cache/dev-libs/libptytty-2.0-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libptytty/libptytty-2.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=382a587e734242f423604d7acafb2b3e
+_md5_=b041867e8fa448037c3a8561c119b6be
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.9.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.9.0
deleted file mode 100644
index 58e849fdb83f..000000000000
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Plasma Specific Protocols for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.9.0.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=27c60a0184e43105bd99ad49f9dfdfb1
diff --git a/metadata/md5-cache/dev-libs/qcoro5-0.8.0 b/metadata/md5-cache/dev-libs/qcoro5-0.8.0
index b53bf92515a3..39effe9ad8fa 100644
--- a/metadata/md5-cache/dev-libs/qcoro5-0.8.0
+++ b/metadata/md5-cache/dev-libs/qcoro5-0.8.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro
 INHERIT=cmake
 IUSE=dbus examples +network qml test websockets
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 ) qml? ( dev-qt/qtdeclarative:5= ) websockets? ( dev-qt/qtwebsockets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danvratil/qcoro/archive/refs/tags/v0.8.0.tar.gz -> qcoro5-0.8.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9374b979cd65eba063de846046f42051
+_md5_=8e94f7b503f9131657301c111d97872a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 22ff2793e9ca..51d8b5e1c7fb 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/cfn-lint-0.74.3 b/metadata/md5-cache/dev-python/cfn-lint-0.74.3
deleted file mode 100644
index 934c220adc48..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.74.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.74.3.tar.gz -> cfn-lint-0.74.3.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a827bb37a9dbed62c2bf5f750c50b75
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.76.1 b/metadata/md5-cache/dev-python/cfn-lint-0.76.1
deleted file mode 100644
index 24705129a1d9..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.76.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.62.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.62.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.76.1.tar.gz -> cfn-lint-0.76.1.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0876f0a15b0bed804bbb661582d1f907
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.76.2 b/metadata/md5-cache/dev-python/cfn-lint-0.76.2
index e20adf7e2ba5..8cb50364e49a 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.76.2
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.76.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.62.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.76.2.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=19179a33cd541aa4a9182d3e5d11a366
+_md5_=86f57baa1bd75829cba30ddd0e21194f
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.0 b/metadata/md5-cache/dev-python/cfn-lint-0.77.0
deleted file mode 100644
index 100c93a994a1..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.0.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=568a98f93d062f3e2dd78ccb37890455
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.1 b/metadata/md5-cache/dev-python/cfn-lint-0.77.1
deleted file mode 100644
index 2e0067facc29..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.1.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=568a98f93d062f3e2dd78ccb37890455
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
index 92dbbb7152ef..adcb1d89a494 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/colorclass/ https://github.com/matthewdeanmartin/colorclass/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=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=https://github.com/matthewdeanmartin/colorclass/archive/v2.2.2.tar.gz -> colorclass-2.2.2.gh.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b535e46c9bce67458c073f8f821231e7
+_md5_=3fa8df5f18061034f71cf3a1cad64922
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r5 b/metadata/md5-cache/dev-python/docopt-0.6.2-r5
index 081341325181..8ee21e3f3d91 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r5
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/docopt/docopt/ https://pypi.org/project/docopt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=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=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7d76a17fe77cb9032a8a7aebc9594bf
+_md5_=2a2a6ddd239533d672a85c507ba934c3
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
index 7e32ab01c473..962df50d95c6 100644
--- a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_mathjax/ https://pypi.org/project/jupyter-server-mathjax/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter-server-1.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://files.pythonhosted.org/packages/source/j/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c0e89c3b3e85b5297c6f3d32a6065ccb
+_md5_=b9762cc4ba638c34458aa3b8fb3a2796
diff --git a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2 b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
index 88a5c2ca09cd..d87aed8466f7 100644
--- a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
+++ b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbdime/ https://pypi.org/project/nbdime/
 INHERIT=distutils-r1 pypi edos2unix
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[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://files.pythonhosted.org/packages/source/n/nbdime/nbdime-3.1.1.tar.gz https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch -> nbdime-3.1.1-jupyter_server2.patch https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch -> nbdime-3.1.1-py3.11.patch
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5e71b34e2c6f470742d071b43f6bb4d8
+_md5_=b562c8ff59f2c2c645b9913252f6c9ad
diff --git a/metadata/md5-cache/dev-python/nbval-0.10.0-r1 b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
index bc6a2efc4eb2..530ad0c3c881 100644
--- a/metadata/md5-cache/dev-python/nbval-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/computationalmodelling/nbval
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[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://files.pythonhosted.org/packages/source/n/nbval/nbval-0.10.0.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b16feb95bc3439ae18b50963581d3591
+_md5_=665a3bc8c145cbb8582227ad997a1d9e
diff --git a/metadata/md5-cache/dev-python/symengine-0.9.2-r1 b/metadata/md5-cache/dev-python/symengine-0.9.2-r1
deleted file mode 100644
index 8c97234e1e1d..000000000000
--- a/metadata/md5-cache/dev-python/symengine-0.9.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/cmake dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/symengine-0.9:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/symengine-0.9:=
-DESCRIPTION=Python wrappers to the symengine C++ library
-EAPI=8
-HOMEPAGE=https://github.com/symengine/symengine.py/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/symengine-0.9:= 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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/symengine/symengine.py/archive/v0.9.2.tar.gz -> symengine.py-0.9.2.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4fa080abd728fbb78c260e7f45674b6c
diff --git a/metadata/md5-cache/dev-python/sympy-1.11.1 b/metadata/md5-cache/dev-python/sympy-1.11.1
deleted file mode 100644
index 341551f38c7b..000000000000
--- a/metadata/md5-cache/dev-python/sympy-1.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mpmath[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?] aesara? ( dev-python/aesara[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) imaging? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ipython? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opengl? ( dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pyglet? ( dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) symengine? ( dev-python/symengine[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) texmacs? ( app-office/texmacs ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Computer Algebra System in pure Python
-EAPI=8
-HOMEPAGE=https://www.sympy.org/
-INHERIT=distutils-r1 virtualx
-IUSE=aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs test python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-python/mpmath[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?] aesara? ( dev-python/aesara[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) imaging? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ipython? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opengl? ( dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pyglet? ( dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) symengine? ( dev-python/symengine[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) texmacs? ( app-office/texmacs ) 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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.11.1.tar.gz -> sympy-1.11.1.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=7d53a9fe43445c624ee7aa29f4f09b7c
diff --git a/metadata/md5-cache/dev-python/tabulate-0.9.0 b/metadata/md5-cache/dev-python/tabulate-0.9.0
index 38c799032a4d..f25507e20b65 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.9.0
+++ b/metadata/md5-cache/dev-python/tabulate-0.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/astanin/python-tabulate/ https://pypi.org/project/tabulate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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=https://github.com/astanin/python-tabulate/archive/v0.9.0.tar.gz -> python-tabulate-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fbb3877506388afa11ddddc27e681639
+_md5_=9ee4d6eeb2ea723b2611e3886f96cef3
diff --git a/metadata/md5-cache/dev-python/trimesh-3.19.4 b/metadata/md5-cache/dev-python/trimesh-3.19.4
deleted file mode 100644
index 1d728712816b..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.19.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.19.4.tar.gz -> trimesh-3.19.4.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f080f5f5b70144566c5d9931ea51f514
diff --git a/metadata/md5-cache/dev-python/trimesh-3.20.2 b/metadata/md5-cache/dev-python/trimesh-3.20.2
deleted file mode 100644
index 7a77f71891f8..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.20.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.20.2.tar.gz -> trimesh-3.20.2.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e42b0a767e6eb4b7cbc48a6306efc1a6
diff --git a/metadata/md5-cache/dev-python/trimesh-3.21.0 b/metadata/md5-cache/dev-python/trimesh-3.21.0
deleted file mode 100644
index 195966f69044..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.21.0.tar.gz -> trimesh-3.21.0.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc0c4c45554c3f6d26a4a5f033bd6bfb
diff --git a/metadata/md5-cache/dev-python/trimesh-3.21.1 b/metadata/md5-cache/dev-python/trimesh-3.21.1
deleted file mode 100644
index 02a9db19c554..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.21.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.21.1.tar.gz -> trimesh-3.21.1.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc0c4c45554c3f6d26a4a5f033bd6bfb
diff --git a/metadata/md5-cache/dev-python/trimesh-3.21.2 b/metadata/md5-cache/dev-python/trimesh-3.21.2
deleted file mode 100644
index 4789c811cb3b..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.21.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.21.2.tar.gz -> trimesh-3.21.2.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc0c4c45554c3f6d26a4a5f033bd6bfb
diff --git a/metadata/md5-cache/dev-python/trimesh-3.21.3 b/metadata/md5-cache/dev-python/trimesh-3.21.3
deleted file mode 100644
index 0aed8b682748..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.21.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.21.3.tar.gz -> trimesh-3.21.3.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc0c4c45554c3f6d26a4a5f033bd6bfb
diff --git a/metadata/md5-cache/dev-python/trimesh-3.21.4 b/metadata/md5-cache/dev-python/trimesh-3.21.4
index dc7af19a4f5b..71ee52735386 100644
--- a/metadata/md5-cache/dev-python/trimesh-3.21.4
+++ b/metadata/md5-cache/dev-python/trimesh-3.21.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
 INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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://github.com/mikedh/trimesh/archive/3.21.4.tar.gz -> trimesh-3.21.4.gh.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc0c4c45554c3f6d26a4a5f033bd6bfb
+_md5_=dea3da0e3155e88b709e302d680f68cb
diff --git a/metadata/md5-cache/dev-python/watchdog-3.0.0 b/metadata/md5-cache/dev-python/watchdog-3.0.0
index 5d0e88b954ad..784f7f440246 100644
--- a/metadata/md5-cache/dev-python/watchdog-3.0.0
+++ b/metadata/md5-cache/dev-python/watchdog-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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=https://files.pythonhosted.org/packages/source/w/watchdog/watchdog-3.0.0.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=84f1bcad712ca1e71819cceab0167fc8
+_md5_=9c9f63d3250344e9beecedb4b857dc18
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.47.3 b/metadata/md5-cache/dev-python/zeroconf-0.47.3
deleted file mode 100644
index 3f71fb85e71b..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.47.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-zeroconf/python-zeroconf/archive/0.47.3.tar.gz -> python-zeroconf-0.47.3.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ec043904cd0335e6b0c02cddbd5d834d
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.47.4 b/metadata/md5-cache/dev-python/zeroconf-0.47.4
deleted file mode 100644
index 54c199ff2661..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.47.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-zeroconf/python-zeroconf/archive/0.47.4.tar.gz -> python-zeroconf-0.47.4.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=660f1ef986d90e923bd33003c3a0fe38
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.51.0 b/metadata/md5-cache/dev-python/zeroconf-0.51.0
deleted file mode 100644
index 202b8fd6b35e..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.51.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-zeroconf/python-zeroconf/archive/0.51.0.tar.gz -> python-zeroconf-0.51.0.gh.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=660f1ef986d90e923bd33003c3a0fe38
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.53.0 b/metadata/md5-cache/dev-python/zeroconf-0.53.0
deleted file mode 100644
index af71b43ac83b..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.53.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.53.0.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=152fa021562410281ccaf7caa8e8f363
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.54.0 b/metadata/md5-cache/dev-python/zeroconf-0.54.0
deleted file mode 100644
index a1d67dfa4e08..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.54.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.54.0.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=152fa021562410281ccaf7caa8e8f363
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.55.0 b/metadata/md5-cache/dev-python/zeroconf-0.55.0
deleted file mode 100644
index b8f3c599382a..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.55.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.55.0.tar.gz
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=152fa021562410281ccaf7caa8e8f363
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 3e38596df662..a1ae979bb9e2 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/qtwebengine-5.15.9_p20230421 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.9_p20230421
new file mode 100644
index 000000000000..5ebe84f3b7ee
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.9_p20230421
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtnetwork-5.15.9* =dev-qt/qtprintsupport-5.15.9* =dev-qt/qtwebchannel-5.15.9*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.9* ) geolocation? ( =dev-qt/qtpositioning-5.15.9* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.9*[widgets] =dev-qt/qtwidgets-5.15.9* ) media-libs/libglvnd test? ( =dev-qt/qttest-5.15.9* )
+DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
+IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtnetwork-5.15.9* =dev-qt/qtprintsupport-5.15.9* =dev-qt/qtwebchannel-5.15.9*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.9* ) geolocation? ( =dev-qt/qtpositioning-5.15.9* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.9*[widgets] =dev-qt/qtwidgets-5.15.9* )
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.9_p20230421.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.8_p20230313-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
+_md5_=ce36551fa1bd83d58d398b242787e3b8
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
index f1a9886895ea..516b004dd44c 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebsockets https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~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.9* =dev-qt/qtnetwork-5.15.9*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=067bb461c5cbd6a8959967ccdd524898
+_md5_=196474422fcb4b6f77d9aa07c4f32541
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 7cc704b271e3..2e862db3ed8b 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.3.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.3.0
index bd24b6aa4691..257dedcf6897 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.3.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mperham/connection_pool
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mperham/connection_pool/archive/v2.3.0.tar.gz -> connection_pool-2.3.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=19b811652180f1c5d61e75ba39996340
+_md5_=3e02c2d8f7a28fee5881d434f234c2eb
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.6.3 b/metadata/md5-cache/dev-ruby/rack-2.2.6.3
index a3771c4fef4b..ad5f6ce5e7c8 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.6.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.6.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rack/rack
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) !!<dev-ruby/rack-2.1.1-r1:2.1 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/v2.2.6.3.tar.gz -> rack-2.2.6.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4af73999e55373bd28fc9251e23cfc0f
+_md5_=27b262a47cc902299ac9a25bfaff1d57
diff --git a/metadata/md5-cache/dev-ruby/rack-3.0.4.2 b/metadata/md5-cache/dev-ruby/rack-3.0.4.2
index b5d55f1d85d8..563fe891a189 100644
--- a/metadata/md5-cache/dev-ruby/rack-3.0.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-3.0.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rack/rack
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/ruby-ssl[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/rack/rack/archive/v3.0.4.2.tar.gz -> rack-3.0.4.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=581e7a1d900ab092f3e67ec932fcd0bc
+_md5_=29972d079590069985da47c91ad2cf31
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.5 b/metadata/md5-cache/dev-ruby/stringio-3.0.5
index 80f14aa2275e..43e8fd97fba6 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.5
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/stringio
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.5.tar.gz -> stringio-3.0.5.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c9a4a5aaa70ef3ce12c986c918d8dfdf
+_md5_=92910ebd89fb976232b082375003f96d
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index e1901eef7d02..fe9920e38b82 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/elk-3.99.8 b/metadata/md5-cache/dev-scheme/elk-3.99.8
index 583d09f6cf08..a42eb00682cc 100644
--- a/metadata/md5-cache/dev-scheme/elk-3.99.8
+++ b/metadata/md5-cache/dev-scheme/elk-3.99.8
@@ -6,4 +6,4 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://sam.zoy.org/elk/elk-3.99.8.tar.bz2
-_md5_=26e5e4b3833a137045d4c50f5bb2b3a5
+_md5_=3c4195d93095c8439e3f0884a0d8c3e2
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 256fd99073b1..176b6269c524 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.7 b/metadata/md5-cache/dev-util/pkgdev-0.2.7
new file mode 100644
index 000000000000..e56d1fbbc008
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgdev-0.2.7
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/flit_core-3.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-misc/xdg-utils ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] >=dev-python/snakeoil-0.10.3[python_targets_python3_11(-)] dev-python/tomli[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] >=dev-python/snakeoil-0.10.3[python_targets_python3_10(-)] dev-python/tomli[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] >=dev-python/snakeoil-0.10.3[python_targets_python3_9(-)] dev-python/tomli[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/pkgcheck-0.10.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git >=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 ) 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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Collection of tools for Gentoo development
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgdev
+INHERIT=distutils-r1 optfeature pypi
+IUSE=doc doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/pkgcheck-0.10.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pkgdev/pkgdev-0.2.7.tar.gz
+_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2dd74a7ce1ea64016ad9efb5376d03d4
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 65c8263dad1c..e64d222a3f37 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-23.04.0 b/metadata/md5-cache/kde-apps/kaccounts-integration-23.04.0
index de6b95cc2177..8c2b35dd7c2b 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-23.04.0
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-23.04.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://community.kde.org/KTp
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm gear.kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/qcoro5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfigwidgets-5.104.0:5 >=kde-frameworks/kcoreaddons-5.104.0:5 >=kde-frameworks/kdbusaddons-5.104.0:5 >=kde-frameworks/kdeclarative-5.104.0:5 >=kde-frameworks/ki18n-5.104.0:5 >=kde-frameworks/kio-5.104.0:5 >=kde-frameworks/kwallet-5.104.0:5 >=kde-frameworks/kwidgetsaddons-5.104.0:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.04.0/src/kaccounts-integration-23.04.0.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=45a9977b06feb66d71a57abb1d2b8203
+_md5_=b48bcfd9575e7f197f71e86b2bd6f303
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 8450c9866e89..7c281bb02a48 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/superslicer-2.5.59.2 b/metadata/md5-cache/media-gfx/superslicer-2.5.59.2-r1
index 9c4e3291dadd..f03c22de0323 100644
--- a/metadata/md5-cache/media-gfx/superslicer-2.5.59.2
+++ b/metadata/md5-cache/media-gfx/superslicer-2.5.59.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl] media-libs/qhull[static-libs]
+DEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt sci-libs/opencascade:= >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl] media-libs/qhull[static-libs]
 DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
 EAPI=8
 HOMEPAGE=https://github.com/supermerill/SuperSlicer/
@@ -9,9 +9,9 @@ INHERIT=cmake wxwidgets xdg flag-o-matic
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
-RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
+RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt sci-libs/opencascade:= >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.5.59.2.tar.gz -> superslicer-2.5.59.2.tar.gz https://github.com/slic3r/slic3r-profiles/archive/f6b1b123062a77101fe350f6d2a2a57be9adc684.tar.gz -> superslicer-2.5.59.2-profiles.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=33e1e4617da05b4b17a7545e843eb268
+_md5_=ecc8748412ae3e0b5c68a6aefe734c16
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index dc973309b529..e3e118b7216d 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/xfmpc-0.3.1 b/metadata/md5-cache/media-sound/xfmpc-0.3.1
new file mode 100644
index 000000000000..9f6565839f35
--- /dev/null
+++ b/metadata/md5-cache/media-sound/xfmpc-0.3.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.38.0:2= >=media-libs/libmpd-0.15.0:= >=x11-libs/gtk+-3.22.0:3= >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:=
+DESCRIPTION=Music Player Daemon (MPD) client for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/xfmpc/start https://gitlab.xfce.org/apps/xfmpc/
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38.0:2= >=media-libs/libmpd-0.15.0:= >=x11-libs/gtk+-3.22.0:3= >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfmpc/0.3/xfmpc-0.3.1.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1d822d96c4de7fb1568cc759cb58e43d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0b864a89de0f..1bd357e138e4 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/subliminal-2.1.0-r2 b/metadata/md5-cache/media-video/subliminal-2.1.0-r2
index f09c2dc3706b..cd81e0001598 100644
--- a/metadata/md5-cache/media-video/subliminal-2.1.0-r2
+++ b/metadata/md5-cache/media-video/subliminal-2.1.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2012c[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.0.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[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Diaoul/subliminal/archive/2.1.0.tar.gz -> subliminal-2.1.0.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=683e9a60cf22b19e2d2a0272711e29ce
+_md5_=f5cf344707a124f4def92d20ef87dc3d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4222ee333414..86f0c8553bcd 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.32 b/metadata/md5-cache/net-analyzer/zabbix-5.0.32
index f03c62a35624..9a9d38a3c0bf 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.32
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.32
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.32.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.32-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=7c51764fccf32eccb36a57b549d56c17
+_md5_=298122298ca64ce54e030cd444d5a26d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.14 b/metadata/md5-cache/net-analyzer/zabbix-6.0.14
index de8e85f99437..b5e0210769df 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.14
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.14
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.14.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.14-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=49a7c8cdcae29c595e5f5adbea587093
+_md5_=db11d917da5f7f812530bd5a6ad31dd6
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index b258442ae868..6c7f2eb7c369 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/ppp-2.5.0 b/metadata/md5-cache/net-dialup/ppp-2.5.0
index e02ce4ca5f73..649bef8e862e 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.5.0
+++ b/metadata/md5-cache/net-dialup/ppp-2.5.0
@@ -1,15 +1,16 @@
-BDEPEND=virtual/pkgconfig dhcp? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst prepare setup
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup
 DEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd )
 DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=8
 HOMEPAGE=https://ppp.samba.org/
-INHERIT=autotools linux-info pam
-IUSE=activefilter atm dhcp gtk pam systemd
+INHERIT=linux-info pam
+IUSE=activefilter atm gtk pam systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD GPL-2
 PDEPEND=net-dialup/ppp-scripts
 RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) !<net-misc/netifrc-0.7.1-r2
 SLOT=0/2.5.0
-SRC_URI=https://download.samba.org/pub/ppp/ppp-2.5.0.tar.gz https://github.com/ppp-project/ppp/blob/ppp-2.5.0/contrib/pppgetpass/pppgetpass.8 dhcp? ( http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz )
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4f8ba5442502c695391742637ef761e0
+SRC_URI=https://download.samba.org/pub/ppp/ppp-2.5.0.tar.gz https://github.com/ppp-project/ppp/blob/ppp-2.5.0/contrib/pppgetpass/pppgetpass.8
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=967ad090e56e6264491545df46a82020
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 800af297b7a6..810bba897180 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/gnome-remote-desktop-44.1 b/metadata/md5-cache/net-misc/gnome-remote-desktop-44.1
new file mode 100644
index 000000000000..f9e747ab883d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-44.1
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( app-text/asciidoc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.10.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver )
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd xdg
+IUSE=aac doc +rdp systemd +vnc
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.10.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
+REQUIRED_USE=|| ( rdp vnc ) aac? ( rdp )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/44/gnome-remote-desktop-44.1.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b58b47ca0dcf29581a386fc16de2bbc8
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r2 b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r3
index fbbca4d93221..ea67a7bdcfba 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r2
+++ b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r3
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/l
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a8c0218b928a7b6790828bddf18dc5c
+_md5_=2c53306a1c4d45c0f029715c4f7de7cf
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f4265e7582ed..d03de85a5afe 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.15.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.15.0
deleted file mode 100644
index b2fb18563b3a..000000000000
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure postinst
-DEPEND=>=dev-libs/glib-2.66:2 dev-libs/json-glib >=sys-fs/fuse-3.10.0:3[suid] x11-libs/gdk-pixbuf geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Desktop integration portal
-EAPI=8
-HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
-INHERIT=systemd
-IUSE=geolocation screencast systemd
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.66:2 dev-libs/json-glib >=sys-fs/fuse-3.10.0:3[suid] x11-libs/gdk-pixbuf geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) systemd? ( sys-apps/systemd ) sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.15.0/xdg-desktop-portal-1.15.0.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e448c8800bd0f059cfe4e1d44fda8064
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 9939559ff19d..797de9eac25b 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7-r2 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7-r2
index 6bf0e6f1e522..0709220abe12 100644
--- a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7-r2
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nongnu.org/oath-toolkit/
 INHERIT=pam
 IUSE=pam static-libs test
-KEYWORDS=amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/libxml2 <dev-libs/xmlsec-1.3.0:= pam? ( sys-libs/pam )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/oath-toolkit/oath-toolkit-2.6.7.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c835fbb57d64fb7b990f64c18332dcb1
+_md5_=9650affba0cca9844b040dccc0ea2a1f
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 09c5b8f8df40..8014c0b81862 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r5 b/metadata/md5-cache/sys-libs/glibc-2.36-r5
deleted file mode 100644
index c3d64d4d52ef..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r5
+++ /dev/null
@@ -1,17 +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 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
-DESCRIPTION=GNU libc C library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
-IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
-RESTRICT=!test? ( test )
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-5.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2d0e503e7b33038d9c2871f37cd3f47e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.37-r1 b/metadata/md5-cache/sys-libs/glibc-2.37-r1
deleted file mode 100644
index 1df4418ec4f0..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.37-r1
+++ /dev/null
@@ -1,17 +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 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( dev-lang/perl ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
-DESCRIPTION=GNU libc C library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
-IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
-RESTRICT=!test? ( test )
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.37-patches-3.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=568900a889112aaeda1c3353127b2f82
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 3ae1794dd045..3ce607c4898d 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
deleted file mode 100644
index cfc21ec5530a..000000000000
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses(+)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Top-like UI used to show which process is using the I/O
-EAPI=7
-HOMEPAGE=http://guichaz.free.fr/iotop/
-INHERIT=distutils-r1 linux-info
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=!sys-process/iotop-c python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	eapi8-dosym	741bfa77afb2a9321261501aca58c208	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=56db22f8fa87b4f0f89d281aed0422ce
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 93e78adfb36d..e9b210e92f18 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/google-chrome-112.0.5615.121 b/metadata/md5-cache/www-client/google-chrome-112.0.5615.165
index 7e43c8ea17a7..a9bba9332c9e 100644
--- a/metadata/md5-cache/www-client/google-chrome-112.0.5615.121
+++ b/metadata/md5-cache/www-client/google-chrome-112.0.5615.165
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_112.0.5615.121-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_112.0.5615.165-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=832f633722d2fe1864b0c2632e551f52
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-113.0.5672.37 b/metadata/md5-cache/www-client/google-chrome-beta-113.0.5672.53
index 32994b2c71a5..823c8eeb5209 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-113.0.5672.37
+++ b/metadata/md5-cache/www-client/google-chrome-beta-113.0.5672.53
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_113.0.5672.37-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_113.0.5672.53-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-114.0.5696.0 b/metadata/md5-cache/www-client/google-chrome-unstable-114.0.5720.4
index bd88c7b9e252..26963abfadae 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-114.0.5696.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-114.0.5720.4
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_114.0.5696.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_114.0.5720.4-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/microsoft-edge-112.0.1722.48 b/metadata/md5-cache/www-client/microsoft-edge-112.0.1722.58
index 6b4b163dd6a2..1369ea0fb7af 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-112.0.1722.48
+++ b/metadata/md5-cache/www-client/microsoft-edge-112.0.1722.58
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_112.0.1722.48-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_112.0.1722.58-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e3faf660236342ed84650dbc4c099195
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-112.0.1722.33 b/metadata/md5-cache/www-client/microsoft-edge-beta-113.0.1774.15
index 61ef6c447e4a..290232722fa5 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-112.0.1722.33
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-113.0.1774.15
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_112.0.1722.33-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_113.0.1774.15-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-113.0.1774.3 b/metadata/md5-cache/www-client/microsoft-edge-dev-114.0.1793.0
index 5a5e6cec388b..a7b33b15fca8 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-113.0.1774.3
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-114.0.1793.0
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_113.0.1774.3-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_114.0.1793.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/vivaldi-5.7.2921.68 b/metadata/md5-cache/www-client/vivaldi-5.7.2921.68
index 352de1c42aa2..f7bbf1cb64e4 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.7.2921.68
+++ b/metadata/md5-cache/www-client/vivaldi-5.7.2921.68
@@ -5,11 +5,11 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info unpacker xdg
 IUSE=gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:106 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.7.2921.68-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.7.2921.68-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.7.2921.68-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=852e141799e1d86c69358233638f2118
+_md5_=c1c7d3f98dddcea79162904021aebaf0
diff --git a/metadata/md5-cache/www-client/vivaldi-5.7.2921.65 b/metadata/md5-cache/www-client/vivaldi-6.0.2979.15
index 36d1c3ec4444..e8d67fd71902 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.7.2921.65
+++ b/metadata/md5-cache/www-client/vivaldi-6.0.2979.15
@@ -4,12 +4,12 @@ EAPI=8
 HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info unpacker xdg
-IUSE=gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
+IUSE=gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:106 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.7.2921.65-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.7.2921.65-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.7.2921.65-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.15-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.15-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.15-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c1c7d3f98dddcea79162904021aebaf0
+_md5_=9baf2a81a21e7f9875a56355fc4f3d9a
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 01615ea7911d..9df67c6bdf03 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.121 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.165
index e9a7dd07e6aa..ed043c2012b4 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.121
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.165
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_112.0.5615.121-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_112.0.5615.165-1_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _md5_=56740527e70db7fbbcef87ad68552159
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5672.37_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5672.53_beta
index 964c454410ba..dcabc9f6a1ef 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5672.37_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5672.53_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_113.0.5672.37-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_113.0.5672.53-1_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-114.0.5696.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-114.0.5720.4_alpha
index f3193fe8c3f8..e456dcf502b7 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-114.0.5696.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-114.0.5720.4_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_114.0.5696.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_114.0.5720.4-1_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d90a9c8ecfa9..045a1de30f3f 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.29.0 b/metadata/md5-cache/www-servers/nginx-unit-1.29.0
deleted file mode 100644
index c3f1c0b9ca15..000000000000
--- a/metadata/md5-cache/www-servers/nginx-unit-1.29.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( 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 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
-DESCRIPTION=Dynamic web and application server
-EAPI=8
-HOMEPAGE=https://unit.nginx.org
-INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
-IUSE=perl python ruby php7-4 php8-0 php8-1 ssl python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( 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 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
-REQUIRED_USE=|| ( perl python ruby php7-4 php8-0 php8-1 ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://unit.nginx.org/download/unit-1.29.0.tar.gz -> nginx-unit-1.29.0.tar.gz
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a11c9a3632ba5a019cc6dfac7239137e
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.29.1 b/metadata/md5-cache/www-servers/nginx-unit-1.29.1
index e69037fe80fd..92098bc33606 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.29.1
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.29.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://unit.nginx.org
 INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
 IUSE=perl python ruby php7-4 php8-0 php8-1 ssl python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( 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 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
 REQUIRED_USE=|| ( perl python ruby php7-4 php8-0 php8-1 ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.29.1.tar.gz -> nginx-unit-1.29.1.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bf4b65fa0af485ce1f51fdcd42c559ea
+_md5_=ca84dc076dcf8f806a00c9467f091420
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 5679711f5ddf..61ca8abacc1a 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.5 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.5
new file mode 100644
index 000000000000..4d5ff88828cb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.24.0 >=x11-libs/gtk+-3.22.0:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.0:= >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/xfce4-panel-4.10.0:=
+DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/xfce4-dict/start https://gitlab.xfce.org/apps/xfce4-dict/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.24.0 >=x11-libs/gtk+-3.22.0:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.0:= >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/xfce4-panel-4.10.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.5.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c2367982b127658a8c75820507f6ef79
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b5c50c6c2ee5..68e7015a424f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-22T16:40:09Z
+TIMESTAMP 2023-04-22T22:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREDelfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREYihfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCbXRAAs6BM837/LRDPRmOw2waM0CE68j+7Zr2DidP35a9EIFxvxU/OHRIVoXzN
-1IcR7UwgyCYJUJv5ODPHgo6tf9Kr9ditSal+iBFuRgZVGJxpwnRjKitp95zTBTMp
-XU/pEC10oamgm1cEZGiDCqfBWxdyceYekkOhUKEmxpxpOCnZ0nRYSi9xG3PCYX0U
-qcxw0f+bqtLrMTyFaGs5hlv6/vx6/b7x5OC/6XP4UiiiV5pBGRKGFeaTN47a0335
-tX/wgy/AWbfMFccQbD7mBmlIkAfQ+s6PtrC/7YNUkyWIkZjwlCdhvIKMm13lMgGk
-RWzDxkqiL35JXPWs6+zJPIfNAVCq3LuwvvEHxDXZtZ187wYdm9rZgS804kNHJybX
-WBM6g/em7GtwnLh7iNq4ShP58MSCkay4QF8verfAD/QOQlZeD2/LUvcu9l3PoTkK
-10fn4pC9lQnoj20JxhLby/dUbj7L/XOsmmSbG+StUfoL9AL4tMtGqKSu0rcUav02
-58t8A64G6EjOvHLPubISS2xQbZVsmDc6j32ktUbfW6TaChbyVWoxERLOqzajQMkq
-DFDz/2QGbNVF31R29CiDXbrx1PFpphf4KpbSnIvIrURzlTtgxiTVaFZD4XJY+Tpc
-WmNZXCr0Ab7qE+/aHZ9cXnDDbEyeOozblpTy+Wfyz1DH3oqi+1U=
-=BuTY
+klDpDhAAk144KH/LuEFZIdAHoZ07OaL9XyhVjLT4ad9o6SDL4DbZkn3+s9X1DQ5b
+A2+zYEKxBDwW78epYu8O1Ia/Rn1e1YouhuBXZr7BHpIWP8rNVKqMftHKLKy54DqQ
+3nxjEDLtClEqkK539k9ky9Ekf8tXQ89HpXyVCGvZPR3Nkm1QSN+gSA/7iFLq4rHO
+D9SFRMfVgrjKgHtqWehSnMEd1z/0dmZG9E/x72iHpGlA4a7uTej/fqVZXj4HRqH6
+c9xtZ6C08iMdp+khF5WFgDMQvBG8wbQJrwnyFfwIZQRRhPh050i4kfGin1tKuB8v
+wC2IHWa1eI6ZNrW7d5x7JZ37kAevvtKcyLdmqKSBbtAyJWRl+sWdLuEgxfogHNrI
+5rFjgyUAT51NxXMvbw+oc7uL5p4Y+iMEL3khwA9HEFTort2wZJQX2PCBbZl+X07N
+gsJ01wmzK1bwRdDeDJrwsPitjmKH9kyyJlUvLuKtyjqDFbPsulArtUUQUmCc2QHg
+JIhMD4QtYIbcQiKvXSjqesdd6Vu2y1oV9IAJIAL/2VF3N0ujc8sgQLidWtKLSLwS
+tns3e5ks7sMaxfeZlAfwyyOwYuw1FEUwUEGYoaNOy1tdZkDowyBIpUZ4tjIKhLBH
+p97vSql955UU8jFssRba2jgAprXor6u+sxG3ivqMdJPAQpDh0so=
+=SMjW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 104123f3a84f..2fc0ef3b30e3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 22 Apr 2023 16:40:06 +0000
+Sat, 22 Apr 2023 22:39:33 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4cfae71cb312..38c6c1248ff0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Apr 22 04:40:05 PM UTC 2023
+Sat Apr 22 10:39:33 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f50134739d26..d7eb1ba92db4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 22 Apr 2023 16:45:01 +0000
+Sat, 22 Apr 2023 22:45:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7df4b53e360d..8180520dec3d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a9d7c72f0c4117958848c210508fde3e592ae62a 1682181332 2023-04-22T16:35:32+00:00
+c7133507ecee644186143197a4274d2f3118af06 1682200273 2023-04-22T21:51:13+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c1c06ca2f2ec..741fd8007c1f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1682181601 Sat 22 Apr 2023 04:40:01 PM UTC
+1682203202 Sat 22 Apr 2023 10:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 104123f3a84f..2fc0ef3b30e3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 22 Apr 2023 16:40:06 +0000
+Sat, 22 Apr 2023 22:39:33 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 69e6c08ee221..b871c768da2d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 83c0e840fc67..b001c4387784 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -39,10 +39,10 @@ DIST zabbix-6.4.1.tar.gz 43014634 BLAKE2B 498358bf2a5de028b1bb0c8a5ebbe45451ec9b
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-4.0.45.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465fd8ad31adf040b0f8e21c883cee98b1fd26518a7c72e24ad8d42bf2523b575e94af6d80bc7ad739c8372811e6 SHA512 988468624b1f2825a14b9626ad4d53684144078fb97a225b52f8db5aba240a01d13de581a61943b3cb58f7316676c04211d51e4e043a9b487735934d9163accc
 EBUILD zabbix-5.0.31.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
-EBUILD zabbix-5.0.32.ebuild 10143 BLAKE2B ea3456cef1b217cbe44c2aa58335f190d7d6e25393443aa95c865886824a78b79133adf0e399f18ac9526f6340aeb51078894ba58ad7da9f409fafaec05478d6 SHA512 c786fbd3aff043a871158e70449f9321ce5aacaaed485a17adb9d816d70378164e7f14c728b89bc6fd205f946c9d9b356421a436eb96c316028fe38168ad5218
+EBUILD zabbix-5.0.32.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.33.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
 EBUILD zabbix-6.0.13.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
-EBUILD zabbix-6.0.14.ebuild 10208 BLAKE2B 108c3aba4abebf47bba93e558a556b39e8153bcf62f9ecb98a3a16a0c94508b7250b50b3ef9915d9380425c9e6d2eff287a66e7ed67ef5fdc1550ae57ab91828 SHA512 3c20c6725c2d8d899b6021ec9bfaf27f72328c1b3814525ddb4c5ee96d62368bd68b4e629a3957b40021ead15076115ac84093d40a3f9a2d88c45355b5b48bc7
+EBUILD zabbix-6.0.14.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.0.15.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.0.16.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.4.0.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
diff --git a/net-analyzer/zabbix/zabbix-5.0.32.ebuild b/net-analyzer/zabbix/zabbix-5.0.32.ebuild
index b222b43af169..c5d4ab2db7d0 100644
--- a/net-analyzer/zabbix/zabbix-5.0.32.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.32.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.14.ebuild b/net-analyzer/zabbix/zabbix-6.0.14.ebuild
index da72c61d9417..21333f63c79d 100644
--- a/net-analyzer/zabbix/zabbix-6.0.14.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.14.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 6969ae49e87d..f10d9ed12b9d 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index cca5c34a3316..93701eccb11a 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -4,15 +4,11 @@ AUX ppp-2.4.9-fix-MPPE-sstpc.patch 1008 BLAKE2B 255ac4374ef4845220c8c0709a0582fb
 AUX ppp-2.4.9-fix-clang-nested-functions.patch 2439 BLAKE2B 834d675ebcb4a3af7350d4206c546b89c92f914931db81e07e7997196d86dee6703260e9c603819d6fb72aec518dc5dbcc240f2a074043837d8d17356a483da3 SHA512 0d8faec40b0d3ea1a96a66bb4d96d129c7c0af14e76c222fc997c2eebeba80918a1681929a844d0d17713f124b862364ca1bf7cd70d2d7be46fb37458b3fb62d
 AUX ppp-2.4.9-fix-openssl-sysroot-clang.patch 377 BLAKE2B 9919669d6707394600c2b04f49dab212e220549395f34c52f641e6a87c2133eeaad00992fca5c3a9d84f60d7c17f1078aab78b8579906c93ee5cad4264a2569b SHA512 d816cbf65f1845851f8bd673fbe374987afbe6e3c0eb425455d0cc7269e96f5315caf1e38c320121650b088621c099c36f6b1c8d80ada0dbff07ab4e8151d42b
 AUX ppp-2.4.9-pppol2tp-ipv6.patch 1008 BLAKE2B 7c4ad1ce6ba6277c1d0fa8afa7491bdc3f0afba450c3d2ade39a9d0b555dd35e578abc5df24f7b0b011634bc020292ad6b2510ffbc8f03b1e3eabbf37cdb6e20 SHA512 071ef66e5ab9e08037100f2d6cdbdc452ea30d4a2241ef2abc2a7acc23ce21a5f90e5753a4790af5ed8e21baf976010a340ac4d4368adb8a9f5b42d52b519702
-AUX ppp-2.5.0-add-dhcp-plugin.patch 1014 BLAKE2B 65d8dcbc6419699068c6c19bd34881e96cf070a5349b34a785e2e6da7042dff02b968719b8d52f6f39a8e2b276adfcbcf9fcba7f8c35f21732a176f3c326137f SHA512 ea209cfb0fe66961bb760c23578d408aadebaa3160be20924827aff7925cf9a2cace8a60dab0dd4e089e406edc5374c0a38b558d5a17ce8cbef303fa3f31d59a
-AUX ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch 5578 BLAKE2B b2c53a2ec99cec24ac46c36af0b42996553d930b73272332a4d84ac44bc1e9f449223b1ea55bd5a1faa49f162ff8eee9cc579aa28eca87eaaaec19ffa8d4c605 SHA512 02c6c65f474950bc073fa280100255f5eb11032dded9551f7bc40006e0cb61411f1fc7f0b27fd263ccde3ffec22e33ab9794f9cf073ad4c398ba0a65c6db41d0
-AUX ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch 882 BLAKE2B 2862a989660ab91439457c4fccb00dcb2b88fb63c42347f3018ca68327381eb3be921898dd0fa2f701ebe8de837862c55a6fac45a0aef7a45438831bf0854000 SHA512 408ff2f43510e1876ea1c91db242a8ca5e24892da0a64ba80316e19f4fd46f65f1244e0e921ebd6eea4ba2a2bc44155ac4a22d8419bc764d6d80c04388432973
-AUX ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch 3654 BLAKE2B a6875d6b5fa59f828426f4a100305a612f6cf004ca7d2543b5d4e702f76adf101293cfcdbc41d5126a02792ae4894aa297dab15686ddca58b835903a754da342 SHA512 7ee9f2e57a67741f5bf4e4f3be80b4da49f70dfcee2603d5ff09cea305b8da8225b42a10ee7e033cb9d895e8f10168b96eaf332a00aaeb35b8b79ebd8a596844
 DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 154398 BLAKE2B 0e74b96df6171b7382874ce08375d0122df2b564ce8c3e8081022c38ef433e22d15ad13a51d553c6e18ee6277d9c67302b50afa59126bf74a6e3dcd1b03a2b2b SHA512 aca33e489d3e78a7accced4d3c33c03d933cf4c0b6607e8a6bbefef202c853248fa85caa36b53b9cbaf8b21ae60bb00fb3f95577418112630dfa6d67ad700359
 EBUILD ppp-2.4.9-r9.ebuild 7866 BLAKE2B e2f6012eb93f27271c775b75fa52e0d1307adee4afdcb09bf8ae78e1ddefe451bd7782c4f5412ef264366c8db4e20bb3621c4c032c1261166c70473a94552880 SHA512 a3931bedeac10a6facc0fe354eee0e26e6c237f21f9e4d69196d657d388d1624e4bf8054c670568c0ba689d859bca87a21410da08f35baf33fc12d39cfe2263e
-EBUILD ppp-2.5.0.ebuild 4187 BLAKE2B dcc85c47894b980552ea472b4fc682f7c5575b6cf357e432977eb25643fa1b78796de408eb73ab848fb8393971efd3acf8270fab0d016d33d7c1f14696e2c968 SHA512 aef6d5557f625da8de089bdfd232ef1dfdf4055b413dd11cc8a01e362cb8f44e33b422d0f850287512ee5a5094dd23f6476bf2e5c3887a73856d7d99e5d46c51
+EBUILD ppp-2.5.0.ebuild 3561 BLAKE2B 10ac7275f3f07846f38f93e9f639bd9b03609e9175688a852447f298a991451395c2f2dace3534070cc38b8a82311b8bc1231e773972f787fca97d8ed4092b3e SHA512 1192ac4fa7d34e38af6a9a89ce7ae392b98b5fdbca9a8e6bb7b33aa2dee1c27821ac4b3a26937e3579ddfb039f9b0479218915a5580a27fba8bcd5670d18f79c
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch b/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
deleted file mode 100644
index d5ad7a76138c..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From de05f72948317b40c19b1c113e18713816010dd9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 16:26:56 -0400
-Subject: [PATCH] Add dhcp plugin
-
----
- configure.ac             | 1 +
- pppd/plugins/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1180f64..5db4197 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -329,6 +329,7 @@ AC_CONFIG_FILES([
-     pppd/Makefile
-     pppd/pppd.pc
-     pppd/plugins/Makefile
-+    pppd/plugins/dhcp/Makefile
-     pppd/plugins/pppoe/Makefile
-     pppd/plugins/pppoatm/Makefile
-     pppd/plugins/pppol2tp/Makefile
-diff --git a/pppd/plugins/Makefile.am b/pppd/plugins/Makefile.am
-index 2826148..9708ab1 100644
---- a/pppd/plugins/Makefile.am
-+++ b/pppd/plugins/Makefile.am
-@@ -21,5 +21,5 @@ winbind_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- winbind_la_SOURCES = winbind.c
- 
- if !SUNOS
--SUBDIRS = pppoe pppoatm pppol2tp radius
-+SUBDIRS = dhcp pppoe pppoatm pppol2tp radius
- endif
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
deleted file mode 100644
index 193e90b78a9a..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From e21d256cded13a625bc28d3fe812141a202be696 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 14:59:35 -0400
-Subject: [PATCH 1/3] Convert sys_errlist to strerror
-
----
- dhcpc.c  |  8 ++++----
- packet.c |  6 +++---
- socket.c | 14 +++++++-------
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/dhcpc.c b/dhcpc.c
-index fcff8b9..ff83b53 100644
---- a/dhcpc.c
-+++ b/dhcpc.c
-@@ -144,7 +144,7 @@ void change_mode(int new_mode)
-     fd = raw_socket(client_config.ifindex);
-   
-   if (listen_mode != LISTEN_NONE && fd < 0) {
--    fatal("DHCPC: couldn't listen on socket, %s", sys_errlist[errno]);
-+    fatal("DHCPC: couldn't listen on socket, %s", strerror(errno));
-   }
-   
- }
-@@ -208,7 +208,7 @@ void dhcp_rx(void *dummy) {
-     len = get_packet(&packet, fd);
-     
-     if (len == -1 && errno != EINTR) {
--      dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]);
-+      dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
-       change_mode(LISTEN_KERNEL);
-     }
-     if (len < 0) continue;
-@@ -380,7 +380,7 @@ void dhcp_request_new() {
-       else len = get_raw_packet(&packet, fd);
-       
-       if (len == -1 && errno != EINTR) {
--	dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]);
-+	dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
- 	change_mode(listen_mode); /* just close and reopen */
-       }
-       if (len < 0) continue;
-@@ -445,7 +445,7 @@ void dhcp_request_new() {
-       
-     } else {
-       /* An error occured */
--        dbglog("DHCPC: error on select, %s, reopening socket", sys_errlist[errno]);
-+        dbglog("DHCPC: error on select, %s, reopening socket", strerror(errno));
-         change_mode(listen_mode); /* just close and reopen */
-     }
-     
-diff --git a/packet.c b/packet.c
-index 00b5202..07a1aac 100644
---- a/packet.c
-+++ b/packet.c
-@@ -125,7 +125,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
- 	    return kernel_packet(payload,payload->giaddr,CLIENT_PORT,dest_ip,dest_port);
- 	
- 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
--		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- 		return -1;
- 	}
- 	
-@@ -138,7 +138,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
- 	dest.sll_halen = 6;
- 	memcpy(dest.sll_addr, dest_arp, 6);
- 	if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
--		DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
- 		close(fd);
- 		return -1;
- 	}
-@@ -161,7 +161,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
- 
- 	result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
- 	if (result <= 0) {
--		DEBUG(LOG_ERR, "write on socket failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "write on socket failed: %s", strerror(errno));
- 	}
- 	close(fd);
- 	return result;
-diff --git a/socket.c b/socket.c
-index 0234350..a6799d5 100644
---- a/socket.c
-+++ b/socket.c
-@@ -60,7 +60,7 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
- 				*addr = sin->sin_addr.s_addr;
- 				DEBUG(LOG_INFO, "%s (our ip) = %s", ifr.ifr_name, inet_ntoa(sin->sin_addr));
- 			} else {
--				LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", sys_errlist[errno]);
-+				LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", strerror(errno));
- 				return -1;
- 			}
- 		}
-@@ -69,7 +69,7 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
- 			DEBUG(LOG_INFO, "adapter index %d", ifr.ifr_ifindex);
- 			*ifindex = ifr.ifr_ifindex;
- 		} else {
--			LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", sys_errlist[errno]);
-+			LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", strerror(errno));
- 			return -1;
- 		}
- 		if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) {
-@@ -77,11 +77,11 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
- 			DEBUG(LOG_INFO, "adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
- 				arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
- 		} else {
--			LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", sys_errlist[errno]);
-+			LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", strerror(errno));
- 			return -1;
- 		}
- 	} else {
--		LOG(LOG_ERR, "socket failed!: %s", sys_errlist[errno]);
-+		LOG(LOG_ERR, "socket failed!: %s", strerror(errno));
- 		return -1;
- 	}
- 	close(fd);
-@@ -98,7 +98,7 @@ int listen_socket(unsigned int ip, int port, char *inf)
- 
- 	DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s\n", ip, port, inf ? inf : "*");
- 	if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
--		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- 		return -1;
- 	}
- 
-@@ -144,7 +144,7 @@ int raw_socket(int ifindex)
- 
- 	DEBUG(LOG_INFO, "Opening raw socket on ifindex %d\n", ifindex);
- 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
--		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- 		return -1;
- 	}
- 	
-@@ -152,7 +152,7 @@ int raw_socket(int ifindex)
- 	sock.sll_protocol = htons(ETH_P_IP);
- 	sock.sll_ifindex = ifindex;
- 	if (bind(fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
--		DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]);
-+		DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
- 		close(fd);
- 		return -1;
- 	}
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch
deleted file mode 100644
index 5009c4eb3469..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9fa2696fa7348e647289e08ce299bb27ab97356d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 15:20:30 -0400
-Subject: [PATCH 2/3] Add Makefile.am
-
----
- Makefile    | 1 -
- Makefile.am | 6 ++++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
- delete mode 120000 Makefile
- create mode 100644 Makefile.am
-
-diff --git a/Makefile b/Makefile
-deleted file mode 120000
-index 8bad27d..0000000
---- a/Makefile
-+++ /dev/null
-@@ -1 +0,0 @@
--Makefile.linux
-\ No newline at end of file
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..195435a
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,6 @@
-+pppd_plugin_LTLIBRARIES = dhcpc.la
-+pppd_plugindir = $(PPPD_PLUGIN_DIR)
-+
-+dhcpc_la_CPPFLAGS = -I${top_srcdir}
-+dhcpc_la_LDFLAGS = -module -avoid-version
-+dhcpc_la_SOURCES = dhcpc.c clientpacket.c options.c packet.c socket.c
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch
deleted file mode 100644
index 9d3585dbb6ac..000000000000
--- a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0003-Fix-build-with-ppp-2.5.0.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From f3707ff09fb17e6d6b851f6cda66e2bdfa4b9108 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 13 Apr 2023 16:09:45 -0400
-Subject: [PATCH 3/3] Fix build with ppp-2.5.0
-
----
- debug.h |  1 +
- dhcpc.c | 26 +++++++++++++++-----------
- 2 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/debug.h b/debug.h
-index e01bd0b..674dffb 100644
---- a/debug.h
-+++ b/debug.h
-@@ -2,6 +2,7 @@
- #define _DEBUG_H
- 
- #include <stdio.h>
-+#include <pppd/pppd.h>
- 
- #define DEBUG
- #ifdef DEBUG
-diff --git a/dhcpc.c b/dhcpc.c
-index ff83b53..d383793 100644
---- a/dhcpc.c
-+++ b/dhcpc.c
-@@ -33,7 +33,6 @@
- #include <sys/types.h>
- #include <sys/file.h>
- #include <unistd.h>
--#include <getopt.h>
- #include <stdlib.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -44,9 +43,12 @@
- #include <net/if.h>
- #include <errno.h>
- 
--#include "pppd.h"
-+#include <pppd/pppd.h>
-+#include <pppd/options.h>
-+#include <pppd/fsm.h>
-+#include <pppd/ipcp.h>
- 
--char pppd_version[] = VERSION;
-+char pppd_version[] = PPPD_VERSION;
- 
- #include "dhcpd.h"
- #include "dhcpc.h"
-@@ -237,8 +239,8 @@ void dhcp_rx(void *dummy) {
- 	if (requested_ip != assigned_ip) {
- 	  fatal("DHCPC: Terminating because address has changed!");
- 	}
--       	untimeout(&dhcp_renew,NULL);
--	timeout(&dhcp_renew, NULL, lease / 2,0);
-+	ppp_untimeout(&dhcp_renew,NULL);
-+	ppp_timeout(&dhcp_renew, NULL, lease / 2,0);
- 	return;
-       } else if (*message == DHCPNAK) {
- 	/* return to init state */
-@@ -248,7 +250,7 @@ void dhcp_rx(void *dummy) {
-       }
-     }
-   }
--  timeout(&dhcp_rx,NULL,DHCP_RX_POLL_INTERVAL,0);
-+  ppp_timeout(&dhcp_rx,NULL,DHCP_RX_POLL_INTERVAL,0);
-   
- }
- 
-@@ -272,7 +274,7 @@ void dhcp_renew(void *dummy) {
-   if (dhcp_state == BOUND) {
-     dhcp_state = RENEWING;
-     change_mode(LISTEN_KERNEL);
--    timeout(&dhcp_rx,NULL,3,0);
-+    ppp_timeout(&dhcp_rx,NULL,3,0);
-     dbglog("DHCPC: Entering renew state");
-     /* 1/2 of lease used on entry, timeout renew after another 3/8 of lease */
-     dhcp_renew_timeout = (lease * 0x3) >> 3;
-@@ -299,7 +301,7 @@ void dhcp_renew(void *dummy) {
-   send_renew(xid, dhcp_state==REBINDING ? client_config.siaddr : server_addr, requested_ip); 
-   
-   dhcp_renew_timeout-=dhcp_packet_interval;
--  timeout(&dhcp_renew, NULL, dhcp_packet_interval,0);
-+  ppp_timeout(&dhcp_renew, NULL, dhcp_packet_interval,0);
- }
- 
- void dhcp_request_new() {
-@@ -312,6 +314,7 @@ void dhcp_request_new() {
-   int c, len;
-   struct dhcpMessage packet;
-   time_t now;
-+  const char *peer_authname = ppp_peer_authname(NULL, 0);
-   
-   if (dhcp_state == BOUND || dhcp_state == RENEWING || dhcp_state == REBINDING)
-     return;
-@@ -426,7 +429,7 @@ void dhcp_request_new() {
- 	  dhcp_process_ack(&packet);
- 	  assigned_ip = requested_ip;
- 	  dbglog("DHCPC: Setting renewal timer for %d seconds", lease /2);
--  	  timeout(&dhcp_renew, NULL, lease / 2,0);
-+	  ppp_timeout(&dhcp_renew, NULL, lease / 2,0);
- 	  return;
- 	} else if (*message == DHCPNAK) {
- 	  /* return to init state */
-@@ -455,6 +458,7 @@ void dhcp_request_new() {
- 
- void dhcp_ip_choose(u_int32_t *addrp) {
-   u_int32_t entryvalue;
-+  const char *peer_authname = ppp_peer_authname(NULL, 0);
- 
-   dbglog("DHCPC: ip_choose_hook entered with peer name %s",peer_authname);
- 
-@@ -489,8 +493,8 @@ void plugin_init(void)
-   /* we save pointer to ip_choose_hook so we can defer to other modules
-      that may specify an IP, e.g. radius */
-   ip_choose_hook= dhcp_ip_choose;
--  add_options(dhcpc_options);
--  add_notifier(&exitnotify, dhcp_release, NULL);
-+  ppp_add_options(dhcpc_options);
-+  ppp_add_notify(NF_EXIT, dhcp_release, NULL);
-   info("DHCPC: plugin initialized");
- 
- }
--- 
-2.40.0
-
diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 1994d63f1948..8df0af957ebd 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -2,22 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
 
-inherit autotools linux-info pam
+inherit linux-info pam
 
 PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/"
 SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
-	https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8
-	dhcp? ( http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz )"
-#https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
+	https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8"
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="activefilter atm dhcp gtk pam systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="
 	dev-libs/openssl:0=
@@ -30,22 +27,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<net-misc/netifrc-0.7.1-r2"
-BDEPEND="virtual/pkgconfig
-	dhcp? ( ${AUTOTOOLS_DEPEND} )"
+BDEPEND="virtual/pkgconfig"
 PDEPEND="net-dialup/ppp-scripts"
 
-src_prepare() {
-	if use dhcp; then
-		eapply "${FILESDIR}/ppp-2.5.0-add-dhcp-plugin.patch"
-		cd "${WORKDIR}/dhcp" || die
-		eapply "${FILESDIR}/ppp-2.5.0-dhcp"
-		cd "${S}" || die
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins/dhcp" || die
-	fi
-	default
-	if use dhcp; then
-		eautoreconf
-	fi
+pkg_setup() {
+	# Avoid linux-info_pkg_setup
+	:
 }
 
 src_configure() {
@@ -78,8 +65,10 @@ src_install() {
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}/modules.ppp" ppp.conf
 
-	dobin scripts/p{on,off,log}
+	dosbin scripts/p{on,off,log}
 	doman scripts/pon.1
+	dosym pon.1 /usr/share/man/man1/poff.1
+	dosym pon.1 /usr/share/man/man1/plog.1
 
 	# Adding misc. specialized scripts to doc dir
 	dodoc -r scripts
@@ -97,31 +86,29 @@ src_install() {
 }
 
 pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists ; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
+	local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+	local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+	local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline"
+	ERROR_PPP_ASYNC+=" (optional, but highly recommended)"
+	local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline"
+	WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)"
+	if use activefilter ; then
+		CONFIG_CHECK+=" ~PPP_FILTER"
+		local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
 	fi
+	CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+	local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+	local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+	local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+	CONFIG_CHECK+=" ~PPPOE ~PACKET"
+	local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
+	local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
+	if use atm ; then
+		CONFIG_CHECK+=" ~PPPOATM"
+		local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+	fi
+
+	linux-info_pkg_setup
 
 	echo
 	elog "pon, poff and plog scripts have been supplied for experienced users."
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f98da9ecef4f..f82745ab5b27 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index b48acd13da7f..293957f3fadf 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-44.0.tar.xz 199392 BLAKE2B a1a58a9d100dc1cf40fe03eaf611ac4c895bfb4e135a05ce25d8e00cafb5b7eecddcd7ca98bec65f39ef65fe430e1827214a5775820383f6502f10c437f761b0 SHA512 6ca62126790be4498806aeb61c02edf68f113aa1ec53ab73f8bd822b10f5957b32a67d5a23f7ba023db117a8b2fe8fb3be87ea72bca1c22dedde00e94677549e
+DIST gnome-remote-desktop-44.1.tar.xz 199428 BLAKE2B 6a44a616f3581b3bff1123a432cf55591a3a00c3d0f06f6f3510ef3dc69e752a4cce54c4967ef6692f49d730a1545a7b73ca2c3b1c699e64342601fc51c8ee9f SHA512 bb1d8a9ee7868309beb84d01c35e17c92bd26ac855df00caaa780796fe403842ee00462c4c222bf16cd3b98752106d34bfca55c98d634e712a5b561c7ace5285
 EBUILD gnome-remote-desktop-44.0.ebuild 1369 BLAKE2B 2391f781f951f78c5a3805e4620b7b80865f435a9437be1414a2e2a5992c104d5a8f2ceb350eecac37acdfb38e216b790f544956485d3f020840c8ef7b674dd3 SHA512 cee9e454bd1dc820229f870043b6d0400986ec5a0205a2824afd56d86b3691458ab7b97ddcd2ae1f7628017b76bc6caff0433cf6959028a0daa7ff5dc5083f09
+EBUILD gnome-remote-desktop-44.1.ebuild 1369 BLAKE2B 2391f781f951f78c5a3805e4620b7b80865f435a9437be1414a2e2a5992c104d5a8f2ceb350eecac37acdfb38e216b790f544956485d3f020840c8ef7b674dd3 SHA512 cee9e454bd1dc820229f870043b6d0400986ec5a0205a2824afd56d86b3691458ab7b97ddcd2ae1f7628017b76bc6caff0433cf6959028a0daa7ff5dc5083f09
 MISC metadata.xml 488 BLAKE2B 14e2e29779ea62269e8c473a877b3da316a60b6b970ac784e6cd853610ac81a981ed9dd4104a99d5e7c48f4146f74efdbab9f71d81c405baf24f3cb3e9a1702c SHA512 7d9b8b371cc0f609e77baa3a3eff701a5a68922e5405995d5c3f70bc92af0308ca409bc05e28480ab8f008b879e417cd679bb0ec5494f17d3abb8a7b52248a06
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.1.ebuild
new file mode 100644
index 000000000000..595e4cdbee2a
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-44.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="aac doc +rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	x11-libs/libdrm
+	>=media-libs/libepoxy-1.4
+	>=dev-libs/glib-2.68:2
+	x11-libs/libnotify
+	app-crypt/libsecret
+	>=media-video/pipewire-0.3.49:=
+	app-crypt/tpm2-tss:=
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.10.0:=[server]
+		>=sys-fs/fuse-3.9.1:3
+		>=x11-libs/libxkbcommon-1.0.0
+
+		aac? (
+			media-libs/fdk-aac:=
+		)
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+	)
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc man)
+		$(meson_use aac fdk_aac)
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index e811ba7374a0..e95143b6778b 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,8 +1,9 @@
 AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
+AUX rdesktop-1.9.0-configure-clang16.patch 897 BLAKE2B fa1fc01810a466ed855c1c7b3acf0cd7a15b5991494efcb01c85d58fcc04bff0d623e0f3ad1b9480fb3e9272b9cd5c260ef52d104c14e7932637f31cede16d6f SHA512 398373fbc2f60fe47ed2a6cb1c629b228765c82e7d4deb7fc23d3a11f3a17e752f3fa19565afcd7fb80a24c227bb8112413c006685ff4c517bfa7ebae7ac1205
 AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f9bf867d1890a16a027015390c8402f9da98513ec5fa5fdc2fee754d4e6c436cfd20d61cf830e3f9a8d7111bac37cbeed06 SHA512 85308d3230fa71a2381f35c20c02e3316a8b1b98bbe3f507d9f14fc8f7e703ffd7a6a45907e0799d3f7a243da52571e3c07b7adb1f68a4123133d8ea3eb31451
 AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
-EBUILD rdesktop-1.9.0-r2.ebuild 1795 BLAKE2B 0b27ac660fb99ea8417d3daf3ab4788c82b4b6bd7a1767b137130ba39449f7f2eefd57fd30450c64f4458467fa0eb04c2ddec5b7ceac2a6cce153cd2e384d6ff SHA512 6c258cdcd7d14da85449aa1c40dd29acab05359456cd6e861164b9f3d40f1dc60a4de2c8d6ebf12add9f5c42ee787b47e15a1bd741692bae5ddaf24ca0abd812
+EBUILD rdesktop-1.9.0-r3.ebuild 1839 BLAKE2B 6f597fac08df830aca219e47065c54bbbc8b795d0b8a0ce1bbb0c70b09c87cbdc74566d799dacbb227282e7a93388ecffe6d38735c9a32763eaa96928dc5377c SHA512 892b4d7c95f26bd37cc220e8754f596784803afb252dca781153e0d73bc606050fe35b19045586c0d1ae0b09a60ee20037a232a62f6121ae7902522bd38eb78e
 EBUILD rdesktop-1.9.0.ebuild 1694 BLAKE2B 643d0eb4f1aa7d86ebed2fea56d07c7d17f6610c4b6adaa2b3c502c0bc1821e2bb95b4b07f27f09e2b4592beadd29f6ffcf9d788a5a64b4deaec0888748dbe29 SHA512 7922b7ffc4cf08ba3c96faa43dfba382e573abfec39ab61d0bccbd63fed6b130fd536eec0bbe18996c519cf6a13935c8ced073632d62275c1829444aa4b2a84c
 MISC metadata.xml 941 BLAKE2B 966b0157d9829250ad1c8e31ddba5033d48ce9fa7991b380ac62f085d28ab1d5a8359b0f085fdb2cc6eb4f449fb1eaabfc2007852b33935104287d3ede542642 SHA512 6fcf246ef6bd5379935099046d6a760f339714ce05ed78aaf92d4c0467fcca29e4580d19e2fb168916251d936f94d34cfd3a86734f2b45028f0dc4f441d3bf4e
diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch
new file mode 100644
index 000000000000..7222fdbb1e46
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/900310
+https://github.com/rdesktop/rdesktop/pull/407
+
+From 0a38f855c2f6bb197539fbb9ec0ce5a97775a178 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 18 Apr 2023 09:55:39 +0200
+Subject: [PATCH] configure.ac: Fix statvfs64 check for C99 compatibility
+
+C99 does not support implicit ints and implicit function declarations
+(such as exit here).  Avoid them, so that the configure check does
+not fail unconditionally with such compilers.
+--- a/configure.ac
++++ b/configure.ac
+@@ -668,12 +668,13 @@ if test $space = no; then
+   # SVR4
+   AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64,
+   [AC_TRY_RUN([
++#include <stdlib.h>
+ #if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #endif
+ #include <sys/types.h>
+ #include <sys/statvfs.h>
+-  main ()
++  int main (void)
+   {
+     struct statvfs64 fsd;
+     exit (statvfs64 (".", &fsd));
diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild
index 4d21768aeb01..c62a294dd291 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
 	"${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch
 	"${FILESDIR}"/${P}-gssapi-check.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 22e7e228d500..ed0a7f2d5e17 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index fcbfbda4cff3..3a906adb8962 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -113,6 +113,7 @@ app-eselect/eselect-opencascade
 app-doc/kicad-doc
 media-gfx/freecad
 media-gfx/prusaslicer
+media-gfx/superslicer
 sci-electronics/kicad
 sci-electronics/kicad-footprints
 sci-electronics/kicad-meta
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4a1b0fc3fb3a..4d9634c94255 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1832,6 +1832,10 @@ dev-lang/yap:R - Enable support for connecting R to Prolog
 dev-lang/yap:raptor - Enable support for Raptor RDF syntax libarary
 dev-libs/aml:examples - Build and install examples
 dev-libs/antlr-c:debugger - Compiles debug info into the library
+dev-libs/apache-arrow:dataset - Build the Arrow Dataset Modules
+dev-libs/apache-arrow:json - Enables read/write json format
+dev-libs/apache-arrow:parquet - Enables read/write parquet data format
+dev-libs/apache-arrow:re2 - Build with support for regular expressions using the re2 library
 dev-libs/appstream:apt - Enables Debians APT support
 dev-libs/appstream-glib:fonts - Enable fonts support for appstream-builder.
 dev-libs/appstream-glib:stemmer - Add word stemming via dev-libs/snowball-stemmer.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 08ff111c1bd1..94ff54345913 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 911ad834677b..44bbdf6108ec 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,4 @@
 AUX 252-no-stack-protector-bpf.patch 809 BLAKE2B 85a66835b0287c237f82a9e95b14fa5707f127e77af07bddcb036773d10f260372f326f10cc17602a453017da3573b966859c13cb611df4cacf3d0c00a03cdd6 SHA512 ea326d5abde0a089bbc79cb1d3aa9cb491fc18160cfdd9e6b9aebafb26ec0db26652ae1086b891f65c8938a6fa5765b03d56632e47474b7d9b58796fe27f6f7c
-AUX 252-tmpfiles-ub.patch 2892 BLAKE2B 0c65c90c0a631a48b7f3b8194350fb90e6915e0e7f32b0de87cfb83ca170f68576017efbe8a531fdeb01485ac6840a4c75628d1a384e750fc5094dff68dddcab SHA512 5c4fac1933a0b8443b80cff7069f21904773d486f30be24337f2b68234c708568ccd0f1ab216968ce71f760e4e27f85912971cdb9dd3ee724d7e6a2d8bc917d7
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3172dbe1ba14d8cade6fc08b0158e66847900d8531898ee9ec3855ac3857cf07a3e10804a3cb67719f0e9378437eba836 SHA512 affbe58aa65ebca7c1c6d790f9f68ffc44bda70a08165f5298ee4a84ab1c16cf534950ac50ffdb61b647e5eb068f51c333a76e39d8336e21e5d1b0199192139c
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
diff --git a/sys-apps/systemd/files/252-tmpfiles-ub.patch b/sys-apps/systemd/files/252-tmpfiles-ub.patch
deleted file mode 100644
index df190d500e34..000000000000
--- a/sys-apps/systemd/files/252-tmpfiles-ub.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/systemd/systemd/pull/25957
-https://github.com/systemd/systemd/pull/25959
-https://github.com/systemd/systemd/commit/9f804ab04d566ff745849e1c4ced680a0447cf76
-https://github.com/systemd/systemd/commit/34680637e838415204850f77c93ca6ca219abaf1
-
-From 9f804ab04d566ff745849e1c4ced680a0447cf76 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 6 Jan 2023 10:58:32 +0000
-Subject: [PATCH] tmpfiles: avoid null free() for acl attributes
-
-When built with ACL support, we might be processing a tmpfiles
-entry where there's no cause for us to call parse_acls_from_arg,
-then we get to the end of parse_line without having ever populated
-i.{acl_access, acl_default}.
-
-Then we pass a null pointer into acl_free().
-
-From UBSAN w/ GCC 13.0.0_pre20230101:
-```
-$ systemd-tmpfiles --clean
-/var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44:14: runtime error: applying non-zero offset 18446744073709551608 to null pointer
-    #0 0x7f65d868b482 in acl_free /var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44
-    #1 0x55fe7e592249 in item_free_contents ../systemd-9999/src/tmpfiles/tmpfiles.c:2855
-    #2 0x55fe7e5a347a in parse_line ../systemd-9999/src/tmpfiles/tmpfiles.c:3158
-    #3 0x55fe7e5a347a in read_config_file ../systemd-9999/src/tmpfiles/tmpfiles.c:3897
-    #4 0x55fe7e590c61 in read_config_files ../systemd-9999/src/tmpfiles/tmpfiles.c:3985
-    #5 0x55fe7e590c61 in run ../systemd-9999/src/tmpfiles/tmpfiles.c:4157
-    #6 0x55fe7e590c61 in main ../systemd-9999/src/tmpfiles/tmpfiles.c:4218
-    #7 0x7f65d7ebe289  (/usr/lib64/libc.so.6+0x23289)
-    #8 0x7f65d7ebe344 in __libc_start_main (/usr/lib64/libc.so.6+0x23344)
-    #9 0x55fe7e591900 in _start (/usr/bin/systemd-tmpfiles+0x11900)
-```
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -2852,8 +2852,11 @@ static void item_free_contents(Item *i) {
-         strv_free(i->xattrs);
- 
- #if HAVE_ACL
--        acl_free(i->acl_access);
--        acl_free(i->acl_default);
-+        if (i->acl_access)
-+                acl_free(i->acl_access);
-+
-+        if (i->acl_default)
-+                acl_free(i->acl_default);
- #endif
- }
- 
-
-From 34680637e838415204850f77c93ca6ca219abaf1 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 6 Jan 2023 12:30:36 +0100
-Subject: [PATCH] nspawn: guard acl_free() with a NULL check
-
-Inspired by #25957 there's one other place where we don't guard
-acl_free() calls with a NULL check.
-
-Fix that.
---- a/src/nspawn/nspawn-patch-uid.c
-+++ b/src/nspawn/nspawn-patch-uid.c
-@@ -181,7 +181,9 @@ static int patch_acls(int fd, const char *name, const struct stat *st, uid_t shi
- 
-         if (S_ISDIR(st->st_mode)) {
-                 acl_free(acl);
--                acl_free(shifted);
-+
-+                if (shifted)
-+                        acl_free(shifted);
- 
-                 acl = shifted = NULL;
- 
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 98707898d621..237e975fa196 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-1.15.0.tar.xz 521732 BLAKE2B a49ab7a1462771c628a24f9759e239dd3f8233b26c2a5f6e9fc848e00eb36c74a21cd1fd4d43af0c0f46782c46d6a822af86fd7b49fa1f77a1cbd96452a00348 SHA512 98b36841c54bdd5221c0719e9646abb7f117351ff780682591c269d2a57f7b1946deaef38c2caa6474e1048e283a68c55a791e8d2a0be000ca9e563ed98c28ef
 DIST xdg-desktop-portal-1.16.0.tar.xz 250524 BLAKE2B 9d5bd760621b114a19c1cc8895f91c43fcfed0dd067ba9678de0f11dc7835ec29c4a2c452274adbd36ee1318359caa8d7ca0c585558eb73a2a4e53528e6b02da SHA512 f7e7e96d3a6757901fbc4c0310aac0afbf37882c279a2859e06f63528049cd9b50dd2d55445d1386f03f62557c1a2ec81d4ee081200367d6269d2dffc75f0912
-EBUILD xdg-desktop-portal-1.15.0.ebuild 1705 BLAKE2B 787d37227f646a0990a9629cb603fd4c058f57ec204ee4f8d6c3b9f6fd337e3b31ff9dd762380e3f078f724b02e9be0cb4d0c64ac6a31a4656f1f857e7b402f7 SHA512 2a44b986668963f58a23dece2613787acf2ee6f880dbc7168bf8fcfbacfc83e6c250c37c3b30b7cc5f6fde0a2ca8caee93300ebf31773c0738704c74fa462b6b
 EBUILD xdg-desktop-portal-1.16.0.ebuild 1756 BLAKE2B e3a4ddda76a9400e68f4dbc6595266c05787f74afd07c9cc0b1ad9959a8b5f4be98ea8f9b85be21a6b0fbfb3186749adc462c48fd609a0652182f28331f2c097 SHA512 a97deb39f0f1d86fdeacabbece6131c5561f0a022c65ee2980122c748ee5cc59d9d9d9bc218a6c2deffc0b882435122995c89dc8293be8417cf9a36617fad010
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild
deleted file mode 100644
index b67a7798000d..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="geolocation screencast systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	dev-libs/json-glib
-	>=sys-fs/fuse-3.10.0:3[suid]
-	x11-libs/gdk-pixbuf
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-docbook-docs # requires flatpak
-		--disable-libportal # not packaged
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		$(use_with systemd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
-		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
-		! has_version sys-apps/xdg-desktop-portal-gtk; then
-		elog "${PN} is not usable without any of the following XDP"
-		elog "implementations installed:"
-		elog "  gui-libs/xdg-desktop-portal-lxqt"
-		elog "  gui-libs/xdg-desktop-portal-wlr"
-		elog "  kde-plasma/xdg-desktop-portal-kde"
-		elog "  sys-apps/xdg-desktop-portal-gnome"
-		elog "  sys-apps/xdg-desktop-portal-gtk"
-	fi
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index a964044eaf36..c6a5192c9a0d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index 3f00e676c42a..f7f461d44f97 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -4,5 +4,5 @@ AUX oath-toolkit-2.6.7-new-xmlsec-tests.patch 2925 BLAKE2B c3e2e52ef75f99276b449
 DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb
 DIST oath-toolkit-2.6.7.tar.gz 5625279 BLAKE2B 23f377c51eb633bf01d6085d33c7362cd91b6bed1cf4c2bbf32dc9433849e20c53f6896b16e5056b13f420f6a65a3c593fa1dafd7e184ed9e52666d94a7f75d1 SHA512 50edff75c8366887d69cf4740c4cc3bdfc3e43cbd4910ff40f735bca489f0953d7e5a21130f12782ac7a1f2fb00f0db313aff139085f23daba78a69bc7b2eb12
 EBUILD oath-toolkit-2.6.2-r3.ebuild 1960 BLAKE2B 5ba1172ea4e690f409153407c60c7c2cf48e263a4491b1d71a47999ee08a94b787235a7aed597013a1f632bf8fbb1e5320533795e0e0731f0b752e71e19eaac8 SHA512 5792179865476769eebd4d7910556a9a9015172b56ac68a3837aef0efe8cf59aadea2d8f5704e49ed249a5b64e501ecbc10bebb3a3ff9f1c8c25119e91c93af7
-EBUILD oath-toolkit-2.6.7-r2.ebuild 1437 BLAKE2B 29f5d541a7c3c370e5f2de982774e65ef348783fb8a7677f88b852ccc99125762365c3dcec0575af0b53a9d3d0962b7af7ae107967e779ea80b47af39d023d8d SHA512 bcf8a06968e7a5f2563784e3ed330f046be655b2bc8966c7c2629dd96bd622d6efa1a3a57f069b65f150a9d0eda69fa4f829b5b5c4790ed5bc0b8ccf7686c353
+EBUILD oath-toolkit-2.6.7-r2.ebuild 1436 BLAKE2B 7a184335da45a19fbc249d5b662b192cd3cda6dd321a2ab403ca06cebcd1740a965880a75c3bc72b5a099acca9a2082e90fc8ebd6326b943d27ad787cead1e97 SHA512 d3ac697811b5c98623777930c2a40f91c8f7c53b0ebe31de9fb03cd4f136fe2ed980a29caf1d062552a206eb9c049016afae9d11da166c4ad5e12e5bc938ad74
 MISC metadata.xml 712 BLAKE2B ed16c10de342d5ec86e29f7047dc4a95180f20db76c9b1bc3667ec584b35f02892e8adec80d0d182467d673c2c0daeb10da5eab179bc1267f38802854fef7b7a SHA512 aaadb093d4c1f6f661340ae887e60e6ba9d3b349c76b90d05ba2f524efe294ff097bb314a2bd2caed642271b8d40b15ecb6f46fade693be6f19685795d69a1f2
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
index 020037b1bbd1..a3483e6d37fa 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="pam static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index be142b497050..39951562db49 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c5fbf267e4a2..cd6f689aef6d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -27,10 +27,8 @@ DIST glibc-2.35-loongarch-patches-20220522.tar.xz 44728 BLAKE2B 09e7a061f3269ebd
 DIST glibc-2.35-patches-12.tar.xz 266056 BLAKE2B 7979dcfee270107d51c10e5ec74c9c1ab0d0a9743d6718a6d915d241fee6482958c957ef9fd25cd704925e3aa0d98c23115274c7594d149dec08c5e0766a488d SHA512 37a4c086b6a459cb378608a49d90705dddb806376edb2456b8c98e3a469fc558bce7b1b4c8a856b8dffb209e7b6e1c48382ed6f050284c5f74a92ca4f7d4b88a
 DIST glibc-2.35.tar.xz 18165952 BLAKE2B 623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063 SHA512 e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66
 DIST glibc-2.36-patches-10.tar.xz 118268 BLAKE2B 3d1bdb6c1a9e10ba78a344ca8940f68c49411a94aefd4d66bab17d784bc8783f2ae71efb171dea6d1919ea2c4a1f54333dabc2c4d99838ba8ec568484b84d0ae SHA512 b88dfc56ffc2df495e13cf90e709629db2b9b411a1c5ba6d39f40f45be3c2f49df7b1fe320d1cd7552515fe68dfc644c12916a6db34139ccf94ff755235d3a40
-DIST glibc-2.36-patches-5.tar.xz 81348 BLAKE2B 003a59a992302c21132474bcdc994d10b5d50a94368e949ce28cbe389cefd104f66c48cb61a63d24e2f6db94d010e4220bda3fb5291d088cda88069b928c92e0 SHA512 6d6a16114df2223bf04729a79d12a52e41c9b8e756863c1acbb909dc34696958073604ced1b691579271218738511191ddf517e03a700d3948752c455201bcc4
 DIST glibc-2.36-patches-9.tar.xz 110440 BLAKE2B edc1aca9b7bc9ce64683e3bd905c9804b581af2d41191ae85e6f0e73d444672abe56bbb620373d31b20db8f84a2cb9ed4e1026e50ce5f287dac5c24752ee187a SHA512 1f1f85a439983b776229b924f9a8fd9aacf9efc869a212ff15b49e60627f37719b548d20b9ff1b80d88996bce115f44efdbecc6dce378a4247c6078ed7e6e1b4
 DIST glibc-2.36.tar.xz 18610836 BLAKE2B f8375e084043f032609e66fd98c234249df57a595c59672acb1bb8c69aed64d339d526611553449492b097cda900ad1d9bae8873d7f5932b10a9a0d8c9210c55 SHA512 9ea0bbda32f83a85b7da0c34f169607fb8a102f0a11a914e6bf531be47d1bef4f5307128286cffa1e2dc5879f0e6ccaef527dd353486883fa332a0b44bde8b3e
-DIST glibc-2.37-patches-3.tar.xz 22908 BLAKE2B 9b8bda29dc25a444dae9ace7e9c2c072f1f4b07a864720036d16be6d69e40b3c1d506838ce4168066eb490780a95222e8746efc42af4b4b2f2cf86483142294a SHA512 6e51300bfbd44d549dbf24de8a6d0137865e51ab5d9ebd85f638b17a8c7aa39b7842c3ace762649216060160b8937da9e384876c1202bc63b0291c2e564d2703
 DIST glibc-2.37-patches-4.tar.xz 24136 BLAKE2B 4dc69ed5d5671bc6a865775b86b4227015b7636f00a92b2c4ff07006fb2a288643eb6b5f6012dd34e62f6cf2f6bd63ac1931286b64fdac39e4988b21ca4b94ae SHA512 4bb5f4c3d37f7f028b8920bbda71c32492c1ebdfe4d151cb05e9ab14040d7b16833d4d9da06c5c84a9efde7510650c90a3c188d636e02ede46f8fe5e32b9b11f
 DIST glibc-2.37.tar.xz 18674604 BLAKE2B 8139cd977b2ed3bfdbde5ffb1cda8f759763dbb83071167272fef798cfbdc0d17cfd1ec893d126c52c91511b7961f3ad12eed34534b99412dfa04a1cdd5b4ea3 SHA512 4fc5932f206bb1b8b54828a28af1a681616b838bbab60c81c82155f3629cbfe1301d271af65511ed917f4c6949a025429221fe6035753282f15346919f15b90c
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
@@ -45,10 +43,8 @@ EBUILD glibc-2.32-r8.ebuild 44878 BLAKE2B 4bc91e1f09949092ed3b564431dd75578d7223
 EBUILD glibc-2.33-r14.ebuild 48640 BLAKE2B a8be6903094275c6b68af5eb997ecf9824edd30fb0cb835eccf5893338b58a81b2d7aa54d85946226032f52e14a461df881591b441140278c78a8406d3b91667 SHA512 8d638e36424eac941559a9eca195e384a8a50c292d6260c9bbc63005288d83429ec48ab1253ddf2a6495b5d8b39b4760914a18e051fa748f6cfaddf8404e14c3
 EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B b9e39255651ebda4cf2fff8ff9e6e0470955ed04559fc78a20bdcdcaf1a1ac7a188157798bb23feef4d52c393f36fe3e2dc85e4fd0d4d256c7d9a399431ad7e5 SHA512 351c113b723f492cb74ae1178e3769a7775bf5660ec1a69fc7d779ee48d060c48e690b101fa4880b55d9105e4488f6a9b46e5c4b23484bf02d2448db74414a86
 EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752adeb185eac0744383f514b0897ad8b7518c9ea8392b8f4217ec0873f2d4b9e56bd1424378c83c2dd98122b2caf7d SHA512 bf7d103bb91722cd61720290bf38c6cb73d8d199e6479e35ab017de83006826b014c49d6dc0188cd3f4aaf906578ee4ae9f851d37346a4d9a228bee683930bfa
-EBUILD glibc-2.36-r5.ebuild 51373 BLAKE2B e90a8b848d463cd1fb3e8e3101408ef1c4834f1179f3d008d67d0e5a0ce5862b82819113b4c0f00881b828ba4d59cb03025f002b908793aba49cde1297aa6b2e SHA512 813f7bab667a08d96efc84bf62b17ec465e2c6546a0756d90718320e2983f5e6ae2ee36858517ec6affa13aacac91a4fdce70e5df0c1244fde26bc72b3b17dcc
 EBUILD glibc-2.36-r7.ebuild 52453 BLAKE2B ef5c9a4cbcc7fde3003910973c6d2fdcbb8fdc52e1eb75771919617651f2edc34f615d5508894e7f0a4ee3605bb2b638e001adfbe86a2183100c42808cd5dce6 SHA512 3101657a81f9110ce0072c070bb9aab2fad50fe46f968d99307faad572b426b204cbb6734d367e26c2708556628fb7d0dfb3f4a407432e7907032dfb5ead6666
 EBUILD glibc-2.36-r8.ebuild 52462 BLAKE2B 96eb234269a40aa9b72c52e76274b9539e60a217969fffa8f3febbbe2e244b375349a8a5ff0b9d7939b757ee5b401a91dec1a66ad43af7d3afcfd58d1c9e8557 SHA512 aef4a0c782fcb79004d2a38d0b05c8c2e7cda13a333d2bd70791a09dddee61dc69af0fe3f1a785e2bdb237654f98a365e7f5c762d852a55b35a589d215c4eba7
-EBUILD glibc-2.37-r1.ebuild 52461 BLAKE2B 9f4fdba007e7537a8cfe03694da60f956e297d118cc3d3ebc3b620ef1abc08f18d803e90ad6170a062624ab46bf20a49c9addff8d0eae2536739bc17fe8d4620 SHA512 59b14cd19b20bde1ef5bb5e7113c533efb3b5ef84eda05a1749ab7f5c99bcb5d3fe1d493fbdeb8ebab5b3c92f09e568faea97937a266a0394517627dfccba406
 EBUILD glibc-2.37-r2.ebuild 52461 BLAKE2B 03101051b3b6c6fa22c15b86a8fd4eaf737f274e74792ceaa091f978fbba58ce5624061467de6331169b1c4412d02140896c05bc26e55ddd307bafb7d50199a6 SHA512 8abf464428ade62c5719087b8e026402f1732d4452c3f2f371612ecc561775eaa4b5382b7bd538a4121bf40849bfe892ee6031d55d129fe50ff66652cd470bd3
 EBUILD glibc-9999.ebuild 52432 BLAKE2B 0988666562a1d49f59d52a6368b426c154e532747f1bf1cba50529d3f2b5f71ff82c1b2af101e0dd87e158591f0a1a711b94959b794c56bcee92eaf03e8c16b6 SHA512 f97ee9b4c19ccbdae6ba17689ac11d5ef692359b6e82950c0ee83ddd9744d3fb05f1e1e20ca19a5394bc11e7162a363ddf62dbc3a33ef9148d01d561f7d13fe8
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.36-r5.ebuild b/sys-libs/glibc/glibc-2.36-r5.ebuild
deleted file mode 100644
index 5aa15579a204..000000000000
--- a/sys-libs/glibc/glibc-2.36-r5.ebuild
+++ /dev/null
@@ -1,1639 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
-# Please read & adapt the page as necessary if obsolete.
-
-PYTHON_COMPAT=( python3_{9..11} )
-TMPFILES_OPTIONAL=1
-
-inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
-	multilib systemd multiprocessing tmpfiles
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
-EMULTILIB_PKG="true"
-
-# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=5
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
-fi
-
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20201208
-
-LOCALE_GEN_VER=2.22
-
-GLIBC_SYSTEMD_VER=20210729
-
-SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
-SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
-
-IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
-
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-# Minimum pax-utils version needed (which contains any new syscall changes for
-# its seccomp filter!). Please double check this!
-MIN_PAX_UTILS_VER="1.3.3"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-#
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-# Note [Disable automatic stripping]
-# Disabling automatic stripping for a few reasons:
-# - portage's attempt to strip breaks non-native binaries at least on
-#   arm: bug #697428
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread
-#   enumeration: bug #697910. This is quite subtle:
-#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
-#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
-#     via 'ps_pglobal_lookup' symbol defined in gdb.
-#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
-#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
-#     (unexported) is used to sanity check compatibility before enabling
-#     debugging.
-#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
-#   * normal 'strip' command trims '.symtab'
-#   Thus our main goal here is to prevent 'libpthread.so.0' from
-#   losing it's '.symtab' entries.
-# As Gentoo's strip does not allow us to pass less aggressive stripping
-# options and does not check the machine target we strip selectively.
-
-# We need a new-enough binutils/gcc to match upstream baseline.
-# Also we need to make sure our binutils/gcc supports TLS,
-# and that gcc already contains the hardened patches.
-# Lastly, let's avoid some openssh nastiness, bug 708224, as
-# convenience to our users.
-
-# gzip, grep, awk are needed by locale-gen, bug 740750
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
-	sys-devel/bison
-	doc? ( sys-apps/texinfo )
-	!compile-locales? (
-		app-arch/gzip
-		sys-apps/grep
-		app-alternatives/awk
-	)
-"
-COMMON_DEPEND="
-	gd? ( media-libs/gd:2= )
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-	compile-locales? (
-		app-arch/gzip
-		sys-apps/grep
-		app-alternatives/awk
-	)
-	test? ( >=net-dns/libidn2-2.3.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/gzip
-	sys-apps/grep
-	app-alternatives/awk
-	sys-apps/gentoo-functions
-	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
-	!<net-misc/openssh-8.1_p1-r2
-"
-
-RESTRICT="!test? ( test )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	BDEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.27
-		>=${CATEGORY}/gcc-6.2
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	BDEPEND+="
-		>=sys-devel/binutils-2.27
-		>=sys-devel/gcc-6.2
-	"
-	DEPEND+=" virtual/os-headers "
-	RDEPEND+="
-		>=net-dns/libidn2-2.3.0
-		vanilla? ( !sys-libs/timezone-data )
-	"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-# Ignore tests whitelisted below
-GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
-
-# The following tests fail due to the Gentoo build system and are thus
-# executed but ignored:
-XFAIL_TEST_LIST=(
-	# buggy test, assumes /dev/ and /dev/null on a single filesystem
-	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
-	# https://sourceware.org/PR25909
-	tst-support_descriptors
-
-	# The following tests fail only inside portage
-	# https://bugs.gentoo.org/831267
-	tst-system
-	tst-strerror
-	tst-strsignal
-)
-
-#
-# Small helper functions
-#
-
-dump_build_environment() {
-	einfo ==== glibc build environment ========================================================
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP READELF; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-	einfo =====================================================================================
-}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	is_crosscompile && use headers-only
-}
-
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-
-# This prefix is applicable to CHOST when building against this
-# glibc. It is baked into the library at configure time.
-host_eprefix() {
-	is_crosscompile || echo "${EPREFIX}"
-}
-
-# This prefix is applicable to CBUILD when building against this
-# glibc. It determines the destination path at install time.
-build_eprefix() {
-	is_crosscompile && echo "${EPREFIX}"
-}
-
-# We need to be able to set alternative headers for compiling for non-native
-# platform. Will also become useful for testing kernel-headers without screwing
-# up the whole system.
-alt_headers() {
-	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
-	echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
-	echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
-	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-do_compile_test() {
-	local ret save_cflags=${CFLAGS}
-	CFLAGS+=" $1"
-	shift
-
-	pushd "${T}" >/dev/null
-
-	rm -f glibc-test*
-	printf '%b' "$*" > glibc-test.c
-
-	# We assume CC is already set up.
-	nonfatal emake glibc-test
-	ret=$?
-
-	popd >/dev/null
-
-	CFLAGS=${save_cflags}
-	return ${ret}
-}
-
-do_run_test() {
-	local ret
-
-	if [[ ${MERGE_TYPE} == "binary" ]] ; then
-		# ignore build failures when installing a binary package #324685
-		do_compile_test "" "$@" 2>/dev/null || return 0
-	else
-		if ! do_compile_test "" "$@" ; then
-			ewarn "Simple build failed ... assuming this is desired #324685"
-			return 0
-		fi
-	fi
-
-	pushd "${T}" >/dev/null
-
-	./glibc-test
-	ret=$?
-	rm -f glibc-test*
-
-	popd >/dev/null
-
-	return ${ret}
-}
-
-setup_target_flags() {
-	# This largely mucks with compiler flags.  None of which should matter
-	# when building up just the headers.
-	just_headers && return 0
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404 #199334
-			# TODO: When creating the first glibc cross-compile, this test will
-			# always fail as it does a full link which in turn requires glibc.
-			# Probably also applies when changing multilib profile settings (e.g.
-			# enabling x86 when the profile was amd64-only previously).
-			# We could change main to _start and pass -nostdlib here so that we
-			# only test the gcc code compilation.  Or we could do a compile and
-			# then look for the symbol via scanelf.
-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-				einfo "Auto adding -march=${t} to CFLAGS #185404"
-			fi
-			# For compatibility with older binaries at slight performance cost.
-			use stack-realign && export CFLAGS+=" -mstackrealign"
-		;;
-		amd64)
-			# -march needed for #185404 #199334
-			# TODO: See cross-compile issues listed above for x86.
-			if [[ ${ABI} == x86 ]]; then
-				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-					local t=${CTARGET_OPT:-${CTARGET}}
-					t=${t%%-*}
-					# Normally the target is x86_64-xxx, so turn that into the -march that
-					# gcc actually accepts. #528708
-					[[ ${t} == "x86_64" ]] && t="x86-64"
-					filter-flags '-march=*'
-					# ugly, ugly, ugly.  ugly.
-					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
-					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
-				fi
-				# For compatibility with older binaries at slight performance cost.
-				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
-
-				# Workaround for bug #823780.
-				# Need to save/restore CC because earlier on, we stuff it full of CFLAGS, and tc-getCPP doesn't like that.
-				CC_mangled=${CC}
-				CC=${glibc__GLIBC_CC}
-				if tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
-					export CFLAGS_x86="${CFLAGS_x86} -mno-avx512f"
-					einfo "Auto adding -mno-avx512f to CFLAGS_x86 for buggy GCC version (bug #823780) (ABI=${ABI})"
-				fi
-				CC=${CC_mangled}
-			fi
-		;;
-		mips)
-			# The mips abi cannot support the GNU style hashes. #233233
-			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
-		;;
-		ppc|ppc64)
-			# Many arch-specific implementations do not work on ppc with
-			# cache-block not equal to 128 bytes. This breaks memset:
-			#   https://sourceware.org/PR26522
-			#   https://bugs.gentoo.org/737996
-			# Use default -mcpu=. For ppc it means non-multiarch setup.
-			filter-flags '-mcpu=*'
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-
-			local cpu
-			case ${CTARGET} in
-			sparc64-*)
-				cpu="sparc64"
-				case $(get-flag mcpu) in
-				v9)
-					# We need to force at least v9a because the base build doesn't
-					# work with just v9.
-					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
-					append-flags "-Wa,-xarch=v9a"
-					;;
-				esac
-				;;
-			sparc-*)
-				case $(get-flag mcpu) in
-				v8|supersparc|hypersparc|leon|leon3)
-					cpu="sparcv8"
-					;;
-				*)
-					cpu="sparcv9"
-					;;
-				esac
-			;;
-			esac
-			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
-		;;
-	esac
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Allow users to explicitly avoid flag sanitization via
-	# USE=custom-cflags.
-	if ! use custom-cflags; then
-		# Over-zealous CFLAGS can often cause problems.  What may work for one
-		# person may not work for another.  To avoid a large influx of bugs
-		# relating to failed builds, we strip most CFLAGS out to ensure as few
-		# problems as possible.
-		strip-flags
-		# Lock glibc at -O2; we want to be conservative here.
-		filter-flags '-O?'
-		append-flags -O2
-	fi
-
-	strip-unsupported-flags
-	filter-flags -m32 -m64 '-mabi=*'
-
-	# glibc aborts if rpath is set by LDFLAGS
-	filter-ldflags '-Wl,-rpath=*'
-
-	# ld can't use -r & --relax at the same time, bug #788901
-	# https://sourceware.org/PR27837
-	filter-ldflags '-Wl,--relax'
-
-	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
-	# we have to do that here already so mips can filter it out again :P
-	if use hash-sysv-compat ; then
-		append-ldflags '-Wl,--hash-style=both'
-	fi
-
-	# #492892
-	filter-flags -frecord-gcc-switches
-
-	# #829583
-	filter-lfs-flags
-
-	unset CBUILD_OPT CTARGET_OPT
-	if use multilib ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	setup_target_flags
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# glibc's headers disallow -O0 and fail at build time:
-	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
-	replace-flags -O0 -O1
-
-	# glibc handles this internally already where it's appropriate;
-	# can't always have SSP when we're the ones setting it up, etc
-	filter-flags '-fstack-protector*'
-
-	# Similar issues as with SSP. Can't inject yourself that early.
-	filter-flags '-fsanitize=*'
-
-	# See end of bug #830454; we handle this via USE=cet
-	filter-flags '-fcf-protection='
-}
-
-use_multiarch() {
-	# Allow user to disable runtime arch detection in multilib.
-	use multiarch || return 1
-	# Make sure binutils is new enough to support indirect functions,
-	# #336792. This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc support was added in 2.23, but glibc also needs
-	# machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	ver_test ${bver} -ge ${nver}
-}
-
-# Setup toolchain variables that had historically been defined in the
-# profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-	unset LD_ASSUME_KERNEL
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		multilib_env ${CTARGET_OPT:-${CTARGET}}
-
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	if just_headers ; then
-		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
-		# At this bootstrap stage we have only binutils for
-		# target but not compiler yet.
-		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
-		return 0
-	fi
-
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	if use doc ; then
-		export MAKEINFO=makeinfo
-	else
-		export MAKEINFO=/dev/null
-	fi
-
-	# Reset CC and CXX to the value at start of emerge
-	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
-	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
-
-	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
-	export glibc__ORIG_CC=${CC}
-	export glibc__ORIG_CXX=${CXX}
-
-	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
-		export glibc__force_gcc=yes
-		# once this is toggled on, it needs to stay on, since with CPP manipulated
-		# tc-is-clang does not work correctly anymore...
-	fi
-
-	if [[ ${glibc__force_gcc} == "yes" ]] ; then
-		# If we are running in an otherwise clang/llvm environment, we need to
-		# recover the proper gcc and binutils settings here, at least until glibc
-		# is finally building with clang. So let's override everything that is
-		# set in the clang profiles.
-		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
-		# a good start into that direction.
-		# Also, if you're crosscompiling, let's assume you know what you are doing.
-		# Hopefully.
-		# Last, we need the settings of the *build* environment, not of the
-		# target environment...
-
-		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
-		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
-		einfo "Overriding clang configuration, since it won't work here"
-
-		export CC="${current_gcc_path}/gcc"
-		export CPP="${current_gcc_path}/cpp"
-		export CXX="${current_gcc_path}/g++"
-		export LD="${current_binutils_path}/ld.bfd"
-		export AR="${current_binutils_path}/ar"
-		export AS="${current_binutils_path}/as"
-		export NM="${current_binutils_path}/nm"
-		export STRIP="${current_binutils_path}/strip"
-		export RANLIB="${current_binutils_path}/ranlib"
-		export OBJCOPY="${current_binutils_path}/objcopy"
-		export STRINGS="${current_binutils_path}/strings"
-		export OBJDUMP="${current_binutils_path}/objdump"
-		export READELF="${current_binutils_path}/readelf"
-		export ADDR2LINE="${current_binutils_path}/addr2line"
-
-		# do we need to also do flags munging here? yes! at least...
-		filter-flags '-fuse-ld=*'
-		filter-flags '-D_FORTIFY_SOURCE=*'
-
-	else
-
-		# this is the "normal" case
-
-		export CC="$(tc-getCC ${CTARGET})"
-		export CXX="$(tc-getCXX ${CTARGET})"
-
-		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
-		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
-		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
-		export NM="$(tc-getNM ${CTARGET})"
-		export READELF="$(tc-getREADELF ${CTARGET})"
-
-	fi
-
-	# We need to export CFLAGS with abi information in them because glibc's
-	# configure script checks CFLAGS for some targets (like mips).  Keep
-	# around the original clean value to avoid appending multiple ABIs on
-	# top of each other. (Why does the comment talk about CFLAGS if the code
-	# acts on CC?)
-	export glibc__GLIBC_CC=${CC}
-	export glibc__GLIBC_CXX=${CXX}
-
-	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
-
-	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
-	# To build .S (assembly) files with the same ABI-specific flags
-	# upstream currently recommends adding CFLAGS to CC/CXX:
-	#    https://sourceware.org/PR23273
-	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
-	# and breaks multiarch support. See 659030#c3 for an example.
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
-
-	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
-	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
-
-	if is_crosscompile; then
-		# Assume worst-case bootstrap: glibc is buil first time
-		# when ${CTARGET}-g++ is not available yet. We avoid
-		# building auxiliary programs that require C++: bug #683074
-		# It should not affect final result.
-		export libc_cv_cxx_link_ok=no
-		# The line above has the same effect. We set CXX explicitly
-		# to make build logs less confusing.
-		export CXX=
-	fi
-}
-
-foreach_abi() {
-	setup_env
-
-	local ret=0
-	local abilist=""
-	if use multilib ; then
-		abilist=$(get_install_abis)
-	else
-		abilist=${DEFAULT_ABI}
-	fi
-	local -x ABI
-	for ABI in ${abilist:-default} ; do
-		setup_env
-		einfo "Running $1 for ABI ${ABI}"
-		$1
-		: $(( ret |= $? ))
-	done
-	return ${ret}
-}
-
-glibc_banner() {
-	local b="Gentoo ${PVR}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
-	echo "${b}"
-}
-
-# The following Kernel version handling functions are mostly copied from portage
-# source. It's better not to use linux-info.eclass here since a) it adds too
-# much magic, see bug 326693 for some of the arguments, and b) some of the
-# functions are just not provided.
-
-g_get_running_KV() {
-	uname -r
-	return $?
-}
-
-g_KV_major() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	echo "${KV%%.*}"
-}
-
-g_KV_minor() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.}
-	echo "${KV%%.*}"
-}
-
-g_KV_micro() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.*.}
-	echo "${KV%%[^[:digit:]]*}"
-}
-
-g_KV_to_int() {
-	[[ -z $1 ]] && return 1
-	local KV_MAJOR=$(g_KV_major "$1")
-	local KV_MINOR=$(g_KV_minor "$1")
-	local KV_MICRO=$(g_KV_micro "$1")
-	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
-	# We make version 2.2.0 the minimum version we will handle as
-	# a sanity check ... if its less, we fail ...
-	if [[ ${KV_int} -ge 131584 ]] ; then
-		echo "${KV_int}"
-		return 0
-	fi
-	return 1
-}
-
-g_int_to_KV() {
-	local version=$1 major minor micro
-	major=$((version / 65536))
-	minor=$(((version % 65536) / 256))
-	micro=$((version % 256))
-	echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
-	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
-	eend $?
-}
-
-get_kheader_version() {
-	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
-	tail -n 1
-}
-
-# We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
-# src_unpack.
-sanity_prechecks() {
-	# Prevent native builds from downgrading
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ -z ${ROOT} ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-
-		# The high rev # is to allow people to downgrade between -r#
-		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
-		# should be fine. Hopefully we never actually use a r# this
-		# high.
-		if has_version ">${CATEGORY}/${P}-r10000" ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
-		fi
-
-		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
-			eerror "Your old kernel is broken. You need to update it to a newer"
-			eerror "version as syscall(<bignum>) will break. See bug 279260."
-			die "Old and broken kernel."
-		fi
-	fi
-
-	# Users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "Lazy upgrader detected"
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
-		die "Please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
-	# we test for...
-	if ! is_crosscompile ; then
-		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
-			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
-			local STAT
-			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
-				"${T}/check-ia32-emulation.elf32"
-				STAT=$?
-			else
-				# Don't fail here to allow single->multi ABI switch
-				# or recover from breakage like bug #646424
-				ewarn "Failed to compile the ABI test. Broken host glibc?"
-				STAT=0
-			fi
-			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
-		fi
-
-	fi
-
-	# When we actually have to compile something...
-	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
-			# bug #833620, bug #643302
-			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
-			eerror "This is known to break glibc's build."
-			eerror "Please backup its contents then remove the directory."
-			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
-		fi
-
-		if [[ ${CTARGET} == *-linux* ]] ; then
-			local run_kv build_kv want_kv
-
-			run_kv=$(g_get_running_KV)
-			build_kv=$(g_int_to_KV $(get_kheader_version))
-			want_kv=${MIN_KERN_VER}
-
-			if ! is_crosscompile && ! tc-is-cross-compiler ; then
-				# Building fails on an non-supporting kernel
-				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
-				if ! eend_KV ${run_kv} ${want_kv} ; then
-					echo
-					eerror "You need a kernel of at least ${want_kv}!"
-					die "Kernel version too low!"
-				fi
-			fi
-
-			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
-			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
-			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
-			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
-			# need to run this check at all given we have a dependency on the right headers,
-			# but let's leave it as-is for now.
-			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
-				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-				if ! eend_KV ${build_kv} ${want_kv} ; then
-					echo
-					eerror "You need linux-headers of at least ${want_kv}!"
-					die "linux-headers version too low!"
-				fi
-			fi
-		fi
-	fi
-}
-
-upgrade_warning() {
-	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
-		local oldv newv=$(ver_cut 1-2 ${PV})
-		for oldv in ${REPLACING_VERSIONS}; do
-			if ver_test ${oldv} -lt ${newv}; then
-				ewarn "After upgrading glibc, please restart all running processes."
-				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
-				ewarn "Alternatively, reboot your system."
-				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
-				break
-			fi
-		done
-	fi
-}
-
-#
-# the phases
-#
-
-# pkg_pretend
-
-pkg_pretend() {
-	upgrade_warning
-}
-
-pkg_setup() {
-	# see bug 682570
-	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
-}
-
-# src_unpack
-
-src_unpack() {
-	setup_env
-
-	einfo "Checking general environment sanity."
-	sanity_prechecks
-
-	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
-
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patches || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
-	fi
-
-	cd "${WORKDIR}" || die
-	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
-	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
-}
-
-src_prepare() {
-	local patchsetname
-	if ! use vanilla ; then
-		if [[ ${PV} == 9999* ]] ; then
-			patchsetname="from git master"
-		else
-			patchsetname="${RELEASE_VER}-${PATCH_VER}"
-		fi
-		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
-		eapply "${WORKDIR}"/patches
-		einfo "Done."
-	fi
-
-	default
-
-	gnuconfig_update
-
-	cd "${WORKDIR}"
-	find . -name configure -exec touch {} +
-
-	# move the external locale-gen to its old place
-	mkdir extra || die
-	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
-
-	eprefixify extra/locale/locale-gen
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}"
-}
-
-glibc_do_configure() {
-	dump_build_environment
-
-	local myconf=()
-
-	# Use '=strong' instead of '=all' to protect only functions
-	# worth protecting from stack smashes.
-	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
-
-	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
-	# is not robust enough to detect proper support:
-	#    https://bugs.gentoo.org/641216
-	#    https://sourceware.org/PR22634#c0
-	case $(tc-arch ${CTARGET}) in
-		# Keep whitelist of targets where autodetection mostly works.
-		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
-		# Blacklist everywhere else
-		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
-	esac
-
-	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
-	case ${CTARGET} in
-		x86_64-*) myconf+=( $(use_enable cet) ) ;;
-		*) ;;
-	esac
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	myconf+=( --enable-kernel=${MIN_KERN_VER} )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		--sysconfdir="$(host_eprefix)/etc"
-		--localstatedir="$(host_eprefix)/var"
-		--libdir='$(prefix)'/$(get_libdir)
-		--mandir='$(prefix)'/share/man
-		--infodir='$(prefix)'/share/info
-		--libexecdir='$(libdir)'/misc/glibc
-		--with-bugurl=https://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_enable crypt)
-		$(use_multiarch || echo --disable-multi-arch)
-		$(use_enable systemtap)
-		$(use_enable nscd)
-
-		# locale data is arch-independent
-		# https://bugs.gentoo.org/753740
-		libc_cv_complocaledir='${exec_prefix}/lib/locale'
-
-		# -march= option tricks build system to infer too
-		# high ISA level: https://sourceware.org/PR27318
-		libc_cv_include_x86_isa_level=no
-		# Explicit override of https://sourceware.org/PR27991
-		# exposes a bug in glibc's configure:
-		# https://sourceware.org/PR27991
-		libc_cv_have_x86_lahf_sahf=no
-		libc_cv_have_x86_movbe=no
-
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	myconf+=( $(use_enable vanilla timezone-tools) )
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
-	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
-
-	local builddir=$(builddir nptl)
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	#
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
-		echo 'main(){}' > "${T}"/test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-		fi
-	fi
-}
-
-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we can't really test it now ...
-	# hopefully they don't affect header generation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_compiler_powerpc64le_binary128_ok=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_fortify_source=no
-		libc_cv_target_power8_ok=yes
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	local headers_only_arch_CPPFLAGS=()
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
-		# Force the mips ABI to the default.  This is OK because the set of
-		# installed headers in this phase is the same between the 3 ABIs.
-		# If this ever changes, this hack will break, but that's unlikely
-		# as glibc discourages that behavior.
-		# https://crbug.com/647033
-		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
-		popd >/dev/null
-	fi
-
-	case ${CTARGET} in
-	riscv*)
-		# RISC-V interrogates the compiler to determine which target to
-		# build.  If building the headers then we don't strictly need a
-		# RISC-V compiler, so the built-in definitions that are provided
-		# along with all RISC-V compiler might not exist.  This causes
-		# glibc's RISC-V preconfigure script to blow up.  Since we're just
-		# building the headers any value will actually work here, so just
-		# pick the standard one (rv64g/lp64d) to make the build scripts
-		# happy for now -- the headers are all the same anyway so it
-		# doesn't matter.
-		headers_only_arch_CPPFLAGS+=(
-			-D__riscv_xlen=64
-			-D__riscv_flen=64
-			-D__riscv_float_abi_double=1
-			-D__riscv_atomic=1
-		) ;;
-	esac
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		$(use_enable crypt)
-		${EXTRA_ECONF}
-	)
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	local headers_only_CC=$(tc-getBUILD_CC)
-	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
-	local headers_only_LDFLAGS=""
-	set -- "${S}"/configure "${myconf[@]}"
-	echo \
-		"CC=${headers_only_CC}" \
-		"CFLAGS=${headers_only_CFLAGS}" \
-		"CPPFLAGS=${headers_only_CPPFLAGS}" \
-		"LDFLAGS=${headers_only_LDFLAGS}" \
-		"$@"
-	CC=${headers_only_CC} \
-	CFLAGS=${headers_only_CFLAGS} \
-	CPPFLAGS=${headers_only_CPPFLAGS} \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
-	if just_headers ; then
-		glibc_headers_configure
-	else
-		glibc_do_configure nptl
-	fi
-}
-
-src_configure() {
-	foreach_abi do_src_configure
-}
-
-do_src_compile() {
-	emake -C "$(builddir nptl)"
-}
-
-src_compile() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi do_src_compile
-}
-
-glibc_src_test() {
-	cd "$(builddir nptl)"
-
-	local myxfailparams=""
-	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
-		for myt in ${XFAIL_TEST_LIST[@]} ; do
-			myxfailparams+="test-xfail-${myt}=yes "
-		done
-	fi
-
-	# sandbox does not understand unshare() and prevents
-	# writes to /proc/, which makes many tests fail
-
-	# we give the tests a bit more time to avoid spurious
-	# bug reports on slow arches
-
-	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
-}
-
-do_src_test() {
-	local ret=0
-
-	glibc_src_test
-	: $(( ret |= $? ))
-
-	return ${ret}
-}
-
-src_test() {
-	if just_headers ; then
-		return
-	fi
-
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi do_src_test || die "tests failed"
-}
-
-run_locale_gen() {
-	# if the host locales.gen contains no entries, we'll install everything
-	local root="$1"
-	local inplace=""
-
-	if [[ "${root}" == "--inplace-glibc" ]] ; then
-		inplace="--inplace-glibc"
-		root="$2"
-	fi
-
-	local locale_list="${root%/}/etc/locale.gen"
-
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
-	fi
-
-	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
-		--destdir "${root}"
-	echo "$@"
-	"$@"
-
-	popd >/dev/null
-}
-
-glibc_do_src_install() {
-	local builddir=$(builddir nptl)
-	cd "${builddir}"
-
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
-
-	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
-	# which come without headers etc. Only needed for binary packages since the
-	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
-	find "${D}" -name "libnsl.a" -delete
-	find "${D}" -name "libnsl.so" -delete
-
-	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
-	# to infer upstream version:
-	# '#define VERSION "2.26.90"' -> '2.26.90'
-	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
-	# Avoid stripping binaries not targeted by ${CHOST}. Or else
-	# ${CHOST}-strip would break binaries build for ${CTARGET}.
-	is_crosscompile && dostrip -x /
-	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
-	# See Note [Disable automatic stripping]
-	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
-
-	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		# Move versioned .a file out of libdir to evade portage QA checks
-		# instead of using gen_usr_ldscript(). We fix ldscript as:
-		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
-		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
-	fi
-
-	# We configure toolchains for standalone prefix systems with a sysroot,
-	# which is prepended to paths in ld scripts, so strip the prefix from these.
-	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
-	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
-	if [[ -n $(host_eprefix) ]] ; then
-		local file
-		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
-			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
-		done
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		# riscv
-		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
-		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
-		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
-		lp64    /lib/ld-linux-riscv64-lp64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-			# ELFv2 (glibc does not support ELFv1 on LE)
-			ppc64   /lib64/ld64.so.2
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-			# ELFv1 (glibc does not support ELFv2 on BE)
-			ppc64   /lib64/ld64.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
-	# the runtime loader name, see also https://xkcd.com/927/
-	# Normally, in Gentoo one should never come across executables that require this.
-	# However, binary commercial packages are known to adhere to weird practices.
-	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
-	local lsb_ldso_name native_ldso_name lsb_ldso_abi
-	local lsb_ldso_abi_list=(
-		# x86
-		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
-	)
-	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
-		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
-		native_ldso_name=${lsb_ldso_abi_list[i+1]}
-		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
-		has ${lsb_ldso_abi} $(get_install_abis) || continue
-
-		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
-			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		keepdir $(alt_prefix)/lib
-		keepdir $(alt_prefix)/usr/lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen
-
-	keepdir /usr/lib/locale
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins posix/gai.conf
-
-	if use systemd ; then
-		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
-	else
-		doins nss/nsswitch.conf
-	fi
-
-	# Gentoo-specific
-	newins "${FILESDIR}"/host.conf-1 host.conf
-
-	if use nscd ; then
-		doins nscd/nscd.conf
-
-		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		use systemd && systemd_dounit nscd/nscd.service
-		newtmpfiles nscd/nscd.tmpfiles nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc
-
-	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-	dodoc -r ChangeLog.old
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-
-	# Generate all locales if this is a native build as locale generation
-	if use compile-locales && ! is_crosscompile ; then
-		run_locale_gen --inplace-glibc "${ED}/"
-		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
-	fi
-}
-
-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
-
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_install() {
-	if just_headers ; then
-		export ABI=default
-		glibc_headers_install
-		return
-	fi
-
-	foreach_abi glibc_do_src_install
-
-	if ! use static-libs ; then
-		einfo "Not installing static glibc libraries"
-		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
-	fi
-}
-
-# Simple test to make sure our new glibc isn't completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail.  Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
-	cd / #228809
-
-	# We enter ${ED} so to avoid trouble if the path contains
-	# special characters; for instance if the path contains the
-	# colon character (:), then the linker will try to split it
-	# and look for the libraries in an unexpected place. This can
-	# lead to unsafe code execution if the generated prefix is
-	# within a world-writable directory.
-	# (e.g. /var/tmp/portage:${HOSTNAME})
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	# first let's find the actual dynamic linker here
-	# symlinks may point to the wrong abi
-	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
-
-	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
-
-	local x striptest
-	for x in cal date env free ls true uname uptime ; do
-		x=$(type -p ${x})
-		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		case ${striptest} in
-		*"statically linked"*) continue;;
-		*"ASCII text"*) continue;;
-		esac
-		# We need to clear the locale settings as the upgrade might want
-		# incompatible locale data.  This test is not for verifying that.
-		LC_ALL=C \
-		${newldso} --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-
-	popd >/dev/null
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		einfo "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ -n ${ROOT} ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-
-	if [[ -L ${EROOT}/usr/lib/locale ]]; then
-		# Help portage migrate this to a directory
-		# https://bugs.gentoo.org/753740
-		rm "${EROOT}"/usr/lib/locale || die
-	fi
-
-	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
-	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
-	# bug #802207
-	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
-		PRESERVED_OLD_LIBCRYPT=1
-		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die
-	else
-		PRESERVED_OLD_LIBCRYPT=0
-	fi
-}
-
-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
-	fi
-
-	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
-		use compile-locales || run_locale_gen "${EROOT}/"
-	fi
-
-	upgrade_warning
-
-	# Check for sanity of /etc/nsswitch.conf, take 2
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
-		local entry
-		for entry in passwd group shadow; do
-			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
-				ewarn ""
-				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
-				ewarn "removed from glibc and is now provided by the package"
-				ewarn "  sys-auth/libnss-nis"
-				ewarn "Install it now to keep your NIS setup working."
-				ewarn ""
-			fi
-		done
-	fi
-
-	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
-		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
-		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
-
-		elog "Please ignore a possible later error message about a file collision involving"
-		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
-		elog "the upgrade working, but it also needs to be overwritten when"
-		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.37-r1.ebuild b/sys-libs/glibc/glibc-2.37-r1.ebuild
deleted file mode 100644
index c784be9ed0c3..000000000000
--- a/sys-libs/glibc/glibc-2.37-r1.ebuild
+++ /dev/null
@@ -1,1664 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
-# Please read & adapt the page as necessary if obsolete.
-
-PYTHON_COMPAT=( python3_{9..11} )
-TMPFILES_OPTIONAL=1
-
-inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
-	multilib systemd multiprocessing tmpfiles
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
-EMULTILIB_PKG="true"
-
-# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=3
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
-fi
-
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20201208
-
-LOCALE_GEN_VER=2.23
-
-GLIBC_SYSTEMD_VER=20210729
-
-SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
-SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
-
-IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
-
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-# Minimum pax-utils version needed (which contains any new syscall changes for
-# its seccomp filter!). Please double check this!
-MIN_PAX_UTILS_VER="1.3.3"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-#
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-# Note [Disable automatic stripping]
-# Disabling automatic stripping for a few reasons:
-# - portage's attempt to strip breaks non-native binaries at least on
-#   arm: bug #697428
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread
-#   enumeration: bug #697910. This is quite subtle:
-#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
-#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
-#     via 'ps_pglobal_lookup' symbol defined in gdb.
-#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
-#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
-#     (unexported) is used to sanity check compatibility before enabling
-#     debugging.
-#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
-#   * normal 'strip' command trims '.symtab'
-#   Thus our main goal here is to prevent 'libpthread.so.0' from
-#   losing it's '.symtab' entries.
-# As Gentoo's strip does not allow us to pass less aggressive stripping
-# options and does not check the machine target we strip selectively.
-
-# We need a new-enough binutils/gcc to match upstream baseline.
-# Also we need to make sure our binutils/gcc supports TLS,
-# and that gcc already contains the hardened patches.
-# Lastly, let's avoid some openssh nastiness, bug 708224, as
-# convenience to our users.
-
-# gzip, grep, awk are needed by locale-gen, bug 740750
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
-	sys-devel/bison
-	doc? ( sys-apps/texinfo )
-	!compile-locales? (
-		app-arch/gzip
-		sys-apps/grep
-		app-alternatives/awk
-	)
-	test? ( dev-lang/perl )
-"
-COMMON_DEPEND="
-	gd? ( media-libs/gd:2= )
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	perl? ( dev-lang/perl )
-	test? ( dev-lang/perl )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-	compile-locales? (
-		app-arch/gzip
-		sys-apps/grep
-		app-alternatives/awk
-	)
-	test? ( >=net-dns/libidn2-2.3.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/gzip
-	sys-apps/grep
-	app-alternatives/awk
-	sys-apps/gentoo-functions
-	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
-	!<net-misc/openssh-8.1_p1-r2
-"
-
-RESTRICT="!test? ( test )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	BDEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.27
-		>=${CATEGORY}/gcc-6.2
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	BDEPEND+="
-		>=sys-devel/binutils-2.27
-		>=sys-devel/gcc-6.2
-	"
-	DEPEND+=" virtual/os-headers "
-	RDEPEND+="
-		>=net-dns/libidn2-2.3.0
-		vanilla? ( !sys-libs/timezone-data )
-	"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-# Ignore tests whitelisted below
-GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
-
-# The following tests fail due to the Gentoo build system and are thus
-# executed but ignored:
-XFAIL_TEST_LIST=(
-	# buggy test, assumes /dev/ and /dev/null on a single filesystem
-	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
-	# https://sourceware.org/PR25909
-	tst-support_descriptors
-
-	# The following tests fail only inside portage
-	# https://bugs.gentoo.org/831267
-	tst-system
-	tst-strerror
-	tst-strsignal
-)
-
-#
-# Small helper functions
-#
-
-dump_build_environment() {
-	einfo ==== glibc build environment ========================================================
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP READELF; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-	einfo =====================================================================================
-}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	is_crosscompile && use headers-only
-}
-
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-
-# This prefix is applicable to CHOST when building against this
-# glibc. It is baked into the library at configure time.
-host_eprefix() {
-	is_crosscompile || echo "${EPREFIX}"
-}
-
-# This prefix is applicable to CBUILD when building against this
-# glibc. It determines the destination path at install time.
-build_eprefix() {
-	is_crosscompile && echo "${EPREFIX}"
-}
-
-# We need to be able to set alternative headers for compiling for non-native
-# platform. Will also become useful for testing kernel-headers without screwing
-# up the whole system.
-alt_headers() {
-	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
-	echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
-	echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
-	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-do_compile_test() {
-	local ret save_cflags=${CFLAGS}
-	CFLAGS+=" $1"
-	shift
-
-	pushd "${T}" >/dev/null
-
-	rm -f glibc-test*
-	printf '%b' "$*" > glibc-test.c
-
-	# We assume CC is already set up.
-	nonfatal emake glibc-test
-	ret=$?
-
-	popd >/dev/null
-
-	CFLAGS=${save_cflags}
-	return ${ret}
-}
-
-do_run_test() {
-	local ret
-
-	if [[ ${MERGE_TYPE} == "binary" ]] ; then
-		# ignore build failures when installing a binary package #324685
-		do_compile_test "" "$@" 2>/dev/null || return 0
-	else
-		if ! do_compile_test "" "$@" ; then
-			ewarn "Simple build failed ... assuming this is desired #324685"
-			return 0
-		fi
-	fi
-
-	pushd "${T}" >/dev/null
-
-	./glibc-test
-	ret=$?
-	rm -f glibc-test*
-
-	popd >/dev/null
-
-	return ${ret}
-}
-
-setup_target_flags() {
-	# This largely mucks with compiler flags.  None of which should matter
-	# when building up just the headers.
-	just_headers && return 0
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404 #199334
-			# TODO: When creating the first glibc cross-compile, this test will
-			# always fail as it does a full link which in turn requires glibc.
-			# Probably also applies when changing multilib profile settings (e.g.
-			# enabling x86 when the profile was amd64-only previously).
-			# We could change main to _start and pass -nostdlib here so that we
-			# only test the gcc code compilation.  Or we could do a compile and
-			# then look for the symbol via scanelf.
-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-				einfo "Auto adding -march=${t} to CFLAGS #185404"
-			fi
-			# For compatibility with older binaries at slight performance cost.
-			use stack-realign && export CFLAGS+=" -mstackrealign"
-		;;
-		amd64)
-			# -march needed for #185404 #199334
-			# TODO: See cross-compile issues listed above for x86.
-			if [[ ${ABI} == x86 ]]; then
-				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-					local t=${CTARGET_OPT:-${CTARGET}}
-					t=${t%%-*}
-					# Normally the target is x86_64-xxx, so turn that into the -march that
-					# gcc actually accepts. #528708
-					[[ ${t} == "x86_64" ]] && t="x86-64"
-					filter-flags '-march=*'
-					# ugly, ugly, ugly.  ugly.
-					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
-					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
-				fi
-				# For compatibility with older binaries at slight performance cost.
-				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
-
-				# Workaround for bug #823780.
-				# Need to save/restore CC because earlier on, we stuff it full of CFLAGS, and tc-getCPP doesn't like that.
-				CC_mangled=${CC}
-				CC=${glibc__GLIBC_CC}
-				if tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
-					export CFLAGS_x86="${CFLAGS_x86} -mno-avx512f"
-					einfo "Auto adding -mno-avx512f to CFLAGS_x86 for buggy GCC version (bug #823780) (ABI=${ABI})"
-				fi
-				CC=${CC_mangled}
-			fi
-		;;
-		mips)
-			# The mips abi cannot support the GNU style hashes. #233233
-			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
-		;;
-		ppc|ppc64)
-			# Many arch-specific implementations do not work on ppc with
-			# cache-block not equal to 128 bytes. This breaks memset:
-			#   https://sourceware.org/PR26522
-			#   https://bugs.gentoo.org/737996
-			# Use default -mcpu=. For ppc it means non-multiarch setup.
-			filter-flags '-mcpu=*'
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-
-			local cpu
-			case ${CTARGET} in
-			sparc64-*)
-				cpu="sparc64"
-				case $(get-flag mcpu) in
-				v9)
-					# We need to force at least v9a because the base build doesn't
-					# work with just v9.
-					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
-					append-flags "-Wa,-xarch=v9a"
-					;;
-				esac
-				;;
-			sparc-*)
-				case $(get-flag mcpu) in
-				v8|supersparc|hypersparc|leon|leon3)
-					cpu="sparcv8"
-					;;
-				*)
-					cpu="sparcv9"
-					;;
-				esac
-			;;
-			esac
-			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
-		;;
-	esac
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Allow users to explicitly avoid flag sanitization via
-	# USE=custom-cflags.
-	if ! use custom-cflags; then
-		# Over-zealous CFLAGS can often cause problems.  What may work for one
-		# person may not work for another.  To avoid a large influx of bugs
-		# relating to failed builds, we strip most CFLAGS out to ensure as few
-		# problems as possible.
-		strip-flags
-		# Lock glibc at -O2; we want to be conservative here.
-		filter-flags '-O?'
-		append-flags -O2
-	fi
-
-	strip-unsupported-flags
-	filter-flags -m32 -m64 '-mabi=*'
-
-	# glibc aborts if rpath is set by LDFLAGS
-	filter-ldflags '-Wl,-rpath=*'
-
-	# ld can't use -r & --relax at the same time, bug #788901
-	# https://sourceware.org/PR27837
-	filter-ldflags '-Wl,--relax'
-
-	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
-	# we have to do that here already so mips can filter it out again :P
-	if use hash-sysv-compat ; then
-		append-ldflags '-Wl,--hash-style=both'
-	fi
-
-	# #492892
-	filter-flags -frecord-gcc-switches
-
-	# #898098
-	filter-flags -fno-builtin
-
-	# #829583
-	filter-lfs-flags
-
-	unset CBUILD_OPT CTARGET_OPT
-	if use multilib ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	setup_target_flags
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# glibc's headers disallow -O0 and fail at build time:
-	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
-	replace-flags -O0 -O1
-
-	# glibc handles this internally already where it's appropriate;
-	# can't always have SSP when we're the ones setting it up, etc
-	filter-flags '-fstack-protector*'
-
-	# Similar issues as with SSP. Can't inject yourself that early.
-	filter-flags '-fsanitize=*'
-
-	# See end of bug #830454; we handle this via USE=cet
-	filter-flags '-fcf-protection=*'
-
-	# When bootstrapping, we may have a situation where
-	# CET-enabled gcc from seed is used to build CET-disabled
-	# glibc. As such, gcc implicitly enables CET if no
-	# -fcf-protection flag is passed. For a typical package it
-	# should not be a problem, but for glibc it matters as it is
-	# dealing with CET in ld.so. So if CET is supposed to be
-	# disabled for glibc, be explicit about it.
-	if (use amd64 || use x86) && ! use cet; then
-		append-flags '-fcf-protection=none'
-	fi
-}
-
-use_multiarch() {
-	# Allow user to disable runtime arch detection in multilib.
-	use multiarch || return 1
-	# Make sure binutils is new enough to support indirect functions,
-	# #336792. This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc support was added in 2.23, but glibc also needs
-	# machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	ver_test ${bver} -ge ${nver}
-}
-
-# Setup toolchain variables that had historically been defined in the
-# profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-	unset LD_ASSUME_KERNEL
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		multilib_env ${CTARGET_OPT:-${CTARGET}}
-
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	if just_headers ; then
-		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
-		# At this bootstrap stage we have only binutils for
-		# target but not compiler yet.
-		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
-		return 0
-	fi
-
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	if use doc ; then
-		export MAKEINFO=makeinfo
-	else
-		export MAKEINFO=/dev/null
-	fi
-
-	# Reset CC and CXX to the value at start of emerge
-	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
-	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
-
-	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
-	export glibc__ORIG_CC=${CC}
-	export glibc__ORIG_CXX=${CXX}
-
-	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
-		export glibc__force_gcc=yes
-		# once this is toggled on, it needs to stay on, since with CPP manipulated
-		# tc-is-clang does not work correctly anymore...
-	fi
-
-	if [[ ${glibc__force_gcc} == "yes" ]] ; then
-		# If we are running in an otherwise clang/llvm environment, we need to
-		# recover the proper gcc and binutils settings here, at least until glibc
-		# is finally building with clang. So let's override everything that is
-		# set in the clang profiles.
-		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
-		# a good start into that direction.
-		# Also, if you're crosscompiling, let's assume you know what you are doing.
-		# Hopefully.
-		# Last, we need the settings of the *build* environment, not of the
-		# target environment...
-
-		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
-		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
-		einfo "Overriding clang configuration, since it won't work here"
-
-		export CC="${current_gcc_path}/gcc"
-		export CPP="${current_gcc_path}/cpp"
-		export CXX="${current_gcc_path}/g++"
-		export LD="${current_binutils_path}/ld.bfd"
-		export AR="${current_binutils_path}/ar"
-		export AS="${current_binutils_path}/as"
-		export NM="${current_binutils_path}/nm"
-		export STRIP="${current_binutils_path}/strip"
-		export RANLIB="${current_binutils_path}/ranlib"
-		export OBJCOPY="${current_binutils_path}/objcopy"
-		export STRINGS="${current_binutils_path}/strings"
-		export OBJDUMP="${current_binutils_path}/objdump"
-		export READELF="${current_binutils_path}/readelf"
-		export ADDR2LINE="${current_binutils_path}/addr2line"
-
-		# do we need to also do flags munging here? yes! at least...
-		filter-flags '-fuse-ld=*'
-		filter-flags '-D_FORTIFY_SOURCE=*'
-
-	else
-
-		# this is the "normal" case
-
-		export CC="$(tc-getCC ${CTARGET})"
-		export CXX="$(tc-getCXX ${CTARGET})"
-
-		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
-		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
-		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
-		export NM="$(tc-getNM ${CTARGET})"
-		export READELF="$(tc-getREADELF ${CTARGET})"
-
-	fi
-
-	# We need to export CFLAGS with abi information in them because glibc's
-	# configure script checks CFLAGS for some targets (like mips).  Keep
-	# around the original clean value to avoid appending multiple ABIs on
-	# top of each other. (Why does the comment talk about CFLAGS if the code
-	# acts on CC?)
-	export glibc__GLIBC_CC=${CC}
-	export glibc__GLIBC_CXX=${CXX}
-
-	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
-
-	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
-	# To build .S (assembly) files with the same ABI-specific flags
-	# upstream currently recommends adding CFLAGS to CC/CXX:
-	#    https://sourceware.org/PR23273
-	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
-	# and breaks multiarch support. See 659030#c3 for an example.
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
-
-	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
-	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
-
-	if is_crosscompile; then
-		# Assume worst-case bootstrap: glibc is buil first time
-		# when ${CTARGET}-g++ is not available yet. We avoid
-		# building auxiliary programs that require C++: bug #683074
-		# It should not affect final result.
-		export libc_cv_cxx_link_ok=no
-		# The line above has the same effect. We set CXX explicitly
-		# to make build logs less confusing.
-		export CXX=
-	fi
-}
-
-foreach_abi() {
-	setup_env
-
-	local ret=0
-	local abilist=""
-	if use multilib ; then
-		abilist=$(get_install_abis)
-	else
-		abilist=${DEFAULT_ABI}
-	fi
-	local -x ABI
-	for ABI in ${abilist:-default} ; do
-		setup_env
-		einfo "Running $1 for ABI ${ABI}"
-		$1
-		: $(( ret |= $? ))
-	done
-	return ${ret}
-}
-
-glibc_banner() {
-	local b="Gentoo ${PVR}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
-	echo "${b}"
-}
-
-# The following Kernel version handling functions are mostly copied from portage
-# source. It's better not to use linux-info.eclass here since a) it adds too
-# much magic, see bug 326693 for some of the arguments, and b) some of the
-# functions are just not provided.
-
-g_get_running_KV() {
-	uname -r
-	return $?
-}
-
-g_KV_major() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	echo "${KV%%.*}"
-}
-
-g_KV_minor() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.}
-	echo "${KV%%.*}"
-}
-
-g_KV_micro() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.*.}
-	echo "${KV%%[^[:digit:]]*}"
-}
-
-g_KV_to_int() {
-	[[ -z $1 ]] && return 1
-	local KV_MAJOR=$(g_KV_major "$1")
-	local KV_MINOR=$(g_KV_minor "$1")
-	local KV_MICRO=$(g_KV_micro "$1")
-	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
-	# We make version 2.2.0 the minimum version we will handle as
-	# a sanity check ... if its less, we fail ...
-	if [[ ${KV_int} -ge 131584 ]] ; then
-		echo "${KV_int}"
-		return 0
-	fi
-	return 1
-}
-
-g_int_to_KV() {
-	local version=$1 major minor micro
-	major=$((version / 65536))
-	minor=$(((version % 65536) / 256))
-	micro=$((version % 256))
-	echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
-	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
-	eend $?
-}
-
-get_kheader_version() {
-	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
-	tail -n 1
-}
-
-# We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
-# src_unpack.
-sanity_prechecks() {
-	# Prevent native builds from downgrading
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ -z ${ROOT} ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-
-		# The high rev # is to allow people to downgrade between -r#
-		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
-		# should be fine. Hopefully we never actually use a r# this
-		# high.
-		if has_version ">${CATEGORY}/${P}-r10000" ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
-		fi
-
-		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
-			eerror "Your old kernel is broken. You need to update it to a newer"
-			eerror "version as syscall(<bignum>) will break. See bug 279260."
-			die "Old and broken kernel."
-		fi
-	fi
-
-	# Users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "Lazy upgrader detected"
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
-		die "Please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
-	# we test for...
-	if ! is_crosscompile ; then
-		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
-			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
-			local STAT
-			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
-				"${T}/check-ia32-emulation.elf32"
-				STAT=$?
-			else
-				# Don't fail here to allow single->multi ABI switch
-				# or recover from breakage like bug #646424
-				ewarn "Failed to compile the ABI test. Broken host glibc?"
-				STAT=0
-			fi
-			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
-		fi
-
-	fi
-
-	# When we actually have to compile something...
-	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
-			# bug #833620, bug #643302
-			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
-			eerror "This is known to break glibc's build."
-			eerror "Please backup its contents then remove the directory."
-			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
-		fi
-
-		if [[ ${CTARGET} == *-linux* ]] ; then
-			local run_kv build_kv want_kv
-
-			run_kv=$(g_get_running_KV)
-			build_kv=$(g_int_to_KV $(get_kheader_version))
-			want_kv=${MIN_KERN_VER}
-
-			if ! is_crosscompile && ! tc-is-cross-compiler ; then
-				# Building fails on an non-supporting kernel
-				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
-				if ! eend_KV ${run_kv} ${want_kv} ; then
-					echo
-					eerror "You need a kernel of at least ${want_kv}!"
-					die "Kernel version too low!"
-				fi
-			fi
-
-			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
-			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
-			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
-			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
-			# need to run this check at all given we have a dependency on the right headers,
-			# but let's leave it as-is for now.
-			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
-				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-				if ! eend_KV ${build_kv} ${want_kv} ; then
-					echo
-					eerror "You need linux-headers of at least ${want_kv}!"
-					die "linux-headers version too low!"
-				fi
-			fi
-		fi
-	fi
-}
-
-upgrade_warning() {
-	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
-		local oldv newv=$(ver_cut 1-2 ${PV})
-		for oldv in ${REPLACING_VERSIONS}; do
-			if ver_test ${oldv} -lt ${newv}; then
-				ewarn "After upgrading glibc, please restart all running processes."
-				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
-				ewarn "Alternatively, reboot your system."
-				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
-				break
-			fi
-		done
-	fi
-}
-
-#
-# the phases
-#
-
-# pkg_pretend
-
-pkg_pretend() {
-	upgrade_warning
-}
-
-pkg_setup() {
-	# see bug 682570
-	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
-}
-
-# src_unpack
-
-src_unpack() {
-	setup_env
-
-	einfo "Checking general environment sanity."
-	sanity_prechecks
-
-	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
-
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patches || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
-	fi
-
-	cd "${WORKDIR}" || die
-	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
-	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
-}
-
-src_prepare() {
-	local patchsetname
-	if ! use vanilla ; then
-		if [[ ${PV} == 9999* ]] ; then
-			patchsetname="from git master"
-		else
-			patchsetname="${RELEASE_VER}-${PATCH_VER}"
-		fi
-		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
-		eapply "${WORKDIR}"/patches
-		einfo "Done."
-	fi
-
-	default
-
-	gnuconfig_update
-
-	cd "${WORKDIR}"
-	find . -name configure -exec touch {} +
-
-	# move the external locale-gen to its old place
-	mkdir extra || die
-	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
-
-	eprefixify extra/locale/locale-gen
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}"
-}
-
-glibc_do_configure() {
-	dump_build_environment
-
-	local myconf=()
-
-	# Use '=strong' instead of '=all' to protect only functions
-	# worth protecting from stack smashes.
-	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
-
-	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
-	# is not robust enough to detect proper support:
-	#    https://bugs.gentoo.org/641216
-	#    https://sourceware.org/PR22634#c0
-	case $(tc-arch ${CTARGET}) in
-		# Keep whitelist of targets where autodetection mostly works.
-		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
-		# Blacklist everywhere else
-		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
-	esac
-
-	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
-	case ${CTARGET} in
-		x86_64-*) myconf+=( $(use_enable cet) ) ;;
-		*) ;;
-	esac
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	myconf+=( --enable-kernel=${MIN_KERN_VER} )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		--sysconfdir="$(host_eprefix)/etc"
-		--localstatedir="$(host_eprefix)/var"
-		--libdir='$(prefix)'/$(get_libdir)
-		--mandir='$(prefix)'/share/man
-		--infodir='$(prefix)'/share/info
-		--libexecdir='$(libdir)'/misc/glibc
-		--with-bugurl=https://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_enable crypt)
-		$(use_multiarch || echo --disable-multi-arch)
-		$(use_enable systemtap)
-		$(use_enable nscd)
-
-		# /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if
-		# Perl hasn't been installed inside the prefix yet and configure picks
-		# up a Perl from outside the prefix instead. configure will fail to
-		# execute Perl during configure if we're cross-compiling a prefix, but
-		# it will just disable mtrace in that case.
-		# Note: mtrace is needed by the test suite.
-		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))"
-
-		# locale data is arch-independent
-		# https://bugs.gentoo.org/753740
-		libc_cv_complocaledir='${exec_prefix}/lib/locale'
-
-		# -march= option tricks build system to infer too
-		# high ISA level: https://sourceware.org/PR27318
-		libc_cv_include_x86_isa_level=no
-		# Explicit override of https://sourceware.org/PR27991
-		# exposes a bug in glibc's configure:
-		# https://sourceware.org/PR27991
-		libc_cv_have_x86_lahf_sahf=no
-		libc_cv_have_x86_movbe=no
-
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	myconf+=( $(use_enable vanilla timezone-tools) )
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
-	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
-
-	local builddir=$(builddir nptl)
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	#
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
-		echo 'main(){}' > "${T}"/test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-		fi
-	fi
-}
-
-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we can't really test it now ...
-	# hopefully they don't affect header generation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_compiler_powerpc64le_binary128_ok=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_fortify_source=no
-		libc_cv_target_power8_ok=yes
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	local headers_only_arch_CPPFLAGS=()
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
-		# Force the mips ABI to the default.  This is OK because the set of
-		# installed headers in this phase is the same between the 3 ABIs.
-		# If this ever changes, this hack will break, but that's unlikely
-		# as glibc discourages that behavior.
-		# https://crbug.com/647033
-		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
-		popd >/dev/null
-	fi
-
-	case ${CTARGET} in
-	riscv*)
-		# RISC-V interrogates the compiler to determine which target to
-		# build.  If building the headers then we don't strictly need a
-		# RISC-V compiler, so the built-in definitions that are provided
-		# along with all RISC-V compiler might not exist.  This causes
-		# glibc's RISC-V preconfigure script to blow up.  Since we're just
-		# building the headers any value will actually work here, so just
-		# pick the standard one (rv64g/lp64d) to make the build scripts
-		# happy for now -- the headers are all the same anyway so it
-		# doesn't matter.
-		headers_only_arch_CPPFLAGS+=(
-			-D__riscv_xlen=64
-			-D__riscv_flen=64
-			-D__riscv_float_abi_double=1
-			-D__riscv_atomic=1
-		) ;;
-	esac
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		$(use_enable crypt)
-		${EXTRA_ECONF}
-	)
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	local headers_only_CC=$(tc-getBUILD_CC)
-	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
-	local headers_only_LDFLAGS=""
-	set -- "${S}"/configure "${myconf[@]}"
-	echo \
-		"CC=${headers_only_CC}" \
-		"CFLAGS=${headers_only_CFLAGS}" \
-		"CPPFLAGS=${headers_only_CPPFLAGS}" \
-		"LDFLAGS=${headers_only_LDFLAGS}" \
-		"$@"
-	CC=${headers_only_CC} \
-	CFLAGS=${headers_only_CFLAGS} \
-	CPPFLAGS=${headers_only_CPPFLAGS} \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
-	if just_headers ; then
-		glibc_headers_configure
-	else
-		glibc_do_configure nptl
-	fi
-}
-
-src_configure() {
-	foreach_abi do_src_configure
-}
-
-do_src_compile() {
-	emake -C "$(builddir nptl)"
-}
-
-src_compile() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi do_src_compile
-}
-
-glibc_src_test() {
-	cd "$(builddir nptl)"
-
-	local myxfailparams=""
-	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
-		for myt in ${XFAIL_TEST_LIST[@]} ; do
-			myxfailparams+="test-xfail-${myt}=yes "
-		done
-	fi
-
-	# sandbox does not understand unshare() and prevents
-	# writes to /proc/, which makes many tests fail
-
-	# we give the tests a bit more time to avoid spurious
-	# bug reports on slow arches
-
-	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
-}
-
-do_src_test() {
-	local ret=0
-
-	glibc_src_test
-	: $(( ret |= $? ))
-
-	return ${ret}
-}
-
-src_test() {
-	if just_headers ; then
-		return
-	fi
-
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi do_src_test || die "tests failed"
-}
-
-run_locale_gen() {
-	# if the host locales.gen contains no entries, we'll install everything
-	local root="$1"
-	local inplace=""
-
-	if [[ "${root}" == "--inplace-glibc" ]] ; then
-		inplace="--inplace-glibc"
-		root="$2"
-	fi
-
-	local locale_list="${root%/}/etc/locale.gen"
-
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
-	fi
-
-	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
-		--destdir "${root}"
-	echo "$@"
-	"$@"
-
-	popd >/dev/null
-}
-
-glibc_do_src_install() {
-	local builddir=$(builddir nptl)
-	cd "${builddir}"
-
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
-
-	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
-	# which come without headers etc. Only needed for binary packages since the
-	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
-	find "${D}" -name "libnsl.a" -delete
-	find "${D}" -name "libnsl.so" -delete
-
-	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
-	# to infer upstream version:
-	# '#define VERSION "2.26.90"' -> '2.26.90'
-	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
-	# Avoid stripping binaries not targeted by ${CHOST}. Or else
-	# ${CHOST}-strip would break binaries build for ${CTARGET}.
-	is_crosscompile && dostrip -x /
-	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
-	# See Note [Disable automatic stripping]
-	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
-
-	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		# Move versioned .a file out of libdir to evade portage QA checks
-		# instead of using gen_usr_ldscript(). We fix ldscript as:
-		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
-		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
-	fi
-
-	# We configure toolchains for standalone prefix systems with a sysroot,
-	# which is prepended to paths in ld scripts, so strip the prefix from these.
-	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
-	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
-	if [[ -n $(host_eprefix) ]] ; then
-		local file
-		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
-			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
-		done
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		# riscv
-		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
-		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
-		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
-		lp64    /lib/ld-linux-riscv64-lp64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-			# ELFv2 (glibc does not support ELFv1 on LE)
-			ppc64   /lib64/ld64.so.2
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-			# ELFv1 (glibc does not support ELFv2 on BE)
-			ppc64   /lib64/ld64.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
-	# the runtime loader name, see also https://xkcd.com/927/
-	# Normally, in Gentoo one should never come across executables that require this.
-	# However, binary commercial packages are known to adhere to weird practices.
-	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
-	local lsb_ldso_name native_ldso_name lsb_ldso_abi
-	local lsb_ldso_abi_list=(
-		# x86
-		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
-	)
-	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
-		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
-		native_ldso_name=${lsb_ldso_abi_list[i+1]}
-		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
-		has ${lsb_ldso_abi} $(get_install_abis) || continue
-
-		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
-			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		keepdir $(alt_prefix)/lib
-		keepdir $(alt_prefix)/usr/lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen
-
-	keepdir /usr/lib/locale
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins posix/gai.conf
-
-	if use systemd ; then
-		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
-	else
-		doins nss/nsswitch.conf
-	fi
-
-	# Gentoo-specific
-	newins "${FILESDIR}"/host.conf-1 host.conf
-
-	if use nscd ; then
-		doins nscd/nscd.conf
-
-		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		use systemd && systemd_dounit nscd/nscd.service
-		newtmpfiles nscd/nscd.tmpfiles nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc
-
-	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-	dodoc -r ChangeLog.old
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-
-	# Generate all locales if this is a native build as locale generation
-	if use compile-locales && ! is_crosscompile ; then
-		run_locale_gen --inplace-glibc "${ED}/"
-		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
-	fi
-}
-
-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
-
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_install() {
-	if just_headers ; then
-		export ABI=default
-		glibc_headers_install
-		return
-	fi
-
-	foreach_abi glibc_do_src_install
-
-	if ! use static-libs ; then
-		einfo "Not installing static glibc libraries"
-		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
-	fi
-}
-
-# Simple test to make sure our new glibc isn't completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail.  Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
-	cd / #228809
-
-	# We enter ${ED} so to avoid trouble if the path contains
-	# special characters; for instance if the path contains the
-	# colon character (:), then the linker will try to split it
-	# and look for the libraries in an unexpected place. This can
-	# lead to unsafe code execution if the generated prefix is
-	# within a world-writable directory.
-	# (e.g. /var/tmp/portage:${HOSTNAME})
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	# first let's find the actual dynamic linker here
-	# symlinks may point to the wrong abi
-	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
-
-	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
-
-	local x striptest
-	for x in cal date env free ls true uname uptime ; do
-		x=$(type -p ${x})
-		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		case ${striptest} in
-		*"statically linked"*) continue;;
-		*"ASCII text"*) continue;;
-		esac
-		# We need to clear the locale settings as the upgrade might want
-		# incompatible locale data.  This test is not for verifying that.
-		LC_ALL=C \
-		${newldso} --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-
-	popd >/dev/null
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		einfo "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ -n ${ROOT} ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-
-	if [[ -L ${EROOT}/usr/lib/locale ]]; then
-		# Help portage migrate this to a directory
-		# https://bugs.gentoo.org/753740
-		rm "${EROOT}"/usr/lib/locale || die
-	fi
-
-	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
-	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
-	# bug #802207
-	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
-		PRESERVED_OLD_LIBCRYPT=1
-		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die
-	else
-		PRESERVED_OLD_LIBCRYPT=0
-	fi
-}
-
-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
-	fi
-
-	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
-		use compile-locales || run_locale_gen "${EROOT}/"
-	fi
-
-	upgrade_warning
-
-	# Check for sanity of /etc/nsswitch.conf, take 2
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
-		local entry
-		for entry in passwd group shadow; do
-			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
-				ewarn ""
-				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
-				ewarn "removed from glibc and is now provided by the package"
-				ewarn "  sys-auth/libnss-nis"
-				ewarn "Install it now to keep your NIS setup working."
-				ewarn ""
-			fi
-		done
-	fi
-
-	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
-		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
-		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
-
-		elog "Please ignore a possible later error message about a file collision involving"
-		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
-		elog "the upgrade working, but it also needs to be overwritten when"
-		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
-	fi
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ff79de640354..c5ae9cc23bb9 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/iotop/Manifest b/sys-process/iotop/Manifest
index ca8c2a075829..9f7761dcae64 100644
--- a/sys-process/iotop/Manifest
+++ b/sys-process/iotop/Manifest
@@ -1,9 +1,3 @@
-AUX iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch 896 BLAKE2B 854d249c2d9308d2fc5cb2371d402ea7ddeff04af378e909616d920a45aa2f4409e6a15c9c8e261d192f580b22c8e51190d3abeaf9bbe68c5a6d196f65c2b5df SHA512 15efbc86ceefa464aa315baf6f43188003788e8507c6d614ef00557da3fe280c77fdc368347d8e4389423d3d9797346a6e602282229c93229717bf6cd6784de7
-AUX iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch 2826 BLAKE2B bef789782f496e840cc89be232399d495b3e77886b031c6ccdc78ecc71cdcb8585fe39a9164b2eeee6219f62bf97a7038f48a60de66529cd8bd5fd0c0ccceafa SHA512 ff09ac51be530f6d1f5b21101c2a501563afb021f943c74f7965fd9a8ee35a1dfb6842b1055fc3afdf8c2b5533a4a49ad5b12d24ce12c605a581db30d1e62437
-AUX iotop-0.6-Only-split-proc-status-lines-on-the-character.patch 984 BLAKE2B c43a4feaa7293b86454a96aaddbbc3c40c6a2afc2656448cc899230abc479d702adbc5785a818754214f7524bc499f4699ac1c841b7753601c9bcd89771440ec SHA512 291ed55dcebd988e0819f28805f12392bfff3ea0686cddebdb9bec8042f981c2d94c7ac3f8d9a4ba5e8611686129c47347bd1a9484ce82a2687c651007efb937
-AUX iotop-0.6-setup.py3.patch 1151 BLAKE2B da00d36a1778173e2d77041fec584aa1ff42062932915ff2a6beb9aaeda0699fdb6a6c9903eee56e10efb9ed9d6def08a8d7fbbe714def4e8bff4504500aa55e SHA512 6b97da5ef9e78c268193ce0270328f4c4d99d30f532fe68dac9bd033bb0a5e6cdb3145b53a7670c7babdae7f170473d1f9eb23137b5950fdaceadde266b4bb73
-DIST iotop-0.6.tar.bz2 29779 BLAKE2B 6c979f7beef4e9ec6536eb5ec113ab7089ccb0b8b00dfca6181408390584dac0eae18b110c3f4837a25defd7ab2c2e9d79f1f5cad762f97519e94847951f0037 SHA512 b1047da3bc46604447cc8ab22442a3a5381e1a79a6b176fe9ee8402ee5cebb959205407a6aeaffccccde9d2f67624ff8ee6717b051838f13ab88bf3a16db3ab9
 DIST iotop-0.6_p20230124.tar.gz 28751 BLAKE2B 4fd281b663288825a3315442171df649b59a133479732367863e4f0d75f81e760af5117aec7b1ff070bb7a98e7348f76a6490b9ab8866c0ff7cb52073b07fbd8 SHA512 916809c9a97ed260525b00b4e6bd1f55f07b307bf1dc2f61e87317014d04e1bb3fab03c9ad9d5c110d198fbc89427cbe9e6679f03785f71e7e572f985dbac2a7
-EBUILD iotop-0.6.ebuild 987 BLAKE2B 2194469ff0bb7858611c7c7ffa57cd2df933219a777abd10c0607d09be51e36dc06f988dda4cf17dedc1f7439d5fbe1aed8454caed4c432a9c816030707c16a2 SHA512 997b2f7f373c678df96f7e40c774031e025121e24222bb5e798702ab7fe7896974da1ae49f8a31d0338dfe43d7ba79c42a59a70fde0791e845e04e5fb4d145a7
 EBUILD iotop-0.6_p20230124.ebuild 1139 BLAKE2B 68bc1463e7dda8ca0828385033b1c95348bcd262c0ca0bf52f3287c69a7f0c1ae1179ca327af3bc02efb94db6a9f98791b907b86e88236f641b442600f9b2123 SHA512 40785acbb5d3e80eb459573b844ed06ed4ac89c007fa739a1d93df44944701d4d15fd5af4cbae11be6e71640de1375450bb3a007e181d752e069113aa296aca8
 MISC metadata.xml 360 BLAKE2B 7d33d33cef4bf209ff0b3a487cfd95d89f2143f1f300ad8984a414d19d016c8bfc06433cc6d2bce662c04e97659391e113d45fccd9d1b51c3409969d94a70cc3 SHA512 f89ebbe23e0d3ca111fde959b313c09e49c4daaea2cc433dc3424cbf90f9a4d7e2b4bf6019edf95345a053d437aa1d8809cd22e9ce5fe030967ee3befa428692
diff --git a/sys-process/iotop/files/iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch b/sys-process/iotop/files/iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch
deleted file mode 100644
index 9dc89bfb6f33..000000000000
--- a/sys-process/iotop/files/iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c51ce0e29bd135c216f18e18f0c4ab769af0d6f Mon Sep 17 00:00:00 2001
-From: Paul Wise <pabs3@bonedaddy.net>
-Date: Fri, 25 May 2018 15:20:44 +0800
-Subject: [PATCH 2/2] Actually skip invalid lines in /proc/*/status
-
-Fixes: commit 0392b205b5c3973a326721c2e9f97f0fa2eefa82
----
- iotop/data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iotop/data.py b/iotop/data.py
-index e0387f0..3874974 100644
---- a/iotop/data.py
-+++ b/iotop/data.py
-@@ -214,7 +214,7 @@ def parse_proc_pid_status(pid):
-                 # Ignore lines that are not formatted correctly as
-                 # some downstream kernels may have weird lines and
-                 # the needed fields are probably formatted correctly.
--                pass
-+                continue
-             result_dict[key] = value.strip()
-     except IOError:
-         pass  # No such process
--- 
-2.20.1.97.g81188d93c3-goog
-
diff --git a/sys-process/iotop/files/iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch b/sys-process/iotop/files/iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch
deleted file mode 100644
index df46caf4ce11..000000000000
--- a/sys-process/iotop/files/iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0392b205b5c3973a326721c2e9f97f0fa2eefa82 Mon Sep 17 00:00:00 2001
-From: Paul Wise <pabs3@bonedaddy.net>
-Date: Fri, 25 May 2018 15:13:26 +0800
-Subject: [PATCH 1/2] Ignore invalid lines in /proc/*/status files
-
-One Ubuntu Linux kernel security fix introduced a blank line.
-Some other Linux kernels may have invalid lines in the future.
-
-See-also: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1772671
-Fixes: https://bugs.launchpad.net/ubuntu/+source/iotop/+bug/1772856
-Reported-by: Paul Jaros <jaros.paul@gmail.com>
-Reported-in: <CAEh_nc0_DXTmfu16PxmVyrCi6QQeSrpnGGhtfNu60wJYfa_6Zw@mail.gmail.com>
-Traceback (most recent call last):
-  File "/usr/sbin/iotop", line 17, in <module>
-    main()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 620, in main
-    main_loop()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 610, in <lambda>
-    main_loop = lambda: run_iotop(options)
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 508, in run_iotop
-    return curses.wrapper(run_iotop_window, options)
-  File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper
-    return func(stdscr, *args, **kwds)
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 501, in run_iotop_window
-    ui.run()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 155, in run
-    self.process_list.duration)
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 434, in refresh_display
-    lines = self.get_data()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 415, in get_data
-    return list(map(format, processes))
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 388, in format
-    cmdline = p.get_cmdline()
-  File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 292, in get_cmdline
-    proc_status = parse_proc_pid_status(self.pid)
-  File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 196, in parse_proc_pid_status
-    key, value = line.split(':\t', 1)
-ValueError: need more than 1 value to unpack
----
- iotop/data.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/iotop/data.py b/iotop/data.py
-index 115bb8f..e0387f0 100644
---- a/iotop/data.py
-+++ b/iotop/data.py
-@@ -208,7 +208,13 @@ def parse_proc_pid_status(pid):
-     result_dict = {}
-     try:
-         for line in open('/proc/%d/status' % pid):
--            key, value = line.split(':', 1)
-+            try:
-+                key, value = line.split(':', 1)
-+            except ValueError:
-+                # Ignore lines that are not formatted correctly as
-+                # some downstream kernels may have weird lines and
-+                # the needed fields are probably formatted correctly.
-+                pass
-             result_dict[key] = value.strip()
-     except IOError:
-         pass  # No such process
--- 
-2.20.1.97.g81188d93c3-goog
-
diff --git a/sys-process/iotop/files/iotop-0.6-Only-split-proc-status-lines-on-the-character.patch b/sys-process/iotop/files/iotop-0.6-Only-split-proc-status-lines-on-the-character.patch
deleted file mode 100644
index ae8540f9da9f..000000000000
--- a/sys-process/iotop/files/iotop-0.6-Only-split-proc-status-lines-on-the-character.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7814f30a5ed65acd07f284bba991ca557788ee80 Mon Sep 17 00:00:00 2001
-From: Paul Wise <pabs3@bonedaddy.net>
-Date: Thu, 28 Jul 2016 13:25:54 +0800
-Subject: [PATCH] Only split /proc/*/status lines on the : character.
-
-Apparently vserver kernels have some lines that don't
-appear to have the tab character so iotop crashes.
-
-The tab character will be stripped by the next code line.
-
-Closes: https://bugs.gentoo.org/show_bug.cgi?id=458556
----
- iotop/data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iotop/data.py b/iotop/data.py
-index c4e961e..d18ca9d 100644
---- a/iotop/data.py
-+++ b/iotop/data.py
-@@ -197,7 +197,7 @@ def parse_proc_pid_status(pid):
-     result_dict = {}
-     try:
-         for line in open('/proc/%d/status' % pid):
--            key, value = line.split(':\t', 1)
-+            key, value = line.split(':', 1)
-             result_dict[key] = value.strip()
-     except IOError:
-         pass  # No such process
--- 
-2.20.1.97.g81188d93c3-goog
-
diff --git a/sys-process/iotop/files/iotop-0.6-setup.py3.patch b/sys-process/iotop/files/iotop-0.6-setup.py3.patch
deleted file mode 100644
index 5844d86cb1ba..000000000000
--- a/sys-process/iotop/files/iotop-0.6-setup.py3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 98a5985e52e7041eb96c80dd95fd5c70634f5ee7 Mon Sep 17 00:00:00 2001
-Message-Id: <98a5985e52e7041eb96c80dd95fd5c70634f5ee7.1371536396.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 18 Jun 2013 08:19:28 +0200
-Subject: [PATCH] Make setp.py compatible with python3
-
-Dictionaries in python 3 do not contain the itervalues() method anymore.
-The values() method should be used and can also safely applied for
-python 2.
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 7150102..9de6068 100755
---- a/setup.py
-+++ b/setup.py
-@@ -7,7 +7,7 @@ from iotop.version import VERSION
- # Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
- # while still honoring the choice of installing into local/ or not.
- if hasattr(distutils_install, 'INSTALL_SCHEMES'):
--    for d in distutils_install.INSTALL_SCHEMES.itervalues():
-+    for d in distutils_install.INSTALL_SCHEMES.values():
-         if d.get('scripts', '').endswith('/bin'):
-             d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
- 
--- 
-1.8.2.1
-
diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild
deleted file mode 100644
index ddda92f971fe..000000000000
--- a/sys-process/iotop/iotop-0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="ncurses(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="Top-like UI used to show which process is using the I/O"
-HOMEPAGE="http://guichaz.free.fr/iotop/"
-SRC_URI="http://guichaz.free.fr/iotop/files/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!sys-process/iotop-c"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-DOCS=( NEWS README THANKS ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setup.py3.patch
-	"${FILESDIR}"/${P}-Only-split-proc-status-lines-on-the-character.patch
-	"${FILESDIR}"/${P}-Ignore-invalid-lines-in-proc-status-files.patch
-	"${FILESDIR}"/${P}-Actually-skip-invalid-lines-in-proc-status.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1712508b620a..1075650bfa09 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 9b056f83d023..40fe6e0ab7a6 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_113.0.5672.37-1_amd64.deb 95214264 BLAKE2B 87c0d1b0b5745e34c25dfd47fe8077cc6fa581646a35a41412fc0920607283f493d2b96cc3ea958a78d9d44927a69ad05bf4a5a6e4cbbed3e7232273ac50341b SHA512 654ab1e49b6d899348291fc6c26e88367dbc77f00f24b10ca4e9adf5746504f4ee130e6c2de599b10b1cc5a0e3951860d581cd4adcf6192fcb4cbead368ad5d4
-EBUILD google-chrome-beta-113.0.5672.37.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-beta_113.0.5672.53-1_amd64.deb 95531296 BLAKE2B e46e041bea4943e22de6ba78b504d682ba15cec49d62af4f181d955ec50fdb0105304791e773773c87f13ea32d39c459c53bf1309dcc14e385bcaf542052435c SHA512 ee0f67924c3a6b05dc832703f8f2d0764e7c16946b93914065bde9b823b01c4fc5b1c41ae331d2aa4d9fa1aca422a110eb9e310b5faaa4949068a45efb2fb615
+EBUILD google-chrome-beta-113.0.5672.53.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-113.0.5672.37.ebuild b/www-client/google-chrome-beta/google-chrome-beta-113.0.5672.53.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-113.0.5672.37.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-113.0.5672.53.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index a86210a754f6..b122280cc768 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_114.0.5696.0-1_amd64.deb 94617220 BLAKE2B 935354ee18bc526c2751f5fcc21960529a7a8c05c3191ba2c8bc9f4178bafd7bdac094ab7c62ecd3e2389f0a8abce6220b70648f8ba2ecb463775c867661adca SHA512 8774061878609fd957c1d6314410b9c0d0ec384bbd5d52ebca4f0bb1dd4be252605c7e5fcc1a18b500388e05a1cb1e0c0a1f650732db91feff13fc295819532e
-EBUILD google-chrome-unstable-114.0.5696.0.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-unstable_114.0.5720.4-1_amd64.deb 94402852 BLAKE2B 356f3c8eb6e9d2880bc9061e996174c61f106dd0bcd60d7d69c359bde6342ba02e5dc7310252bfbc471881d9b100ed835c20fc261f6d53d1ec488c4a15e4324c SHA512 7ed5f6fd423103278bbdfc1baf73dcd2c34eccdf22f96b10b497e385617b30c967055db88f31fbd6ab711605e1d1d6652cf1c014fbd629e4ceece2a0b3beca2b
+EBUILD google-chrome-unstable-114.0.5720.4.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-114.0.5696.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-114.0.5720.4.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-114.0.5696.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-114.0.5720.4.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 73c7ede87f0a..4e376fb8f721 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_112.0.5615.121-1_amd64.deb 93753248 BLAKE2B 355f903da16cd7de1c95ef96413fbd1f2f34266d828cbc318806d6a59a471633d80a7cd820c9e56ebb63a40de23e316d0a2b5c7b7cd3cc3382b2d319ec7b3816 SHA512 46a9960a9fa5b67802026996034a8c594d44689ad2300f07ca7d419a1ae06a5239f6a0a3615a04f6339f751fc8d80f207458d7a94befb127c356e6f5a8422e8f
-EBUILD google-chrome-112.0.5615.121.ebuild 2871 BLAKE2B d33eb944632227ca2807d300b1e606fc4bd3e3943b6b0dbc8a0a67e01cc153f81aed8bf2622e6d4289eca3d1f17d9c70a76de09dc87936238c50808c04b787d1 SHA512 5aa0d3739495372ce9b7b5cdf3b6de2befe7953f2e6b982a8e09b809fa1a6f768820676c36bbe08a39ab753439bf382dd779bcb25a6e3ed1231cb6c8ef0eac38
+DIST google-chrome-stable_112.0.5615.165-1_amd64.deb 93992344 BLAKE2B 6b0e19710b0b4ce71266e0de7a6aa780a015761e41f85da6aa102260d524cbac22a748d7fa983c8d81d66d04f0ce23e08b8e14a80939dbac9b210b5d4752a314 SHA512 7184b4e40bfb89a99abf678d91dbcba11cdd1fadc1dd3a271e0b709f0553f604865eff424d4bdbde5cfdc43b42d0396931bdfb256daf5e7af132f40687d59309
+EBUILD google-chrome-112.0.5615.165.ebuild 2871 BLAKE2B d33eb944632227ca2807d300b1e606fc4bd3e3943b6b0dbc8a0a67e01cc153f81aed8bf2622e6d4289eca3d1f17d9c70a76de09dc87936238c50808c04b787d1 SHA512 5aa0d3739495372ce9b7b5cdf3b6de2befe7953f2e6b982a8e09b809fa1a6f768820676c36bbe08a39ab753439bf382dd779bcb25a6e3ed1231cb6c8ef0eac38
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-112.0.5615.121.ebuild b/www-client/google-chrome/google-chrome-112.0.5615.165.ebuild
index e467ec7ecdbf..e467ec7ecdbf 100644
--- a/www-client/google-chrome/google-chrome-112.0.5615.121.ebuild
+++ b/www-client/google-chrome/google-chrome-112.0.5615.165.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 9318fb0d47b8..f29739d66bba 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_112.0.1722.33-1_amd64.deb 141301926 BLAKE2B 0987a7d19aea741686c6ed515f1fc97bd348b1246a4ab893c949a34c2735ccfcd081d09cedfb89b035bc92641a6b0defc293dfce9585ca228b099b85c3a6859a SHA512 b5fe1146023c71cd07bda17295f7ff4e2ca048fd562ced43a7b17023013d6bf07e9c18f8195200141e50c8dd6d662ec457d268acbb1b0f6d712e98296284014c
 DIST microsoft-edge-beta_112.0.1722.39-1_amd64.deb 141706874 BLAKE2B e0879e22b6428fc04d546fe3d5a309aab85666cb0596c6933fc95bbbdde47bfb1701f9a034644fbb4ea09c8e1af7c9665866b32fb18f05f0269599911b790016 SHA512 8b2769ef093f9343e853868fe6d3d827daf7c556344579b2df809e76e98330433cf4bab020bdd1b63f66920817c4ea0dd4e64a19ea47c4f86ef0054ecf047b38
+DIST microsoft-edge-beta_113.0.1774.15-1_amd64.deb 145733062 BLAKE2B 6c0ddc339556809f1e87e6a565cb79e687841628855ed8592ba2a2f0a837ad26743eb497ad746d8f45c2943c52ab57df9737d1c656424951ff209e2db3e112f7 SHA512 ae3279c37652f4367f3b31c7c8aa97f2da6f930ff5e466ae6cbd98ea50399b2b42652c1287402af4f39923bbcac845d2db5bec1efea7ab18e9521338a63e63e1
 DIST microsoft-edge-beta_113.0.1774.9-1_amd64.deb 145633010 BLAKE2B 83a5e2c379a634383dd11bfbe4013f0f41baf1bf36bedabf0dfe936a0efc367d454f494f0c780c282d3ba00ee5b758ec4e035ae1f127f23b7d3916272b1ab8ed SHA512 a456c12df8cdd818520d9ab5ed28077f651031f30730bebe5d9250201cd27a215e186673d0d590e4d794251b08f42f49a28dd7a839eac127c1147e67d642be48
-EBUILD microsoft-edge-beta-112.0.1722.33.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 EBUILD microsoft-edge-beta-112.0.1722.39.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-beta-113.0.1774.15.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 EBUILD microsoft-edge-beta-113.0.1774.9.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-112.0.1722.33.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-113.0.1774.15.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-112.0.1722.33.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-113.0.1774.15.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 683d1bd29bea..c452727510ba 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_113.0.1774.3-1_amd64.deb 145626390 BLAKE2B eb3f3bcaa819b014a06af32a296cd64f4770463a095715ec407d9c8c98663b77afd5aa7471958ecd78564c587bccf2a51e7c0faa765866c54ef7b35e18da7fb9 SHA512 7ed8d53f06bf5c0ddf444c3a1163cd7ac4a8a71368214543c579aad94107cc86240173426741fd48593990aaee10018b2c54a08ebc73785e526f4a529457d81f
 DIST microsoft-edge-dev_113.0.1774.7-1_amd64.deb 145607770 BLAKE2B 853b5048d611af9fcbb0ccb6c7e89974c4fb774ce79f5064562895a0694fad343aa002ff1523a08c3923bad651feeea280afcc26879ad1a4c8752de22e0ae021 SHA512 0e921e0d1f34536a6fcdfeb3a7dc3f33ccca982e8abb4faf48d077bff450909f543d3734045c8c62ae34d1f54470d695adedc298a76172e7036d0165b54aa4e2
 DIST microsoft-edge-dev_114.0.1788.0-1_amd64.deb 147070010 BLAKE2B 5ddb514c93c5cc30f0a3773bfb12138bb90ddaf05bdfdf5e8844bf8751d6c2cde941044b7b519ba7506bbd77665c9d38d5471e35f4f3c6e3e17c1ac77b0f8270 SHA512 612340100eaf0ccf145da358eeb84aa1b960a400dce90b8bc45eba0f7cb72b7c7a48ab0adf2769dfc049274c30d53e3bcef5716406258a471b74215c43cb527f
-EBUILD microsoft-edge-dev-113.0.1774.3.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+DIST microsoft-edge-dev_114.0.1793.0-1_amd64.deb 147103118 BLAKE2B 9274d3cc3701b15c592fdf89c6acfb63c8aa3936e80b59ac95af6f6a0514e54d192202c358a07adea263faf6309e1287d6407740e81613101bf80f5d2e3bfe35 SHA512 269550db62b647cbabd2ad9ad50bd4c9ccfeb843295e36a0de104892b5e67c067b9a5172fc02164203ed415d6b77098832d4b94bd5ee2252b510fa607a206820
 EBUILD microsoft-edge-dev-113.0.1774.7.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 EBUILD microsoft-edge-dev-114.0.1788.0.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-dev-114.0.1793.0.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-113.0.1774.3.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-114.0.1793.0.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-113.0.1774.3.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-114.0.1793.0.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index 93024843573b..4cbadb589d94 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_112.0.1722.48-1_amd64.deb 141877382 BLAKE2B cb8d6d3f027f0faa96a938f201fd494905db74a2ec18ebc2282f45d8fed11e1a70782edf4e0f0e78cf5d101793ba1c9c4a2a50291a0d894fd9664a479b20a057 SHA512 e21159de18d54fa9b92f303d7ab7eee856b21a200e1de3d8fb5ab86101553ed0d9cc8510f2b3da135458be6b8d3a3566dd00acdb76a88c32352551f9e1e8c5f4
-EBUILD microsoft-edge-112.0.1722.48.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
+DIST microsoft-edge-stable_112.0.1722.58-1_amd64.deb 142150282 BLAKE2B 66c1b33b5ffacd0793aa5eeb1fa43f94d1f999c3f178869998b25a6d018aa1bb3bf74275ec14a996b3c9d222bb9bf2e5dec17093b24b9fe20231cd8bd7126c49 SHA512 dfabbb2350cca517649f5842d6b4c6dbbd0b38ae4755fb622175d273e7327cdfbb82a8bbb89a218d7be828744852c69d14099c21a28d44d96a185e03bd226a0a
+EBUILD microsoft-edge-112.0.1722.58.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-112.0.1722.48.ebuild b/www-client/microsoft-edge/microsoft-edge-112.0.1722.58.ebuild
index 40e3af0e1470..40e3af0e1470 100644
--- a/www-client/microsoft-edge/microsoft-edge-112.0.1722.48.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-112.0.1722.58.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 001da2d7dee1..930b0e62a805 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_5.7.2921.65-1_amd64.deb 101597600 BLAKE2B d66fb428c3141af2e3dd2be30d7ba9be222a489e1ec06bad99ad1100f847cf2e0ef3a021440333a714bfe9b58cd14b593586244c902a3c7e4e566159406b120c SHA512 562a410031cdf77448fc7fb68555fe2148e4f4371798adf15466096fcafde45ac5223bee539fb166e8f5ec53c63155f38626a71d598a2b3b318ceef8eff0f968
-DIST vivaldi-stable_5.7.2921.65-1_arm64.deb 91114828 BLAKE2B 292c7c911da896725c4d28293570278b7509f324dc3c1fdfa75a8e0792c314345df93c7c2c107c8840b577f19e94cdaccde3a94ad22528675e1caa1f34c981ce SHA512 876a46ca2b5040f48fd4d9d13e2891230cc1d04c0bbbc278d4427d53490a13697b8581154424c1328fb12d71b9bd52baa45674fe87c4edf304621a6469a3097f
-DIST vivaldi-stable_5.7.2921.65-1_armhf.deb 90794256 BLAKE2B a2ae0724660f5c08efde5f82ed9f169d6789642e20c3a7330c98c4d1c2248d8c8ff02ed9a48d0935614ecf2bde3b4f0523aad14d61eafe60df270141a04a1514 SHA512 e2aca32ec207bd0614a9b037e3b5a2af09cf75e20c75ea51035efae0cf1f0d939a9b57a5f0f5d1592b119a0469c4a976763dfc067808eb0c283b3e3dfcf8e75d
 DIST vivaldi-stable_5.7.2921.68-1_amd64.deb 101588752 BLAKE2B 69c2d1af3871f9807721b0be605e77ece9df1e069c0026cf767abe8c709d64e7fa9e28cc08433a2028a991eb24737e2480b072b82da5b9fe7c0c3608b1a57b7d SHA512 95cc1f92e3a72478932921560ad617329146da068824bbd58755314f20cdb9bc6b5ad6d11832d7e7540f3773058c0d33e79ad099358db8bc3f30be65820ab5dd
 DIST vivaldi-stable_5.7.2921.68-1_arm64.deb 91114968 BLAKE2B e8fcc80bdbb2668fa52bb96812907eddb49fb2ee4fcfb29ea7022777a01082818eba9d9db8fad99bf88f7cf5f532b63a1c7d34c04e49f851f0bd1f6972724a00 SHA512 f68b4900b07ec1c028f472da1c7769c2767b3396f75ae9e3c26bcf6509f99e456fdb1065779f07ec03b7c824fe612e345e808af9f76a3c279d4ee164da6a5f49
 DIST vivaldi-stable_5.7.2921.68-1_armhf.deb 90800820 BLAKE2B c1ff1ec4d04fa5a03cb0e6607b6c499276d066126614a725ae92634e09531ef71331d184f876fbb5bdc6f5c4fdf456af1fef42dd6368d04d8e78c4863c153c63 SHA512 c9cd973a6e23dfa697ad6117572302655f495e6189683fb6b5566706463fb3b1e27e3852b66c63a9b46a338c392973685e9facf406103cf379e0c7c9faa42871
-EBUILD vivaldi-5.7.2921.65.ebuild 3861 BLAKE2B 05018b1e32f14162bb8474bd83b05054c13062aac7d0b64512cb4e03328a39e5d3ad6e3a44202b3e981d8b334376364faf8fa451d2c386a85dd4d7a7178be412 SHA512 072ed68bd5ce54a0bef67c04aec32918396637198a066f342819846cefd96d7e829e94cbc4196240bf5f5ccb00ac2ec5918996eb84d2874c6eed26e70f8280fe
-EBUILD vivaldi-5.7.2921.68.ebuild 3862 BLAKE2B 91406180625a8857fea93405e03d4b8a327ac43455da7ad59e319f2f0dce46460798eb8ff1f4ca419404f7adc0fcf3aa74c0e08f556bd7228988b10245d1b2b7 SHA512 142cef3923539dcfd7580cf6266322768a66061edaadd1483514d62b82687cd3e1e64ee800a43672488566ef0b99e70f2d432b7f7b4d8342fdaefee2e1a69469
+DIST vivaldi-stable_6.0.2979.15-1_amd64.deb 98024608 BLAKE2B d1c3496895d02d7e7940f4c8c2c7ae547ff7ff5fcadb1befc259d0d9c1688223794185dcd240620e20562c067f9cb0401afad8b36ff85dd62f599073421980b7 SHA512 a06b3b4bff040ed078a0e24f42c4ef6bb7e59ea9bc84c1d6e35cdf7fce914d1d1e98779867225e39047fa1b9ad94bc4e986d2400f11bd0b24697a41cee5dd9d2
+DIST vivaldi-stable_6.0.2979.15-1_arm64.deb 92692968 BLAKE2B 6264239c353f7b46545b675866b33ddd72af955d42fce902664ed0db9a82f4b8b657bd7894143183b0803adcec4ba2596621b8e8234e68a0e9e51ba85926fd78 SHA512 8cad20e2898d89b7235ad3adb11024b46a32e821c5d8fb12ea9a1f39a45508d47c5aab3f5a0f284ef30b89ba4ec2fed51c6423ef2684f0bd5b25f41684f4755f
+DIST vivaldi-stable_6.0.2979.15-1_armhf.deb 92549764 BLAKE2B de7a333f72fd29e873d1e698412046e134e84df5ad96b4e10585e4fa850c96a8439c34236792d07615c90e801c478d900e5003a00ca2edf47564ab0a5775a829 SHA512 ebc4c6cc7a0819d9472b8bb95d096dce6455a6892ee974e0804a4f0846b09710862f180b41ca9dae823d338772a0dd955b80f9dbc7e9ffcaf4fcc8146dfe6942
+EBUILD vivaldi-5.7.2921.68.ebuild 3861 BLAKE2B 05018b1e32f14162bb8474bd83b05054c13062aac7d0b64512cb4e03328a39e5d3ad6e3a44202b3e981d8b334376364faf8fa451d2c386a85dd4d7a7178be412 SHA512 072ed68bd5ce54a0bef67c04aec32918396637198a066f342819846cefd96d7e829e94cbc4196240bf5f5ccb00ac2ec5918996eb84d2874c6eed26e70f8280fe
+EBUILD vivaldi-6.0.2979.15.ebuild 3875 BLAKE2B 40a23c70cfca9ceaaae67905c5b3cb89419c9058575dd81cf62989bfa3ff3755fe48bb444313535204a358bfbf1d0f3ec6e1cba423eacfbdde120162c5541666 SHA512 d2c67752a2d67dd22dbe9ccbbe93cf42db16ab8726ba6d6b766be44acdd5bc0970b3f72b91c312e957c4b58902e131e6a4a9c18a70d189edb4ea3af9f708f721
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-5.7.2921.68.ebuild b/www-client/vivaldi/vivaldi-5.7.2921.68.ebuild
index 28280ba78958..736fa6da6189 100644
--- a/www-client/vivaldi/vivaldi-5.7.2921.68.ebuild
+++ b/www-client/vivaldi/vivaldi-5.7.2921.68.ebuild
@@ -97,7 +97,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/vivaldi-5.7.2921.65.ebuild b/www-client/vivaldi/vivaldi-6.0.2979.15.ebuild
index 736fa6da6189..0153c804d616 100644
--- a/www-client/vivaldi/vivaldi-5.7.2921.65.ebuild
+++ b/www-client/vivaldi/vivaldi-6.0.2979.15.ebuild
@@ -13,6 +13,7 @@ CHROMIUM_LANGS="
 	bg
 	bn
 	ca
+	ca-valencia
 	cs
 	da
 	de
@@ -97,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 7c36db1ddb47..9f403aa4b996 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 5c12860927cb..4416aa377e8f 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_113.0.5672.37-1_amd64.deb 95214264 BLAKE2B 87c0d1b0b5745e34c25dfd47fe8077cc6fa581646a35a41412fc0920607283f493d2b96cc3ea958a78d9d44927a69ad05bf4a5a6e4cbbed3e7232273ac50341b SHA512 654ab1e49b6d899348291fc6c26e88367dbc77f00f24b10ca4e9adf5746504f4ee130e6c2de599b10b1cc5a0e3951860d581cd4adcf6192fcb4cbead368ad5d4
-DIST google-chrome-stable_112.0.5615.121-1_amd64.deb 93753248 BLAKE2B 355f903da16cd7de1c95ef96413fbd1f2f34266d828cbc318806d6a59a471633d80a7cd820c9e56ebb63a40de23e316d0a2b5c7b7cd3cc3382b2d319ec7b3816 SHA512 46a9960a9fa5b67802026996034a8c594d44689ad2300f07ca7d419a1ae06a5239f6a0a3615a04f6339f751fc8d80f207458d7a94befb127c356e6f5a8422e8f
-DIST google-chrome-unstable_114.0.5696.0-1_amd64.deb 94617220 BLAKE2B 935354ee18bc526c2751f5fcc21960529a7a8c05c3191ba2c8bc9f4178bafd7bdac094ab7c62ecd3e2389f0a8abce6220b70648f8ba2ecb463775c867661adca SHA512 8774061878609fd957c1d6314410b9c0d0ec384bbd5d52ebca4f0bb1dd4be252605c7e5fcc1a18b500388e05a1cb1e0c0a1f650732db91feff13fc295819532e
-EBUILD chrome-binary-plugins-112.0.5615.121.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
-EBUILD chrome-binary-plugins-113.0.5672.37_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
-EBUILD chrome-binary-plugins-114.0.5696.0_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+DIST google-chrome-beta_113.0.5672.53-1_amd64.deb 95531296 BLAKE2B e46e041bea4943e22de6ba78b504d682ba15cec49d62af4f181d955ec50fdb0105304791e773773c87f13ea32d39c459c53bf1309dcc14e385bcaf542052435c SHA512 ee0f67924c3a6b05dc832703f8f2d0764e7c16946b93914065bde9b823b01c4fc5b1c41ae331d2aa4d9fa1aca422a110eb9e310b5faaa4949068a45efb2fb615
+DIST google-chrome-stable_112.0.5615.165-1_amd64.deb 93992344 BLAKE2B 6b0e19710b0b4ce71266e0de7a6aa780a015761e41f85da6aa102260d524cbac22a748d7fa983c8d81d66d04f0ce23e08b8e14a80939dbac9b210b5d4752a314 SHA512 7184b4e40bfb89a99abf678d91dbcba11cdd1fadc1dd3a271e0b709f0553f604865eff424d4bdbde5cfdc43b42d0396931bdfb256daf5e7af132f40687d59309
+DIST google-chrome-unstable_114.0.5720.4-1_amd64.deb 94402852 BLAKE2B 356f3c8eb6e9d2880bc9061e996174c61f106dd0bcd60d7d69c359bde6342ba02e5dc7310252bfbc471881d9b100ed835c20fc261f6d53d1ec488c4a15e4324c SHA512 7ed5f6fd423103278bbdfc1baf73dcd2c34eccdf22f96b10b497e385617b30c967055db88f31fbd6ab711605e1d1d6652cf1c014fbd629e4ceece2a0b3beca2b
+EBUILD chrome-binary-plugins-112.0.5615.165.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
+EBUILD chrome-binary-plugins-113.0.5672.53_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+EBUILD chrome-binary-plugins-114.0.5720.4_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.121.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.165.ebuild
index d94dd5bfe69b..d94dd5bfe69b 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.121.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.165.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5672.37_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5672.53_beta.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5672.37_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5672.53_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-114.0.5696.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-114.0.5720.4_alpha.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-114.0.5696.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-114.0.5720.4_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index bbb8e760280f..e91ae382c8b1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 4b3aab8f7f76..346c8726a441 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -2,8 +2,6 @@ AUX nginx-unit.confd 510 BLAKE2B 03cb328cbeef1baa1cf1590b11e8019efae98729ffd44fd
 AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa
 AUX nginx-unit.initd-r1 799 BLAKE2B 867b159e37a0e4f7aaad472ce3eeeb1f19814f15969d4fda6a65bda119df05491f9e9cee20cba191b51dab901a332cc2ab95bb4048589db8b0966736ebcd0d22 SHA512 1494cdfe368a32ba47c34730784c66a6cc408418a4d55012713c48f5a78abe31117f0651a5d5952e3b6ea17371232a08465189dffd4b35cda19a329ba5a43de2
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
-DIST nginx-unit-1.29.0.tar.gz 903909 BLAKE2B d9e2544ce7ffb4f9a510afaef2ddbf54a4482558d0cd3dd526c1371413e32fc72e848c95d3866928c1accc19bc2aecdb4c26b6907bfa57c382db53cc2f9fad3e SHA512 6b0a6718be5c3312f5e17fc39ae35ca849049c97d29c63a7effda7f994274af29eed88970389bb3010a2103c431e69920c951de5004853004d1aa604d868bd9f
 DIST nginx-unit-1.29.1.tar.gz 906654 BLAKE2B 1068a1002b05f6f9f28b19745e3c1c0f1d1def89fad8489174fd7b38ddd8c9678f27a3b105f98a17d537621cdd2cbedf9f39b4c284a7918d290287f3c324fa49 SHA512 c99cea78804ead999e62777132fe204e0f87e1b58e55b0b4a074ab8d203149c14c8faef64872a44404f8fca5bfd98d2f9e4aae2db89bebeee15f27cabbc9f247
-EBUILD nginx-unit-1.29.0.ebuild 2084 BLAKE2B 19e9e6168c0fd1872f18970865f5ff2f3d271e7ed0dce4f82c65db3f427e36399b2bca565734e6d999106fcec423e11fa434b69afddedd694d56b7a0a6401bac SHA512 6bf62218235d83f3e8f6b0cfaff4778c30c4618acd0ba6782979ecaddc73734c8ed87355930e780f8dfce1c1cc5c59098fdbc7a1ba78f2bfbce025a3ac84e986
-EBUILD nginx-unit-1.29.1.ebuild 2216 BLAKE2B bceff33e4a21737e4ae9abbf574db61cdf769ad97c25997f5b0ddc207783549fd168c3bea83c3f5460c95e3a64f8e7749f5680f1b410f70fff2072152fccf7e8 SHA512 c66f9ca8686e5d9e07b0da63ee8d6a6775f63000e61a38e960efe5a8b50311eea31e2ffc516de64d120cbfe1da454b27c591df08928e9695fc7756e2486830b3
+EBUILD nginx-unit-1.29.1.ebuild 2215 BLAKE2B fc5db358d12ec328a969e6b0260e3fc89b4792abb0c689661f1bbbdd52ca2c6c2733ce17499803b6e153ae432d1d3a62212ded0c6c4b47ee7fb7de8a386c5a44 SHA512 70e49718e8b243146a01e4461d4e9e95d57f13f4fa577e6370dab4d176f2134dc353a75dfb79a2db6e8dce1a6a856443af1b8e1cd6e902a1b82bedb0dbdfa0e5
 MISC metadata.xml 830 BLAKE2B 9ff8b1d0525b28b0310f0de99abb99f1bff74a5effbc1bc3bf991e338a3f201a947fdc1687433ab0e9b6849c14feeaed2b5fdd8ba770fafa62f00f18158bbc60 SHA512 9fc506c23c1f5031774cb74823d8a5090dc8920f0e6e7e22bb2e46ae6df4e9705fa65033b57c5452310ba342ea520757a5f14bf9d1828b47101a2d5382ea1c57
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.0.ebuild
deleted file mode 100644
index 84e4d6134d50..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.29.0.ebuild
+++ /dev/null
@@ -1,90 +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 flag-o-matic python-single-r1 systemd toolchain-funcs
-
-MY_P="unit-${PV}"
-DESCRIPTION="Dynamic web and application server"
-HOMEPAGE="https://unit.nginx.org"
-SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php7-4 php8-0 php8-1 "
-IUSE="${MY_USE} ${MY_USE_PHP} ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php7-4? ( dev-lang/php:7.4[embed] )
-	php8-0? ( dev-lang/php:8.0[embed] )
-	php8-1? ( dev-lang/php:8.1[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:=
-		dev-ruby/rubygems:=
-	)
-	ssl? ( dev-libs/openssl:0= )
-	virtual/libcrypt:0="
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	sed -i '/^CFLAGS/d' auto/make || die
-	default
-}
-
-src_configure() {
-	local opt=(
-		--control=unix:/run/${PN}.sock
-		--log=/var/log/${PN}
-		--modules=$(get_libdir)/${PN}
-		--pid=/run/${PN}.pid
-		--prefix=/usr
-		--state=/var/lib/${PN}
-	)
-
-	use ssl && opt+=( --openssl )
-	export AR="$(tc-getAR)"
-	export CC="$(tc-getCC)"
-	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
-
-	# Modules require position-independent code
-	append-cflags $(test-flags-CC -fPIC)
-
-	for flag in ${MY_USE} ; do
-		if use ${flag} ; then
-			./configure ${flag} || die "Module configuration failed: ${flag}"
-		fi
-	done
-
-	for flag in ${MY_USE_PHP} ; do
-		if use ${flag} ; then
-			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
-			./configure php \
-				--module=${flag} \
-				--config=${php_slot}/bin/php-config \
-				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
-		fi
-	done
-}
-
-src_install() {
-	default
-
-	diropts -m 0770
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
index ecf1568f4165..70a236f59bad 100644
--- a/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php7-4 php8-0 php8-1 "
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index ec1c81ba998c..4b149eef0ff4 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 711e1b3f179b..df6a3a3ad83b 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-dict-0.8.4.tar.bz2 526227 BLAKE2B da8ade9ad62dfa086c1550868d28883c1a87e90839d164f52abe92189c62981b0e3b33fc428b805d608871e1c5afb0ec9df94d5239eeeed15e16372b2592e1df SHA512 f662b94671f2179cc93010e9ff6ad7f3425cfafeb8d7c635fefb8e816d78273f0135d6c7ff3ed143e5e01985eb4275ac89827d197ed059fbfa79df69b327f253
+DIST xfce4-dict-0.8.5.tar.bz2 514096 BLAKE2B 5ababf17457fe972794e1aca0a4c031af8c3898e97d46d3d4ba26a0b24bcaa750255dbb084157525650f91a19de8aca9437fa662f70e2340d43b0ab6ae935ebb SHA512 4ff6e881c4dfec6cc6a2e9a33ccad1362d3304e58d91cc5da9305a937c7e3382d9c2ad3356d9e4d5f080d4368f7e0f3ceded1c2fbf18bca8ac7903310d22ffc3
 EBUILD xfce4-dict-0.8.4.ebuild 962 BLAKE2B 714f1cafb54e042ff07b5bc2bc6d5c102ef15f3a6f0402a4c92f81574be21a7b30cf1d4c77c738b180872f9bca6ed1e0c92a6d3da7a57b3060e9819a69c0ee7e SHA512 2972ab843cfd9a8f3d68b0b4fa3e8a0617abb910cd7d961a9c2d4d91fd00126689f2c0d0eea75e2dec0ca122ac211fd98d5d1a1714bdeda63b47535e2e1cc79a
+EBUILD xfce4-dict-0.8.5.ebuild 1018 BLAKE2B f0175a4e176bc885ac1ddcb4a5456071ee3b4ecb9d2a7266c761636bf112f03ba4a87da5c4f8ab73d74cf60001d1e583a652d4b46390bfc8d5e30cab6faf3f3c SHA512 730d9e49f92a6196b19bda874ea0985bdd9dc5b28bb3518ed760a63f533c6e1b36f3009df9588f942077fad8adc815315ce041a81c198925d4de6d105f041909
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.5.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.5.ebuild
new file mode 100644
index 000000000000..264838b8e419
--- /dev/null
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
+HOMEPAGE="
+	https://docs.xfce.org/apps/xfce4-dict/start
+	https://gitlab.xfce.org/apps/xfce4-dict/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.24.0
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.10.0:=
+	>=xfce-base/libxfce4ui-4.12.0:=
+	>=xfce-base/xfce4-panel-4.10.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-04-23 00:06:15 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-23 00:06:15 +0100
commit	0e1abc96fea41c994e56391bd01c5c9298236783 (patch)
tree	53f4297b17f44131f819fb0ae2ce606dc7121108
parent	cf59cc78468c9bcfef9e16b7b27c115896d805fd (diff)