gentoo auto-resync : 28:10:2022 - 15:59:37

author: V3n3RiX <venerix@koprulu.sector> 2022-10-28 15:59:37 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-28 15:59:37 +0100
commit: cf7630078a53ff74b245b148bd722994068e28f9 (patch)
tree: b2410f6c46e821d66a697e1b7e551607357264f0
parent: 8eb973cc2247ee4fe34e4d907fdc6cf5b94709e3 (diff)
265 files changed, 6663 insertions, 7252 deletions
diff --git a/Manifest b/Manifest
index 2f7c901bf4fd..f2c15338d492 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29668 BLAKE2B ef0ec56186b0503221e86a0950660b74b734af03b56e77e02f02984f353670f94baf6aca63eb3ae1d9e25c3dc227b5aaeb93f461b5ea6174d4566f09500c0787 SHA512 4c7baa479bc97b3e3f555e7b81fe9bd0c0f1caa95dc18d7d0d3fac2f2b9be492910f731c650d67fa97bca51b4dbace87ad2a5014d42ecf2b0abc3b588c555b1a
-TIMESTAMP 2022-10-28T07:39:54Z
+MANIFEST Manifest.files.gz 29626 BLAKE2B 277b8c8fe7e53ae4decd674ea68601cc4f6d644b69fc7e1e87827be2e1ed2d57f843de1c41da644aebad60e0986331714d788de039ab840f7361f9461157f8f8 SHA512 46314e1609e560fc9c8952b494aa7185c34e561e68d75158a5671ab736ec59bd2601a6bdea6ebf79e34028fa093e0af0fe39b99bec8da276585e757d5c4c1b13
+TIMESTAMP 2022-10-28T14:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbh0pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNb4rFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDryBAApte5CJO2BLbg/5z0CgJi9qo7EyaNy3wTx5NUnbS1KnnQABhsyJ+BYYZ6
-jjiIu5yQAcfxTMMVsZtY2Y8aIvJBJlTWMYjRmPMVN/f7TX76F9/cvXrTnzoJ51bh
-mp39Fw6kgnqu2BIH5I2VXZ9bbYcs1WYaYOc/zf9WIA61YHApnFITsFysEtsFPsDI
-A+1vMf+rhmU4I9CcUaoq+YSHbFBpvcFYH/yMuzfKA+CM15LsknYL9rXHCmhnmZVD
-zr8eXrJNZG4wECX/QioCd2ZhepNSPqMESPsefnnS1jcBQffqDtI7Hiq2eBxEdNaZ
-lyqeZNxjMfp+Mj6zbx+j5U3B7JRLZ7TwsANOY+bWF2/js1EnnsTspPs4vXJfDn3n
-fceuridDm/UUmI8vgMcGE0JdMkpVM6daE24fBijfX6x7YuS26BDM50NnQo9hIJW4
-MNL2UkgczvKCM5D4Jqj2g92itpqfIF+JB9XQQxK8WX8bFjJVKXyOkrhPBDLpqjEh
-JfqI0MAmmluGRZg8w84Tx8Bd6NEZNgMri4Vz2xjvPZ8XNMXs/tTPUpbLA4FE1NDv
-mdHAkuKgdBoQaRxVXAk1uf3tZbQ2v/hO3xgN+fm4JZzR6qCPvXgrClnli1fuPSRG
-dqm9QuAoT3DpSDuwp85GVK+ELCcZ0SVWoYjJGoPv47qyfutBbFw=
-=CXHd
+klBlhRAAtuGD6JX5vhHLKHDNzI+/numecDCY9lhYnhKy36U1A3Y09QhKzaX8yDEf
+kOLWX8+JcrWIZd8obu6zYuWbBIxslc1aYgbEOoijQZ/psMeipde4dhSlPHI7HmfD
+zEofeZ5zheObKPN6lIuHIWFZvwOEZmw9L+VvTGGt9Vzt1eqiReFi8XRuDxXfZ0JM
+S+IH/n0nMfvSkNg5Y0fvehabCCuuRH+eh/81nm9kwFMofqMHB/Wos5FzJz8IsgQb
+E8lvD4ITXPEMrBqPYLlgxiph0OG93kdG9GWpITUFoRXCiStYizoAnIanTekHI51e
+iDbcqpegbHUqjXHYTgJl8KgKn10GS9jLfTOf7CxO8+EVfUbZarF3FDezlk58H2SX
+DFMqC719m4I4oW+ZYtuh4y2f7TNoXrauBRYfbJnABPIOwNiv7Iv8xNIvkpGJnIPw
+NoxhoPamtLd5mDKIeG5e6aHlg4A5AJsNk4szFWzVtKkybY4vE9m0MlGdjQw/X5an
+pNmz9C4XyOK9hVg8HZwehyTI+k/9manzB/5zhxpHIAuPgG5EsTUuj4q3rgToQYDU
+Ib65wavTnGIw6aRTj5/f1o8VQ2w3Kq+xxunVOrav4i4IpozY1rFQl011yw+uGz2F
+5H4ANOh4QtAiVSCHzGlqPqTv1nHklGd+n3/TzlrWqhUhkMgMPbo=
+=goD0
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e59e00b289e8..ad4592138e98 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bc71fd350479..62c1155de8a6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 8398236cefc3..9a3218e9cbdf 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,8 +10,10 @@ DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e450
 DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da0291b3d5a6dedf0222302ca16576f49734d31891265c8c1d218a0308a76074301babbaa39b37e1564107e2ab6adf8a92 SHA512 7a0aa149d3e01b256e0f3168ceabebcbeadb0d8bbee6838d646cb425571b26330cccbcdd3a221f7b57a4605e875f48e48cd367825623299dc43d5ba77f94c50d
 DIST syslog-ng-3.36.1.tar.gz 5968598 BLAKE2B b74536e20ae2a2eac056fe278f2e7973b3c97657cd80962ee551812633045dbdeb65fe34b66448d565a6f1b9edb2f1066fc1934d3f7ffbd43b9527a73a181e58 SHA512 b74c10e708616f7f5f5d529de5c1a3ce8ac888c05aa4b0fcf390d70082e9bc3432f3752998a5a258663fd47b8e4d0c2735240a3e4eda28178579b18308ebb376
 DIST syslog-ng-3.37.1.tar.gz 6033219 BLAKE2B fe3787daec137d5eb61c6bf55d6066b642e7944738ec0655fcc7ddf8d0c841a734ec423b0710f424576fa78bbecfb1121475921e6f8bf896c10470c89dbf98c8 SHA512 beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7
-EBUILD syslog-ng-3.34.1.ebuild 4875 BLAKE2B 67e9fec7003b0f0da9a90873a009f20ed3f4aa66fc33b3acb6bbfd0a317d380c1b2306b6043a135535cc44b7802568c611820eaf23fc4819dc7c8968286c8481 SHA512 1c5bd39853364a1e1dcc79e97ac88bc4bf38b4e94152eb7f4a8acafabca9da8e6a71a509b28658b92871672a1e518ca8ac2355515c3506a742e182c2eef04e72
-EBUILD syslog-ng-3.35.1.ebuild 4876 BLAKE2B 91ff5899b72a81743ab3dc7fb26076ce83788b2068e5ac7cc30ff5e375add7fb5f4957ed2e5e0320f80c47e4dc803778c3423079426649f6d47dc16bb7e7426b SHA512 24e3c0b98dd9b50e442d4be5fefa9fe12aba92847bc2f173ee59aaa27a75b9d1323566b3f2deea065ac7a3ef620dba11b1cf152206c77e650b1c55780be54eca
-EBUILD syslog-ng-3.36.1.ebuild 4885 BLAKE2B a6e10cd408691ee8aae45c2ffa874f870038673289b756fbce720db491bc87dcbdade0cfbde4e605fa1255664ab73282904d1522f744e2ba2cba65b990947c71 SHA512 1793e5bcb7ee2ad400c71a611578bac44f4c8a2cbf3bfcf2d8dce49ef44ffba198999a3b98895d1fd8d8a4ecba146a55441ec11527b7e52fdf38e0c1e54c942b
-EBUILD syslog-ng-3.37.1.ebuild 4898 BLAKE2B fd9245c70b04b247ca5f463acc0ed923b25aebef5716a92096ed218f739181884fe18d725ad0e53cdf0be2f0507b1336665a08994d4a0335d202ef169f50af8d SHA512 e208187804c1bb9fd62668c23fd3072c5305e7041299a98e4c1748574cbbc1384636137143967754a4e4f2f52bf9b1adf46adcbe3bd51c0e236308e40ec88936
-MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
+DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847
+EBUILD syslog-ng-3.34.1.ebuild 4889 BLAKE2B 1ae23a11a372441c56a361cdba6592551ac19ecb1595fdb8c30024ecade0139957c1c40df19444627e72d1498bf7665ae9212855bc244a57e76007298208a3f2 SHA512 62b1b068ecb483509e24233ded2d04478e98c218928e2cfb4cf13fca6cee98438fbe1fb4e5a85df3e6b839e0313e6555d5dfc405f93ee2698e30da3d7950ea41
+EBUILD syslog-ng-3.35.1.ebuild 4890 BLAKE2B bba9a0ec5902ed72742980909971a79f4ee4bc1cb4eaaf0db620be55b17680a7d8878a931d68889b42d7451b9b36035bf61b0a7b941f3d8f07972c3dd7221e14 SHA512 152d923c2909be1353093320ecd29b47c330fd81374bf51c2c454b0cb65bff192713a21859be25a0c5412a5ef7731affa56b7e6054082f5503e6b11c784f4d61
+EBUILD syslog-ng-3.36.1.ebuild 4899 BLAKE2B 2aefb6ee7b9f68bc1b9021866b648c0d03565709cb05b400c5133e1156dad43297277dce06ef9555c5797579650eca6444be6f68fcfc55d80c9fc82248a2493f SHA512 78b06fc516246d452ed5ff88f216ea1fc74e63719d2008fbe60be26946daec59d9aed57498c5882dde1eacfba1b5dc3b45b081b4772a699fd860441d0078a068
+EBUILD syslog-ng-3.37.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+EBUILD syslog-ng-3.38.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+MISC metadata.xml 1285 BLAKE2B 91f0ecae07c9131f516a2b9dd6b71d021c84cde055ec58b21734b36f540f65b02452ac20dffaac4a3edc8942ad9a1a1afc3c9837ea4775d40d0d8b3d41083316 SHA512 80924020dccf9bd8d1a83d995af57644eaab761204e2b75a3ef997a2b7582506ba25f476b6203446d116af841629520adfa1cfe443c6e1547755e72956161eb2
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index ba670d623e06..d14d65a0a573 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -22,6 +22,6 @@
 		<flag name="spoof-source">Enable support for spoofed source addresses</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">balabit/syslog-ng</remote-id>
+		<remote-id type="github">syslog-ng/syslog-ng</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
index 1f9d4085ac77..d6092f450695 100644
--- a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
index e90b2ae809a2..370e085506e5 100644
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
index 18cd7826fd7b..bc68263f9a85 100644
--- a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
index 6914d08d03e8..29cc2377063b 100644
--- a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
new file mode 100644
index 000000000000..29cc2377063b
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.4
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp:= )
+	snmp? ( net-analyzer/net-snmp:0= )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/criterion )"
+BDEPEND="
+	>=sys-devel/bison-3.7.6
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable kafka)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable snmp afsnmp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d1584b864db7..d8f008c351af 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 1315caa429b1..a829cf9d2fd5 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -15,11 +15,13 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bet-1.0.1.crate 7163 BLAKE2B 173f38b378ec7a3bfbe6c180d0988af381cbec39d7637406c1d9a70ede2ba097dffcffe79161be9fbe82816c9b02e6d950eeec035882974232bf160db29459e5 SHA512 15309942fd6d8365d7dd31dd0051fc795236c08b098edb605465375d2132a40bc898bdefbac71f5717b248cea6d7b70b8cc72b9046daf684db76458d99288b48
+DIST bet-1.0.2.crate 7388 BLAKE2B 12f4177fe03ba6aabc8f09834c52f68d00d55331d27881afd0f1bde4d19284d3202e11dfecc8b4b5ce4874e0c18ecf70d66c9b01b725d80288e0df2e4181c890 SHA512 f674a4aec85da8aea93d07babed4f18700137332538eaf8dde5ce7a2eacac049b913758026af32987b1931b0047751a855409ce2c88108840677fb120320585e
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5fd1610e7e28731bd5cc44c9513f2c7eb52fa1be0b4eed65bffe130ddc98c95dfeba2f9de28ada4091396e5695d SHA512 4848d7ec592642913c7bd06cd3a0da49d3bb14291866cd22ead8e9a6b2939a787035d5cded87be3d2d3491283e31ea2cfb105885df4114720da98beb82990ee6
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST broot-1.14.2.tar.gz 10043403 BLAKE2B eabedf5eb0830b78563f8cdf146f86d972efacbc490db73937a1a3dcd2108e798b90cb4e24c53d5a62172c5f053ec25f006ea995ae233b200640e6a6090c87ef SHA512 ae48ca96a4c99a50bcb1ad752b3a83b6831c337ddfab6b7c4618f5b57f6262bab7ac677f5dea351d57eb708364be6213eab0f74aef9b18a800b38fdf91f991d5
 DIST broot-1.15.0.tar.gz 10107762 BLAKE2B 753cb852483316ecb0a7ce74042fe53550f344eef2576951271d0290b9f6001c0c84a85b13f481698c6054ae06aa085e6c80e3e4cc5bb735a38fa8c1f256d853 SHA512 0a0e4c800ed43ed317c81202a5d18a8b6a4df4362d2e1c9383955dfc4a30b6b28e0bfb07e89a66ec10edc37250a65c0206a816e07bec6f810df32a2c48f4cc65
+DIST broot-1.16.1.tar.gz 10131628 BLAKE2B 645dc29aa994badd0f6ca8f2f52374edaad089618d0255a8ab61bc12a4207e7ea8c77af7e351908190ccd77bdd49bd824d14c9a188ddf867da54fff4c31e35b0 SHA512 4f71d4a1b46d346b7281fe7ae6d6f649bc8bd6ca0f8a0b138c36d13e2febdfa29d4a117253408b1834312c68702ceb4496ed768846dd5e3b1ea9f820b526adbf
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
 DIST bumpalo-3.11.0.crate 80945 BLAKE2B a740a674d0922794cc71b87a8bd686f677f8d0b38d88cc43467b7f8f6d1368ef5cff99bf10867d3c8af9b79b71deca7e5bfe78670b7890b04e468359780d8c76 SHA512 f747b5743bd2825c62c363ec49f1eccc492d7cf8cca8101aa9733f32489685c1777344dc6183f83c772f1067f9648b953d3ae1034976a14295f252f1ee7788fa
@@ -149,6 +151,7 @@ DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d
 DIST memmap2-0.5.7.crate 26229 BLAKE2B 4e7751946a870dc3a3978daa51e524a7bb993f100debb778fe1fabe64f61dbe9c01042f02242d8b8be583a35672696454355e79981accc29fdb78989f8e0f12f SHA512 467e55a193497749f3dc7ed228f85622d072e07929a0c76904f0aa7a605f7689188e2b980ab17737301656edfcf86d851a482088c2f73f2132421612bbf08375
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST minimad-0.9.0.crate 19223 BLAKE2B 2d54da14a5eccb00e34b475d394f58a4fd24924ffc83fd8693659c0c5983806af41f9d17acfe50cc58e5e3f764074ed53fba15917b81cec0eafbddd4913d001b SHA512 e4deb76ea2f9e1cb0ca05406108ffa1d9a9ecf8af3752f6d3272e0fa595c4b659357084dc12f769ac843e13f7a9216fb7b470801788d9b0476001251bb950845
+DIST minimad-0.9.1.crate 19494 BLAKE2B e2380d676d1635409d013dda401289f52c0db05e6e0318c8c73ef109c7d5c4f99ebc731d2164a22d19ef63af020887faa792c552c4f5e116abf9043c47b6a197 SHA512 6b98b28322db8bcac5e1b6a095baf335e8049eff8430fdf5ec50c78589e971b32abe5821dc2151d39c3ae64a1f47c16f677c78b53393f9eaf321a59a32a1ccf8
 DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST mio-0.8.4.crate 93013 BLAKE2B bc9722d2211195dcfaf574d83b2967d299eb02ff40b4fb4df2eb6b08d78e018ae1a9e198f43268ab2d38733feaa8298e9736dec9fb9add66c401d57406fd1292 SHA512 b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
@@ -248,8 +251,10 @@ DIST syntect-no-panic-4.6.1.crate 732925 BLAKE2B c93d1a0c3ad61c4c091968b5c033022
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST termimad-0.20.2.crate 353272 BLAKE2B f5b79041f015c4891772184764e6f8fbdf96b5fe1b8a9e5df5212f24ee4c065d6aa65352f1cc45eade14ee499a97f547f12f73003fdcbf575aab43b2888715cb SHA512 424a54b7368ba9aba244f857f5600c0719e6be28dd968d6542080ae1ea646ad24de934ffe3abd27f6edbb42e0c103c7baffa3be691d3015fb36d319528323f60
+DIST termimad-0.20.3.crate 354190 BLAKE2B e405b20d67f5d54805d2906569e7a817a040693b1e2c15b7b9a3603701a9d4cc30ea64b69cbc1419e43590b0367d5ca24951774eee6177214c1d15c3453ab307 SHA512 7d83d49c0ce02ae91872c92f4d9a4c6ecc52d59afa4d948ee32bb7bfea01527b4af61557bca1b8bee1378fc72d22ed68b43e959dc96eee4f18c47ed6b35c51c7
 DIST terminal-clipboard-0.3.1.crate 5597 BLAKE2B a05f67c1ebce2129a2b8130cd84fbed579c67ae4d46bc4f233e6ae647a2693e5c1257ce3882a21345b596c487cbf5b339ef907f417aafea4bb6f980113aa31eb SHA512 b29a81d2737271cc4e60115e473ea3af80ce45f078c99fee573cbd35da8e27c939ff1aa86dd86a3e2ea9352a28f2fd3492e28be63c3eb0dad53974d06b43c346
 DIST terminal-light-1.0.0.crate 38533 BLAKE2B b4b42796d84d18414955eabac8798ca26479e1189ecd0ba037c89ad4ec6fd3f9291cc2d6f87bdb3e9e4bf671006c8b0555b9e18d95f195ee4e82d4611109b6c9 SHA512 2414c6cd98ae293556552ad0a5fb198f148be05dc1336bee65b31d864aaecf4f85442ed9f1c34bd1a5968e10e6d015307e32173e75c2a80fca9f3df3374db598
+DIST terminal-light-1.0.1.crate 39115 BLAKE2B b4a8ec843c84a22b7de0f607ed4ad212f503142ff3e0085903c7faa2a9c0058f7de019501dd04becb7913f7ab6f988d79d07efdd6d42cfe233f0ba3468367edb SHA512 0547e006add17b0a363bbe792a1cab67832af3fe148e85b5a00a70651a01e8d8fd8a7cc1e720093d4223e50fe10277389d72acd5b3b738bfa6027be35e7fbb80
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
@@ -310,4 +315,5 @@ DIST xterm-query-0.2.0.crate 6342 BLAKE2B fd6a99cdc190d4e7bbf03467f1493c909cfd1c
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.14.2.ebuild 5724 BLAKE2B 078794cdec951e8e1142e4be2e1586c03c56439db69ddac356de226738bb4dcefb6cb91a8281d73e781dd42a9079e49a0ea8a18a88fbc31d1752cb39a23bf4a5 SHA512 4efca025ee02615d770bc323744b0079f0d4390ad45e0c49b9cf5f242543ebcd7499f01291a40e80d7621e89674057da056f4c2ab7893005973d81f8ade2404b
 EBUILD broot-1.15.0.ebuild 5749 BLAKE2B b95f74dacc192ae729970b92083f50b9146edc0eeee9e795cbcb77a708ecd87a768f39375fa5a82daee191ab698e3408c195859487ccd25067e4312339cefb7c SHA512 036238be8dbec252ae23bc130f0cbb7b968802486ff2f4799c5dd51b47df2a292daba38d3da17c00752f844ed1f1740dc1b2672d83f89a5b8dc4cfd4aeea4bdf
+EBUILD broot-1.16.1.ebuild 5435 BLAKE2B 33ba7bed3be90c6dac83d4222ce0a9f58c06d79f0cdd4835f5c0c2f2be31b043279576ceaee25a7193fb555c1dea1fb491e897656600cd60fd40da785b391255 SHA512 bd3a7a25fb5045663bca52a260a528ad038aa09add3a15a1d8d4b6ebf19f91e36a3dbd5a841c3908a99b2fa8fde6f964ee02533594f4310057851d1fff42b221
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.16.1.ebuild b/app-misc/broot/broot-1.16.1.ebuild
new file mode 100644
index 000000000000..9eb76229ba4c
--- /dev/null
+++ b/app-misc/broot/broot-1.16.1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+ahash-0.4.7
+ahash-0.7.6
+aho-corasick-0.7.19
+android_system_properties-0.1.5
+ansi_colours-1.1.1
+anyhow-1.0.64
+argh-0.1.8
+argh_derive-0.1.8
+argh_shared-0.1.8
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.0
+bet-1.0.2
+bincode-1.3.3
+bit_field-0.10.1
+bitflags-1.3.2
+bstr-0.2.17
+bumpalo-3.11.0
+bytemuck-1.12.1
+byteorder-1.4.3
+cc-1.0.73
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.22
+clap-3.2.20
+clap_complete-3.2.4
+clap_derive-3.2.18
+clap_lex-0.2.4
+cli-log-2.0.0
+clipboard-win-4.4.2
+color_quant-1.1.0
+coolor-0.5.0
+core-foundation-sys-0.8.3
+crc32fast-1.3.2
+crokey-0.4.3
+crokey-proc_macros-0.4.0
+crossbeam-0.8.2
+crossbeam-channel-0.5.6
+crossbeam-deque-0.8.2
+crossbeam-epoch-0.9.10
+crossbeam-queue-0.3.6
+crossbeam-utils-0.8.11
+crossterm-0.23.2
+crossterm_winapi-0.9.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.8
+custom_error-1.9.2
+deser-hjson-1.0.2
+directories-4.0.1
+directories-next-2.0.0
+dirs-sys-0.3.7
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.8.0
+error-code-2.3.1
+exr-1.5.0
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.8.0
+file-size-1.0.3
+flate2-1.0.24
+flume-0.10.14
+fnv-1.0.7
+form_urlencoded-1.1.0
+futures-core-0.3.24
+futures-sink-0.3.24
+getrandom-0.2.7
+gif-0.11.4
+git2-0.14.4
+glassbench-0.3.3
+glob-0.3.0
+half-1.8.2
+hashbrown-0.12.3
+hashbrown-0.9.1
+hashlink-0.6.0
+heck-0.3.3
+heck-0.4.0
+hermit-abi-0.1.19
+iana-time-zone-0.1.47
+id-arena-2.2.1
+idna-0.3.0
+image-0.24.3
+include_dir-0.7.2
+include_dir_macros-0.7.2
+indexmap-1.9.1
+instant-0.1.12
+is_executable-1.0.1
+itoa-0.4.8
+itoa-1.0.3
+jobserver-0.1.24
+jpeg-decoder-0.2.6
+js-sys-0.3.60
+lazy-regex-2.3.0
+lazy-regex-proc_macros-2.3.0
+lazy_static-1.4.0
+lebe-0.5.2
+lfs-core-0.11.0
+libc-0.2.132
+libgit2-sys-0.13.4+1.4.2
+libsqlite3-sys-0.20.1
+libz-sys-1.1.8
+line-wrap-0.1.1
+linked-hash-map-0.5.6
+lock_api-0.4.8
+log-0.4.17
+memchr-2.5.0
+memmap2-0.5.7
+memoffset-0.6.5
+minimad-0.9.1
+miniz_oxide-0.5.4
+mio-0.8.4
+nanorand-0.7.0
+nix-0.22.3
+num-integer-0.1.45
+num-rational-0.4.1
+num-traits-0.2.15
+num_cpus-1.13.1
+num_threads-0.1.6
+once_cell-1.14.0
+onig-6.4.0
+onig_sys-69.8.1
+open-1.7.1
+opener-0.5.0
+os_str_bytes-6.3.0
+parking_lot-0.12.1
+parking_lot_core-0.9.3
+pathdiff-0.2.1
+percent-encoding-2.2.0
+phf-0.10.1
+phf_generator-0.10.0
+phf_macros-0.10.0
+phf_shared-0.10.0
+pin-project-1.0.12
+pin-project-internal-1.0.12
+pkg-config-0.3.25
+plist-1.3.1
+png-0.17.6
+ppv-lite86-0.2.16
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+proc-macro2-1.0.43
+proc-status-0.1.1
+quick-xml-0.22.0
+quote-1.0.21
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+rayon-1.5.3
+rayon-core-1.9.3
+redox_syscall-0.2.16
+redox_users-0.4.3
+regex-1.6.0
+regex-automata-0.1.10
+regex-syntax-0.6.27
+remove_dir_all-0.5.3
+rgb-0.8.33
+rusqlite-0.24.2
+ryu-1.0.11
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.144
+serde_derive-1.0.144
+serde_json-1.0.85
+signal-hook-0.3.14
+signal-hook-mio-0.2.3
+signal-hook-registry-1.4.0
+siphasher-0.3.10
+smallvec-1.9.0
+snafu-0.7.1
+snafu-derive-0.7.1
+spin-0.9.4
+splitty-1.0.0
+str-buf-1.0.6
+strict-0.1.4
+strsim-0.10.0
+svg-0.8.2
+svg-0.10.0
+syn-1.0.99
+syntect-no-panic-4.6.1
+tempfile-3.3.0
+termcolor-1.1.3
+termimad-0.20.3
+terminal-clipboard-0.3.1
+terminal-light-1.0.1
+termux-clipboard-0.1.0
+textwrap-0.15.0
+thiserror-1.0.34
+thiserror-impl-1.0.34
+threadpool-1.8.1
+tiff-0.7.3
+time-0.1.44
+time-0.3.14
+tinyvec-1.6.0
+tinyvec_macros-0.1.0
+toml-0.5.9
+umask-2.0.0
+unicode-bidi-0.3.8
+unicode-ident-1.0.3
+unicode-normalization-0.1.21
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+url-2.3.1
+users-0.11.0
+vcpkg-0.2.15
+version_check-0.9.4
+walkdir-2.3.2
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.11.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.83
+wasm-bindgen-backend-0.2.83
+wasm-bindgen-macro-0.2.83
+wasm-bindgen-macro-support-0.2.83
+wasm-bindgen-shared-0.2.83
+weezl-0.1.7
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-sys-0.36.1
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+x11-clipboard-0.5.3
+xcb-0.10.1
+xml-rs-0.8.4
+xterm-query-0.1.0
+xterm-query-0.2.0
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	sys-libs/zlib
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.60"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 30eca8c75f22..cb60a33bb2fb 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b903f4382a35..004dcdf87e09 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,15 +6,27 @@ DIST mariadb-10.2.43-patches-01.tar.xz 5940 BLAKE2B f8658b799485942c4415b3966743
 DIST mariadb-10.2.44.tar.gz 74425890 BLAKE2B 1a5d41ebf209dec54aa68a935ad4c6bac528aa7f8def64efea2bd146011daea0a701276ea037282b927b41b063f86f2cf4667c5d3309cd03a5489074ed351505 SHA512 29b17abfe82667053c3137e4e70e12854dab1312376fe8bdcfc76bf105aa3cddae49bcb07cc607a9c8f0a336bd8e537c6f57e2cdbbd06e48a45d125e3bb006a6
 DIST mariadb-10.3.34-patches-01.tar.xz 4696 BLAKE2B 36643b83f773a10180d5f94b4318c19abd441550701ca9e98ff8b7adf037648032023bb93c03efd58e25a650df5650e9b76ee8237cd3b61523f69521e505e643 SHA512 d33c52ad39e249daaae52fde09334f49285212aeb691f3caa7bf8776f95e82eff54bd6a942f24276aa7d945bd030d73e3b1f0ba15f9217236115bd448697d62c
 DIST mariadb-10.3.35.tar.gz 73496487 BLAKE2B 3ab05276fc22098be11ce8e2f5c9323c05c28b7617b31655506fe97131cccebe70a525dda0856b05c8196fabf50243865adf91ed6914ca750bbdf27c915767e8 SHA512 9355de944eccef4e0bc01b19ffc3c0c72cf88befae7385c6f0ee1ea47dbd98d23f6bb46af9c140acc48d9d9613552870684bc0b7ca1f3cff1dc09c1a2c801573
+DIST mariadb-10.3.36-patches-01.tar.xz 4548 BLAKE2B 24ae803afe38f406a37380e4d49d7e8434b7b549c9633fdd24bd35a23bf8b5d72fa6e8174c4ddc8dda9a994bd2fd2feecddcb5650029067dcbc578ea525e48cb SHA512 8fd0c6ed0fe6c99ff2219c1f4a6abe24050f91bcf808e1bcc0be3e194244440d5fe5717a0dc4c4c3ef12642b9d722197b780f9fb999ed8770a748d2c0e40ea4b
+DIST mariadb-10.3.36.tar.gz 73944352 BLAKE2B 75090969802783de59ed73338a9a77c70f4dafa14b03334edd5f48593c89b39e752548f34c81875e93263c0b7f2648e83962ef568b07ea11160faf880a9800ed SHA512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a
 DIST mariadb-10.4.25-patches-01.tar.xz 4496 BLAKE2B f710bed49c53bda4cd1bfc8cc8bbde8588a5600a25aba62f90be61e78879729b6b34ec18bfc0729f8330b9fc9858079e2d924c2b72080b86c73b85a9294f2894 SHA512 5545b6fa879ba99c38b52b5c4e1347efea0f1fd098c8593388a6e9c11ae7ffbca5ebe69a3c418420f49a0a7671bf26102dd2dc024fd60e8f9072ae920a16cb58
 DIST mariadb-10.4.25.tar.gz 88680777 BLAKE2B 993ed640ad579c2726ae241165d024a87fff580a4461fedee7c41a2bd70d668ed56b31219032096b4bd264543d6a93457947422b8a1384d3d3b94e7ca2f6ecb4 SHA512 27ad62985e19c877623d1512adcbec44e714ca50da9d303eab12bc2ad67dcae45d48a1aa010ad554341c46a1c5db7ee26c14570b9fa55fb71caf9979dd12671e
+DIST mariadb-10.4.26-patches-01.tar.xz 4528 BLAKE2B 0e1683ca254fa4beb06239c377f241e6db2306b386d125491ea39dddbe82c9471f1dc7c26001f2c5ba105913f1ec707ce43482e9581b807723a8690c26fc6e6e SHA512 7b54419ea7a974bc275c72770e63d37e116a2724ed5ce404a04acb622a95ae652f9a81c2ece0dd3d1ea41401dd5428627af19f7689fd01eb68471309ef4400f7
+DIST mariadb-10.4.26.tar.gz 96095606 BLAKE2B 313e3e9561bf2805327141bf1d1e0834e6e3997bb1cd523452555b23ecfc1dddcb91e53478113dff56486bb77d172211c16c9e375d7e451f6af2346de338d3db SHA512 4dadd786f902eb4fec702a863b790215b284eb5d6ecce2cb550e97e055ec4d21ef383f08938020ebbdf3a9150e1d4412817c2fa24f36e907deb0fe5b4ce96cb0
 DIST mariadb-10.5.15-patches-01.tar.xz 5116 BLAKE2B 57759c61e672668be8ed991ca023007a4e0c10b2352cc621e88b825097cfde3eb83078804af7afaaa0c6f47900c34046773141a9e3dc3c220b33ecc16435784d SHA512 e3d21b3499ec9f6b5fd32978a6a779ecaca671cccadf241700207a1a3822a6b05ba2e13e1a6cb20e4d5fe4e6db6e5f46e9af650c736bdc3e3de9a4d8bad7ce19
 DIST mariadb-10.5.16.tar.gz 105798374 BLAKE2B fc8ba002a876cd9d357c9762e531082f22380480f8713d3f3882c29ad31c6b14065079b6cdde2e698382d2be668e9e7af2d900b93cd976e8fa27e876f33acff4 SHA512 28cea63cc3c5e1b236fb13593285e5d4b9aac5eaf259784e760def42bca8b09954510d39014a7a7c9e8656d61f5995a356df2f2ebb0df2696dd739ff3de5865d
+DIST mariadb-10.5.17-patches-01.tar.xz 5124 BLAKE2B 74976beee48142294d1dcab73e9cdad40392619115184ab5da5553d28b9a10e415711fac84c4290affe301abe0047c99c5a31ce9dfd58c923cfa15346b9c5acc SHA512 b3ffc4a227fcb4a85575fd093b399810c433686a97518cb0d2b47d61c623bbb760b40c5c9d7752fdbb24e3e41740e8a85c3096f6269c80f6ecc2ffc73d5ee94b
+DIST mariadb-10.5.17.tar.gz 113314849 BLAKE2B 6b2efabc620f38d3b0d35930aa4c9b2e63f01d106de57056b5e4b8d629c5669ac1e64d120ce9cd77d3ddd857eeee9630af3dcb52fe6db9c7f7413248b748d4ef SHA512 5a68126aac7072bed549404c89f7215bc47dede8f72559076988469372b96523a800fd6bbf11ff3003a277ee30788ca99a21507b7d7e2b7e98437ca70b5ca0fc
+DIST mariadb-10.6.10-patches-01.tar.xz 5240 BLAKE2B 4c41bbb5a81ecca3e9ccbdfb0861189575e5b3edfb1019465c8dbceee641a8bbeb3e54f061ff3ec44fb5ff3bca960419893429897db4a919177c390b44ef7e49 SHA512 aee039f5e771c840e2a5bb6f6f5fcbec06c0bbd7fd5ce155f0e6f3694595d5d2a0e38f25972c328fc9f69dd68354434e40c5e9a7b2d509d7ea795e097a57864d
+DIST mariadb-10.6.10.tar.gz 96453293 BLAKE2B 889d141ab9e0e9a0cd3fc9b191a15192170029a5fddcff8ebfe482cc3cfdfec6307c014fe09719c7c254a3941034f53ee7ff6187f3d502e3f3edb4d586dff8f3 SHA512 912219878e2201280f5927ee8a34dafe83ac2c3ce8c6fa3d90731d10fd693c369872aff840edc8329b82c53e9908fbdb1ba731ba140e2b99048edb5eb21f22c4
 DIST mariadb-10.6.8-patches-01.tar.xz 5220 BLAKE2B 0ad1caecbd05defd9d60e3c438cb0f36dfe7db5fa78e08f43cdd298613cb34691c013f7c44f6bddd39a56f0bf267d257e116defeea5022635b3b6e9b105e0eae SHA512 4cbc527b7307417e0cbf3056487e688474183f0db223ea9107d9a911ef1594691344f2b283402b45ddbc82e29023f0545301a8407f9711f7d8242e3001e3f095
 DIST mariadb-10.6.8.tar.gz 88794744 BLAKE2B 1cd036bc686864b497d04454388d9366261f6cc69ad233ab3783063a893c8814ca6c95166415c5b76f2bec2462bffe0bc44d3543502932d03805e972f63b6abc SHA512 b4327000eb3e5fc75bbd78de9890b0464217a432c8aac744948af94e092ffeef1f101885b81ec49029900a92b0018838e46efcf225056a9b06f35a04ecf26aab
 EBUILD mariadb-10.2.44.ebuild 41812 BLAKE2B 4e306d7415dbc8b66175bfd70cae2cee4e5ab0a20fee28bd7e7b046817757207c3006b84c01b4aa91a803724018417a64393aea20f15830d60ac503d3ebb6a3e SHA512 cf8389baa9b9b5baa1a5feabbd89910287bb232155142c750df83fe33d67ff11e3072af3a0a975f63208e9c1e242977919e78666c5bf4a39905dbc3bc81ecdaf
 EBUILD mariadb-10.3.35.ebuild 41381 BLAKE2B 12f53cb7380434c2acd075fbbfdbfc3075503870689c0f39809d50fca5853469993c40252bdc413d6b36d78b092569f34deca9a53e8c9ed7029e14fcdd03147c SHA512 a5e196fff6a2c216cc48297597893b40e5dedf6a577c9d665325b67097e8a7487c4f918976f3a2a9bd04b0a9d41c290db5f9dae019ff1a4fe8d0b335cf3a6216
+EBUILD mariadb-10.3.36.ebuild 41387 BLAKE2B a2cb91f31d7ede2e70a4f3f9be24a3503ef4dd23b4443474ae1d9173408cceae07929e33d581abbc48e2fe5c7d3f84b973ebed0ed09f96bb08cd57a5f63c054a SHA512 206aeec1b653868bf801985612491964a46337f221ce9e52576b0203bee7a652338ac48fdc141ccb1c302d24fdd0f96753ff6d71bc680f762a67a867ff609e02
 EBUILD mariadb-10.4.25.ebuild 42084 BLAKE2B 9d87852855f9cc7ca947bf51c366d1421797f7c68a69536cc54622eef6891408d035f2b0d64dea7cfdc60eb4e3e594ccf41941ab4d3f99ff04f4e1dc6852be7e SHA512 c0e5869c73560d4913ca8cd796a6eae1041e69bebef43f10053707c9adbc13cebf307d82c12c88875728523257b38f564173ed201a1e04e7c06381aeb96b1482
+EBUILD mariadb-10.4.26.ebuild 42090 BLAKE2B b749d9c8332d6c041305b3c600935adb5fdcb5661a94f937818c3be5a6f87240c196c513e4c39901bd563bbb68578ef0c4746ee80822054801afe2c1336fc5ed SHA512 0eca9f0a73cbda9904c83df4354a0b20d4f0a01199f19b877a1584192f4d93e730a7fd3534cfd77abc730756a15e816c0190b2e07af1009c7a306f0c76301264
 EBUILD mariadb-10.5.16.ebuild 42042 BLAKE2B 91f25979f77ce2f6a1892613a2f03eab3bd4e04f36b3e3109c8ff7068f574fa3a6bab92c733f51147d2f99cd4d87907913387df26361db28b1cc114550660a8b SHA512 f8ac560b2262a1c1d37059d7ad584116631e806a0bcc5e8be2d804cf7aa865d187a05e3f7f309a08ec07d36266f12bdbc519492e85fecb1426e415aac24ce6b9
+EBUILD mariadb-10.5.17.ebuild 42049 BLAKE2B 44532c7155cec6a1021df578336d7f381c4b3482940cff8545641e6b0f7894cbf7ab769560b25679d48695f007d15f60e608317efad0f202eca713c220ab5442 SHA512 2c94847ee06f3fb9a58352450790a18f67698eef27bd5a301e6c73b93749714343f885ffdaa9a6fe3785d78102144395a2ef2067c9eb2b22ce476480937f756c
+EBUILD mariadb-10.6.10.ebuild 42417 BLAKE2B bd430ea7545679d7d32900a1c2bb288d428add4f8326fbb1fc5994623b3b7aaebf6f61878a257b2ef10f68eb290cd55a309086deb2636df725e5be716050091a SHA512 bd51e7981f4c5e6a91e5781cc04c97363480a14f5e7733fe96f56d6365f56aecddf395ea65b6c0eb50513ea2b50c726012b65395a0e66a188defe9eb2ea14170
 EBUILD mariadb-10.6.8-r1.ebuild 42459 BLAKE2B 21000edb09ae6c7ef1e52b2f3557045787859f5ad7b54e2db8623541660011ee788093c30f336784bb5e280a0bdc16136bda3f60d162635736add777411df9a3 SHA512 0f056cf06a3576fec20d1a807c5895fe75cc19490faa5ce850d1bf800a3a7cab89158f154579831ec54fec893f422af8f4cfa823c7d087e04a9b050b19a3f71e
 MISC metadata.xml 2712 BLAKE2B 5bfc30a0cfb251168f7c539a0d5ed916790ce93f20d68168264cdde5f56473b8e0586944ac319ab742f5afe73bf40ccf9b77e75a1c1561abc2d5432e48095cee SHA512 4c5d26be5bd2573aead82270c3b6be29a198c0ea334cb2754cb21aabeb095a031009be3497f242c55d6131a8d44d9a54d32d94be5829f60bdb23db530bedfd33
diff --git a/dev-db/mariadb/mariadb-10.3.36.ebuild b/dev-db/mariadb/mariadb-10.3.36.ebuild
new file mode 100644
index 000000000000..efe73d65e955
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.36.ebuild
@@ -0,0 +1,1287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/${PN}/${PN}-10.3.36-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !extraengine !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+	sys-libs/ncurses:0=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? (
+			dev-libs/boost:=
+			dev-libs/judy:0=
+		)
+		pam? ( sys-libs/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.6
+	!dev-db/mariadb:10.7
+	!dev-db/mariadb:10.8
+	!<virtual/mysql-5.6-r11
+	${COMMON_DEPEND}
+	server? (
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-25*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server xml' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+		touch "${S}"/mysql-test/unstable-tests || die
+	fi
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.grant;0;Sporadically failing test" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+	fi
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+
+	# Remove dangling symlink
+	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}/usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local option="--${2}"
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+
+		local values=()
+		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+		for parameter in "${parameters[@]}"
+		do
+			# my_print_defaults guarantees output of options, one per line,
+			# in the form that they would be specified on the command line.
+			# So checking for --option=* should be safe.
+			case ${parameter} in
+				${option}=*)
+					values+=( "${parameter#*=}" )
+					;;
+			esac
+		done
+
+		if [[ ${#values[@]} -gt 0 ]] ; then
+			# Option could have been set multiple times
+			# in which case only the last occurrence
+			# contains the current value
+			echo "${values[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		# Only create directory when MYSQL_LOG_BIN is an absolute path
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Only test when MYSQL_LOG_BIN is an absolute path
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		# Only create directory when MYSQL_RELAY_LOG is an absolute path
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Only test when MYSQL_RELAY_LOG is an absolute path
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Absolute path for binary log files specified
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Absolute path for relay log files specified
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.4.26.ebuild b/dev-db/mariadb/mariadb-10.4.26.ebuild
new file mode 100644
index 000000000000..42db40bc5f57
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.4.26.ebuild
@@ -0,0 +1,1308 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+	sys-libs/ncurses:0=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? (
+			dev-libs/boost:=
+			dev-libs/judy:0=
+		)
+		pam? ( sys-libs/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.6
+	!dev-db/mariadb:10.7
+	!dev-db/mariadb:10.8
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	${COMMON_DEPEND}
+	server? (
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-26*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix static bindings in galera replication
+	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+		"${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+		"${S}"/scripts/mysql_install_db.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server xml' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+		touch "${S}"/mysql-test/unstable-tests || die
+	fi
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+		if use pam ; then
+			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+		fi
+	fi
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove dangling symlink
+	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+				local rver
+				for rver in ${REPLACING_VERSIONS} ; do
+					if ver_test "${rver}" -lt "10.4.0" ; then
+						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+						ewarn "for more information"
+					fi
+				done
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local option="--${2}"
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+
+		local values=()
+		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+		for parameter in "${parameters[@]}"
+		do
+			# my_print_defaults guarantees output of options, one per line,
+			# in the form that they would be specified on the command line.
+			# So checking for --option=* should be safe.
+			case ${parameter} in
+				${option}=*)
+					values+=( "${parameter#*=}" )
+					;;
+			esac
+		done
+
+		if [[ ${#values[@]} -gt 0 ]] ; then
+			# Option could have been set multiple times
+			# in which case only the last occurrence
+			# contains the current value
+			echo "${values[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		# Only create directory when MYSQL_LOG_BIN is an absolute path
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Only test when MYSQL_LOG_BIN is an absolute path
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		# Only create directory when MYSQL_RELAY_LOG is an absolute path
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Only test when MYSQL_RELAY_LOG is an absolute path
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Absolute path for binary log files specified
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Absolute path for relay log files specified
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.5.17.ebuild b/dev-db/mariadb/mariadb-10.5.17.ebuild
new file mode 100644
index 000000000000..605403717fad
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.5.17.ebuild
@@ -0,0 +1,1315 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.5.17-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+	test xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=dev-libs/libpcre2-10.34:=
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	virtual/libcrypt:=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kerberos? ( virtual/krb5 )
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	server? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		backup? ( app-arch/libarchive:0= )
+		columnstore? (
+			app-arch/snappy
+			dev-libs/boost:=
+			dev-libs/libxml2:2=
+		)
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? (
+			dev-libs/boost:=
+			dev-libs/judy:0=
+		)
+		pam? ( sys-libs/pam:0= )
+		s3? ( net-misc/curl )
+		systemd? ( sys-apps/systemd:= )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+"
+BDEPEND="virtual/yacc"
+DEPEND="${COMMON_DEPEND}
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.6
+	!dev-db/mariadb:10.7
+	!dev-db/mariadb:10.8
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	selinux? ( sec-policy/selinux-mysql )
+	server? (
+		columnstore? ( dev-db/mariadb-connector-c )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-26*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix static bindings in galera replication
+	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+		"${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+		"${S}"/scripts/mysql_install_db.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_S3=$(usex s3 YES NO)
+			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+		touch "${S}"/mysql-test/unstable-tests || die
+	fi
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+		if use pam ; then
+			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+		fi
+	fi
+
+	# Conflicting files
+	conflicting_files=()
+
+	# We prefer my_print_defaults from dev-db/mysql-connector-c
+	conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	conflicting_files+=( "${ED}/usr/bin/mytop" )
+	conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
+
+	local conflicting_file
+	for conflicting_file in "${conflicting_files[@]}" ; do
+		if [[ -e "${conflicting_file}" ]] ; then
+			rm -v "${conflicting_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove dangling symlink
+	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+				local rver
+				for rver in ${REPLACING_VERSIONS} ; do
+					if ver_test "${rver}" -lt "10.4.0" ; then
+						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+						ewarn "for more information"
+					fi
+				done
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local option="--${2}"
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+
+		local values=()
+		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+		for parameter in "${parameters[@]}"
+		do
+			# my_print_defaults guarantees output of options, one per line,
+			# in the form that they would be specified on the command line.
+			# So checking for --option=* should be safe.
+			case ${parameter} in
+				${option}=*)
+					values+=( "${parameter#*=}" )
+					;;
+			esac
+		done
+
+		if [[ ${#values[@]} -gt 0 ]] ; then
+			# Option could have been set multiple times
+			# in which case only the last occurrence
+			# contains the current value
+			echo "${values[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		# Only create directory when MYSQL_LOG_BIN is an absolute path
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Only test when MYSQL_LOG_BIN is an absolute path
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		# Only create directory when MYSQL_RELAY_LOG is an absolute path
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Only test when MYSQL_RELAY_LOG is an absolute path
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Absolute path for binary log files specified
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Absolute path for relay log files specified
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.6.10.ebuild b/dev-db/mariadb/mariadb-10.6.10.ebuild
new file mode 100644
index 000000000000..afb1b69d821c
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.6.10.ebuild
@@ -0,0 +1,1319 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+	${PATCH_SET[@]}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+	test xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=dev-libs/libpcre2-10.34:=
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	virtual/libcrypt:=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kerberos? ( virtual/krb5 )
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	server? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		backup? ( app-arch/libarchive:0= )
+		columnstore? (
+			app-arch/snappy
+			dev-libs/boost:=
+			dev-libs/libxml2:2=
+		)
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? (
+			dev-libs/boost:=
+			dev-libs/judy:0=
+		)
+		pam? ( sys-libs/pam:0= )
+		s3? ( net-misc/curl )
+		systemd? ( sys-apps/systemd:= )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+"
+BDEPEND="virtual/yacc"
+DEPEND="${COMMON_DEPEND}
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.7
+	!dev-db/mariadb:10.8
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	selinux? ( sec-policy/selinux-mysql )
+	server? (
+		columnstore? ( dev-db/mariadb-connector-c )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-26*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix static bindings in galera replication
+	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+		"${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+		"${S}"/scripts/mysql_install_db.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_S3=$(usex s3 YES NO)
+			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8mb4
+				-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+		touch "${S}"/mysql-test/unstable-tests || die
+	fi
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.mysql_upgrade;27044;Sporadically failing test" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+	disabled_tests+=( "perfschema.prepared_statements;0;Broken test suite" )
+	disabled_tests+=( "perfschema.privilege_table_io;27045;Sporadically failing test" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+	disabled_tests+=( "spider.*;0;Fails with network sandbox" )
+	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+		if use pam ; then
+			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+		fi
+	fi
+
+	# Conflicting files
+	conflicting_files=()
+
+	# We prefer my_print_defaults from dev-db/mysql-connector-c
+	conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	conflicting_files+=( "${ED}/usr/bin/mytop" )
+	conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
+
+	local conflicting_file
+	for conflicting_file in "${conflicting_files[@]}" ; do
+		if [[ -e "${conflicting_file}" ]] ; then
+			rm -v "${conflicting_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove dangling symlink
+	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+				local rver
+				for rver in ${REPLACING_VERSIONS} ; do
+					if ver_test "${rver}" -lt "10.4.0" ; then
+						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+						ewarn "for more information"
+					fi
+				done
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local option="--${2}"
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+
+		local values=()
+		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+		for parameter in "${parameters[@]}"
+		do
+			# my_print_defaults guarantees output of options, one per line,
+			# in the form that they would be specified on the command line.
+			# So checking for --option=* should be safe.
+			case ${parameter} in
+				${option}=*)
+					values+=( "${parameter#*=}" )
+					;;
+			esac
+		done
+
+		if [[ ${#values[@]} -gt 0 ]] ; then
+			# Option could have been set multiple times
+			# in which case only the last occurrence
+			# contains the current value
+			echo "${values[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		# Only create directory when MYSQL_LOG_BIN is an absolute path
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Only test when MYSQL_LOG_BIN is an absolute path
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		# Only create directory when MYSQL_RELAY_LOG is an absolute path
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Only test when MYSQL_RELAY_LOG is an absolute path
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Absolute path for binary log files specified
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Absolute path for relay log files specified
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5793c086a868..89c75e198a39 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 6e7f3ca2556d..6c9bedac2c87 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,23 +1,3 @@
-AUX julia-1.4.0-no_symlink_llvm.patch 335 BLAKE2B 0df56ed45619df80b669bc790e0f93e475c94dac39fc8efcbdaa677a6ab02a6a3f832abf07990e8f50df8d900147f5e0ac9e2896edbbc4a015e49e74864315fa SHA512 563ed79132655b8c28a01d17fb8765ed774c069e00d29847f864152f7641b53758c6d8ba5544789e8d3aeb0e1686ea946c31837b1e1b0a6f4bce6d531d5511ed
-AUX julia-1.6.5-libgit-1.2.patch 800 BLAKE2B 669c30ae7c00c69feb7edb34d87c3c19ab7015d8634cd3c052a8f6ee2a28be7c7314e01298e95f9d4b00851feb6bab48c44d15eb425f912050f31b26db57c912 SHA512 a4facb24520d8bfe4486291e3537bb5d56ce5fd1aebd9c1ebe657306d0e4a9cfa8cc235c2d715c1b9f4ecb3359cf3ea1dc0b4ff68d4c9a29ff578b4c667d09a2
-AUX julia-1.6.5-libgit-1.4.patch 1754 BLAKE2B c47cfe0eca1527f04ae5e81bdd6d11978e92f8cccbc000c9c96ae77e39b79f52b17d260333227cd699a935c52139808097617e7b627c45aa43b1809e97a9bf99 SHA512 fd71b277f625dde4cdb2ba100bf01f275e28209bbd18cbc143e7f0b2e01549b92b824161bde5a5ca4e5efcfb6f2f52147e66441e36f8f2813aa8436baf9401a1
-AUX julia-1.6.5-llvm_13_compat_part_1.patch 6957 BLAKE2B 581076ba652db52a3948c9bb42c5a2481b5fffa92fb1dcbcd007f2edb3a950ac49ec015f7571c29b50ae243d5e8e9e25952b7cbac9a3b5ec8bd94769104e2891 SHA512 5a7d8202ede9daed2149f3bc30dcf76d0d25f1734b91df3780b405fbd493f4a6f75c851f97a8d27e9ea5753f5003af3c5eb8193ee61cf5808acf56dca1ebb0ba
-AUX julia-1.6.5-llvm_13_compat_part_2.patch 2897 BLAKE2B 7896e392fb8c2364fa10921f7396206fb6785dc430256646a537dcfb0c05a7d8faaa33feab7dad61c6c6e57c33f89eb0ce1eea85c3148622e61b3f0ce83c2164 SHA512 f8a7060236afd28da260e8dff5d69b2562d9cd204f090e1868592aa9d59df015a3a6d0bb19e1dfbaaa3825a8b81152f0e154e06cd31c87e89916269bbef68203
-AUX julia-1.6.5-make-install-no-build.patch 691 BLAKE2B 4f36445f2067c4b983f3ece17cd3866adc1df39ef6b02714dffe10df8febd326cba9f7a1b85f52bef739d4e15a906e9d1990315f974b981c5ecc8b4c7a487113 SHA512 4be8de4913b58a3a84782f08a569b96741f8c9c7ff3378e34624ad9b250c7c7f2dbed9a1d2a8227f105802a89e589ef4abd3d512793d90741dd35c56a8fff75f
-AUX julia-1.7.1-do_not_set_rpath.patch 482 BLAKE2B a68093aad4c76238abeba55d36162ffee2f943952f0e30f1615bbfa002aa219140a85092edbd12d0f93f39c9cdadc1b7427e76c9f290462d4552233f6673f186 SHA512 612652792c5e0cabd1300120fb7556b026cb16d8890ed267a6e90bbc46ca8c7f62dcbc00aee4cfefd08a400f5d7c8cc219e32f90f513783cd7fc096e9c1704f9
-AUX julia-1.7.1-hardcoded-libs.patch 2548 BLAKE2B fa09f79826ba95c4bbbf094e19789aa670c980a936705b2904fda1615174814a13b7f8d128f969dcaa9f7e976c949bfff15aff2ce7008847e19080cc291d56c8 SHA512 934b4e147e25f003944da64feeae971164aed055d7442f80f4598f5c714cc431dad79d9504d60ca09bd0974ec1dfac8eb7db028af441ce6e2095d9acae6ab370
-DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
-DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
-DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
-DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
-DIST julia-1.7.3-full.tar.gz 256584516 BLAKE2B d9520de2a85566cfe02ac471061b6cc255e1ab67039387d4ebda3438b67990cbd0e9e1a17865995f48e537b21fc63be6ff376f3989ff50396ab339df0021a074 SHA512 0286a3f8ecb469eb09690a7723aac267a7655247648a3099115e0dc0531d2f779f2aac6e829d9781f462887de281a78c29d99a986b3c3db8c0b0d565ee31f0df
-DIST julia-1.7.3-llvm_13_compat_part_1.patch 6741 BLAKE2B fd61ed4990128150221f2d348bd5cdf953f1b83ddad8a3920dce44249265471854eda513f3cb5a9f641bac201eec70d08c071d31c56d60592dffd8d17b94ddfe SHA512 d8872bbc123e16daa360cbc7f586f2f610bb0d928d9390b41c4f68d9dbba8a945693756b44dd8e960c8feae22ba0f5b50a7ce33157e1e82d8e1a8f2c999e7141
-DIST julia-1.7.3-llvm_13_compat_part_2.patch 2673 BLAKE2B 14d292029ca8312ae2d6729b2c5697b2b0ec065e43475b0939961586455988aec573ece8685f8150b0e27a388b39c6ed05e822a1c931a8192d4651958de86b05 SHA512 98643ac351a45c6bb1c2f945fb1e46db98c8658625731048e7cfc76684db8b1c219b53c6c230ca1da8dc07139fb1db1602f756b94e91655c6248541510d0c2ee
-DIST julia-1.7.3-llvm_13_compat_part_3.patch 28024 BLAKE2B bffa797f92425eb22f64861e13c2ac9d311434b3727acc8268247bf131e7654c154fd3cc6f7966b3fabc86d56ed0f65b46ea178a2e87cd47f56675af739ee01a SHA512 45231605f4c89ad7faab5564f0c9ea67ebb86ff32d8adffd68ba632668b8adb4185e15351a5714de07495908e059731b702e3c202e043cb9cac252285cd21a0b
-DIST julia-1.7.3-llvm_13_compat_part_4.patch 2425 BLAKE2B 9440296aa9669c44f23757f24f5e098353171e2747c24220a3ab6f5fdd9bd3915975dc24e7e19a3441a17555858cff7cfbc678a8a6d7e0894a604e7d699cb6cb SHA512 7e5a5fcd5b18086fbd638cdf98c13d8954bb8716e60ed6ae613b072e4ec8e406abe5a7ba29db488c34a97ecdd2932ddb2e827949191407aead202221bacf736f
-DIST julia-1.7.3-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
-DIST julia-1.7.3-llvm_13_compat_part_6.patch 27063 BLAKE2B 3878cba37be6f270a1ba240b22bea65c2c0efe77b0d415cc47370f234c8d26f01c66bec4b01824472926ba231a8881deadb21006efe6fa6c5bf6fd6250933a0b SHA512 7c27b4b49465a4fbe206c1e9ba6c48d74264124a866fb414bb698cab151a9e1fb7180c7e07c0bc843d4817e9e99cbd70b35c2906384503d44ab7051ebb1948fe
-DIST julia-1.7.3_Downloads.jl_1.5.3.tar.gz 23484 BLAKE2B cebdc572a10faadf4aa673da2c9cd364ddc76b6299c3d0eaaa54014e199f9c0002188d6281dc4935c2be1f32ffcddc6b98f19f07ea488466fa7ae66db55fa23a SHA512 ec895ebe2b96d8590f34c152d3b4963531250b254c96fadffeee8b2cec132c20ce42d585839a2304dc1a30b13b1cbebcfa88b021b3646a77162a1476ec1d8f16
 DIST julia-1.8.0-074d761f.patch 2198 BLAKE2B 7d4b147e290defceaad1b5b6d0c2c9a323b47d685bb1865b23c84aa68135c00104e653a5046d276aa540415ee4c95426f1a4538df3ba0ae4c348966a2f2b1742 SHA512 ff1e23746851b1b7a4480df75815abb35ccc8006f622acb5fb3928e20832cf55022c96650590c8dfea9b39185a3284a0d1310dee3f439429c91e00af567b66f1
 DIST julia-1.8.0-ed9851b0.patch 6957 BLAKE2B f40a56bf3b00cc8d0a764ce7d9ef75b6e5dbab70aa13aad810e7288c4b1b0609ee61b1c6661a4d34423c5f25b19c56b326fa0ae520f1310c673d2c0921e4dabb SHA512 a4b6ee8b80639e74185ddaf8567b81eaee18efef02003e254b5e31268f730e022dcb1a53d8595a82570303b5f57ea885ca86374ca5eb7c0b2b270a5c104b79b5
 DIST julia-1.8.0-julia-hardcoded-libs.patch 2411 BLAKE2B d71683c68c350c16c61c13e0378072a7689cb6e07ab7d4b940a5049f37ec58d8f4061b94ba5ba3d2dcf73a403b34d5fbe92bb723a0c5a2c318f9c3bd3631f143 SHA512 0256c5af1713b3551b39e0d89168eafb235e6337a9f07efd24a2e271a11bf724295d0a46761bf1a4d3ed14c4539ef1ef56adcf5580879cac268867aac3e2c20e
@@ -26,14 +6,5 @@ DIST julia-1.8.0-julia-llvm-14.patch 882 BLAKE2B f46f02554a6fc997763d368b813298d
 DIST julia-1.8.0-julia-system-cblas.patch 4078 BLAKE2B 58aac552ea63859a03fe24fed69c02f9968aa7924abe2ffdf9e33e965d64877206216f1604f28fc67739cada4b5ce7b508feaad18080e3a5e78d89447d0f2a05 SHA512 d4b437da35672aa0b9f371da66a8675ca5be28276886edafb3566c3ea0d0ed8ed2bac192b43a0d292ee4f2754b596b7b79de76f136cfcada9916ff94a544b372
 DIST julia-1.8.0-make-install-no-build.patch 555 BLAKE2B 36a86c3dd281a85f1b1fd68ac9796e70b06bb6afe3140fed97b5c7cd4b24987dc75709c4b1b192d5663c4d704cfb9818ec8d895c293b9b0bd741a3a61c860e47 SHA512 97687d24a3aa0a39994a691026981a91496cd2a82112e9acf9a8edd0f7c2a50d946944e8af495a3b1703f397c7a0e620be76dc28f3bbe14357ee8c4a68a5a3bc
 DIST julia-1.8.2-full.tar.gz 275255487 BLAKE2B dd4cb035c3ec3b37fd08215baa76764c2a447ec50f0afbec5e6c02b047e62188015ba1492704fbc31081465f3837d6b8e02b31cfe10239ddd31e80e4bd7121e8 SHA512 0660911bbd9b0e0df9e6c2af851e7119b6067b08c845422e44101b9a92a1cbc069e52838f503b06f64db5b282cde1b533aafd9c6f47d349ae7d2beb48cf7d7a6
-DIST julia-hardcoded-libs.patch 2411 BLAKE2B 54eb1d0bbf15bbeea723c32c8ddbb42d3e3fbd22c6d8e2fa4c660d857bc8b6b131f442065689fd1a70c09563ef5c9efa7cb8ff9493ea6b3ed9ec7b05a9cc042e SHA512 4a35a80592c64c8e8924d381b9405283c3c5447ea201715acdcb4e7f6be0560655b0f816fa05127b7df6f9154a74224960aba57b291bd3a8431174eb13c7610e
-DIST julia-libblastrampoline-4.patch 856 BLAKE2B 5efe1602022eaaadb5f6ed06edd5f9e30e19978c5c469f1619efbcc4604efa3f0cd42bb80ba7cf903a89edbabeefca06bf7f5efe78510b6feea5e188655ad456 SHA512 62097e29865a0d4a633974a3ca4ea35623a6de08d8c63316896cdd95844a394302ad892121ec85d8b2a9ca305dff3123cd01e4b7a27b97beb5da36cbe4cd3fa3
-DIST julia-libgit-1.2.patch 17322 BLAKE2B 163ca3dc12e6e654962afc781ef7ae57ea0a74a13d72e40a2944ac6b9ad688467fea2df603f0b5509bd882406c81742ae168a80ae312dea5e7188a3c96996772 SHA512 59688c5f6437fd745e3a37bc8387678a18e7d4ed223907456a426a55f1daaa747b70e2b7907975e4e1af4c32b535d91f1e2685416c4d811aed2f4b6ce5f3bc36
-DIST julia-libgit-1.4.patch 1631 BLAKE2B 0f13c696c9a5067dabf38e65a2c315a0f8bb7e9dfc4ed9f0267b2a0161296aae4b10be833d6d6da2e0ee2c3917b5cf79e438f96232a5c93b15358a984b23ee4a SHA512 044b1fdc31a767c36b8df1f0582f64051450903be4a4ab668d8b7a8c666be800a51250825d807a4503594b73bb5c2e4e9eef4c61363a1484f328138a1871ff60
-DIST julia-libunwind-1.6.patch 778 BLAKE2B 26fcac25c3a906ecbb29e54354fad919c12e2cbd7f8b2a2fc696a495050de1f47ed83ccee2ae8a92c82f51e57319dfc4e8a672a3e6af8e32af6bc2d056bd6813 SHA512 e43119ea9fded88e9ed1c85c3d47dfd62771884d29e409f91779b6db9557f6f1af840b719ee879eda8929cfd53fd9e9b34eb0cac7e9ab6a3f3032edf3e50ca3a
-DIST julia-system-cblas.patch 4816 BLAKE2B f5f56cf6a5c4919f002da4865e51022e738fabaf50a537c9e79771c6f3bbfe46333eafa224172008812500169370cdcf8b39464483c8cf7a5c5e8b00257ea162 SHA512 2c5a1818cad8eb5e7ae5d112bbd2f1f3c74fc12ac2ae0325be9e4d2baa016c7a64e02c937014e7b043be3efdb5eac2188919f4aaf58f0f88abc44a455ec9bcc3
-DIST make-install-no-build.patch 555 BLAKE2B b49576a9b4fa49ba46f871e774a72f1b78ed37a4cb9be47655617b30e251ce2ef7b4236b045c271be3f3c00b9bd2b907281040658a2068ca986f84a80f5fc141 SHA512 8cb54dc9aac12450cc9d5041b1c4ea9a2b7ddb3c73533d58ce5e78e0547f36ac77f04576e28e15769d73ed02fcdfcd90a9036816fa8a669b2210332f972ee15f
-EBUILD julia-1.7.1-r4.ebuild 4992 BLAKE2B 590b6dabb0c0bd821db60b389d4f329c67b51de3b029818c6c564d826b2a742ced7e2644202e43cd001bb9cacb160da16cf0658a0a712f5ebef4bbdb6a3acbfa SHA512 6a84e43d2c283fa364dc41a9fa6483fcd4bda27376c25ca56111235d9e870bc7035736c17d7a79c1c8ba81fe51b155fb012e31944f8fb7c0679f6b46e8d6ecf3
-EBUILD julia-1.7.3.ebuild 6219 BLAKE2B 9950809d1207c7559a83997728aa905792c1407210a7570b6688606a71e76e412ced767118febba6ffa34541d3d2d21f63ea077b014235134a6eb245b187031c SHA512 ab14e9ebe85006bfc1ce34a7df1137c86ada0bcaa1d001e2b587e333bc303d23d9983997d941a008f094b82106946757cb8556c71257be3ccd2ba90f18e50544
 EBUILD julia-1.8.2.ebuild 4724 BLAKE2B 03364d405678e22f11c63f39c5d24c476956048177b51c3962504c55f12f7326cb5b87b01524692bc2f93fdb7fb85addf62fdd0c215d17aafc80cbc914c14f5e SHA512 e7feb970adbb3af3ac5956cbec9fe1499c70fd16d4e267d5e5bdedbdaf242b58220d4a421307f200911f185a5f2770b711e56d6265d1065104fa1361c25aad42
 MISC metadata.xml 1532 BLAKE2B 2b5a51f93e5aae7cdbd22bda33008ed09af3c0b27e1b1877d2a74d43c85b387bbe489d8ff25906ae1658ae27d22858074a12668a359287610a50bc347a3f8d43 SHA512 5502972e44b54a1c5cd18762e011ffedca043ebf1d7c5baaab2a51d8215d6fe9e54d7b3252cc4ebdaa44e022a3157a5b33ccb1c22db08b7c110bbe6bbd6eda95
diff --git a/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch b/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch
deleted file mode 100644
index 1b6371b120d9..000000000000
--- a/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/base/Makefile    2019-11-17 14:07:20.000000000 -0500
-+++ b/base/Makefile    2020-03-28 20:38:40.041571679 -0400
-@@ -223,7 +223,7 @@
-        ln -sf "$$REALPATH" "$@"
- ifneq ($(USE_SYSTEM_LLVM),0)
- ifneq ($(USE_LLVM_SHLIB),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
-+#SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
- endif
- endif
diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch
deleted file mode 100644
index f0abc7b8f60d..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch comes from
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch
-
-diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
-index 9ffcaa3646..5f571e7b26 100644
---- a/stdlib/LibGit2/src/types.jl
-+++ b/stdlib/LibGit2/src/types.jl
-@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_
-     push_update_reference::Ptr{Cvoid}  = C_NULL
-     push_negotiation::Ptr{Cvoid}       = C_NULL
-     transport::Ptr{Cvoid}              = C_NULL
-+    @static if LibGit2.VERSION >= v"1.2.0"
-+        remote_ready::Ptr{Cvoid}       = C_NULL
-+    end
-     payload::Any                       = nothing
-     @static if LibGit2.VERSION >= v"0.99.0"
-         resolve_url::Ptr{Cvoid}        = C_NULL
diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch
deleted file mode 100644
index fe753c0cd0e4..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This patch comes from:
-  https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.4.patch
-
-diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl
-index 2bc9edaf89..55887ebe2a 100644
---- a/stdlib/LibGit2/src/consts.jl
-+++ b/stdlib/LibGit2/src/consts.jl
-@@ -247,6 +247,11 @@ const RESET_HARD  = Cint(3) # MIXED plus changes in working tree discarded
-                             REBASE_OPERATION_FIXUP  = Cint(4),
-                             REBASE_OPERATION_EXEC   = Cint(5))
- 
-+# git_remote_redirect_t
-+const GIT_REMOTE_REDIRECT_NONE    = Cint(0)
-+const GIT_REMOTE_REDIRECT_INITIAL = Cint(1)
-+const GIT_REMOTE_REDIRECT_ALL     = Cint(2)
-+
- # fetch_prune
- const FETCH_PRUNE_UNSPECIFIED = Cint(0)
- const FETCH_PRUNE             = Cint(1)
-diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
-index 9ffcaa3646..98d938df65 100644
---- a/stdlib/LibGit2/src/types.jl
-+++ b/stdlib/LibGit2/src/types.jl
-@@ -343,6 +343,9 @@ The fields represent:
-     @static if LibGit2.VERSION >= v"0.25.0"
-         proxy_opts::ProxyOptions       = ProxyOptions()
-     end
-+    @static if LibGit2.VERSION >= v"1.4.0"
-+        follow_redirects::Cint         = Consts.GIT_REMOTE_REDIRECT_INITIAL
-+    end
-     @static if LibGit2.VERSION >= v"0.24.0"
-         custom_headers::StrArrayStruct = StrArrayStruct()
-     end
-@@ -674,6 +677,9 @@ The fields represent:
-     @static if LibGit2.VERSION >= v"0.25.0"
-         proxy_opts::ProxyOptions       = ProxyOptions()
-     end
-+    @static if LibGit2.VERSION >= v"1.4.0"
-+        follow_redirects::Cint         = Consts.GIT_REMOTE_REDIRECT_INITIAL
-+    end
-     @static if LibGit2.VERSION >= v"0.24.0"
-         custom_headers::StrArrayStruct = StrArrayStruct()
-     end
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch
deleted file mode 100644
index 1398be7ec873..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-This patch is from the julialang repository:
-  https://github.com/JuliaLang/julia/commit/677ce6d3.patch
-but reference comes form ARCH Linux juia package
-  https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
-
-From 677ce6d3adc2f70886f72795b0e5c739e75730ee Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Sat, 28 Aug 2021 16:48:32 +0200
-Subject: [PATCH] [LLVM] Adapt to LLVM 13 changes
-
----
- src/cgutils.cpp                | 8 +++++++-
- src/codegen.cpp                | 2 +-
- src/disasm.cpp                 | 8 ++++++++
- src/jitlayers.cpp              | 7 +++++++
- src/llvm-late-gc-lowering.cpp  | 5 +++--
- src/llvm-multiversioning.cpp   | 5 +++++
- src/llvm-remove-addrspaces.cpp | 8 ++++++++
- 7 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/src/cgutils.cpp b/src/cgutils.cpp
-index 4e9917b6b078..928e1a07b2f1 100644
---- a/src/cgutils.cpp
-+++ b/src/cgutils.cpp
-@@ -2757,8 +2757,14 @@ static jl_value_t *static_constant_instance(Constant *constant, jl_value_t *jt)
-     size_t nargs;
-     if (const auto *CC = dyn_cast<ConstantAggregate>(constant))
-         nargs = CC->getNumOperands();
--    else if (const auto *CAZ = dyn_cast<ConstantAggregateZero>(constant))
-+    else if (const auto *CAZ = dyn_cast<ConstantAggregateZero>(constant)) {
-+#if JL_LLVM_VERSION >= 130000
-+        // SVE: Elsewhere we use `getMinKownValue`
-+        nargs = CAZ->getElementCount().getFixedValue();
-+#else
-         nargs = CAZ->getNumElements();
-+#endif
-+    }
-     else if (const auto *CDS = dyn_cast<ConstantDataSequential>(constant))
-         nargs = CDS->getNumElements();
-     else
-diff --git a/src/codegen.cpp b/src/codegen.cpp
-index 5cc9f66ffaef..9000513151fe 100644
---- a/src/codegen.cpp
-+++ b/src/codegen.cpp
-@@ -7394,7 +7394,7 @@ static std::pair<std::unique_ptr<Module>, jl_llvm_functions_t>
- #endif
-                 continue;
-             }
--            assert(find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check
-+            assert(std::find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check
-             TerminatorInst *terminator = FromBB->getTerminator();
-             if (!terminator->getParent()->getUniqueSuccessor()) {
-                 // Can't use `llvm::SplitCriticalEdge` here because
-diff --git a/src/disasm.cpp b/src/disasm.cpp
-index 6157873ad71c..589f618396ea 100644
---- a/src/disasm.cpp
-+++ b/src/disasm.cpp
-@@ -857,8 +857,16 @@ static void jl_dump_asm_internal(
-     assert(MRI && "Unable to create target register info!");
- 
-     std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo());
-+#if JL_LLVM_VERSION >= 130000
-+    MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features);
-+    assert(MSTI && "Unable to create subtarget info!");
-+
-+    MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr);
-+    MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false);
-+#else
-     MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);
-     MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx);
-+#endif
- 
-     // Set up Subtarget and Disassembler
-     std::unique_ptr<MCSubtargetInfo>
-diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
-index 60b1903aaa80..12497cadf491 100644
---- a/src/jitlayers.cpp
-+++ b/src/jitlayers.cpp
-@@ -10,6 +10,9 @@
- #include <llvm/Analysis/TargetTransformInfo.h>
- #include <llvm/ExecutionEngine/Orc/CompileUtils.h>
- #include <llvm/ExecutionEngine/Orc/ExecutionUtils.h>
-+#if JL_LLVM_VERSION >= 130000
-+#include <llvm/ExecutionEngine/Orc/ExecutorProcessControl.h>
-+#endif
- #include <llvm/Support/DynamicLibrary.h>
- #include <llvm/Support/FormattedStream.h>
- #include <llvm/Support/SmallVectorMemoryBuffer.h>
-@@ -654,7 +657,11 @@ JuliaOJIT::JuliaOJIT(TargetMachine &TM, LLVMContext *LLVMCtx)
-     MemMgr(createRTDyldMemoryManager()),
-     JuliaListener(CreateJuliaJITEventListener()),
-     TSCtx(std::unique_ptr<LLVMContext>(LLVMCtx)),
-+#if JL_LLVM_VERSION >= 130000
-+    ES(cantFail(orc::SelfExecutorProcessControl::Create())),
-+#else
-     ES(),
-+#endif
-     GlobalJD(ES.createBareJITDylib("JuliaGlobals")),
-     JD(ES.createBareJITDylib("JuliaOJIT")),
-     ObjectLayer(
-diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 0aac7638be0d..db8b19bacea5 100644
---- a/src/llvm-late-gc-lowering.cpp
-+++ b/src/llvm-late-gc-lowering.cpp
-@@ -709,7 +709,7 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {
-         else
-             Numbers[i] = Number;
-     }
--    if (auto VTy = dyn_cast<VectorType>(SI->getType())) {
-+    if (auto VTy = dyn_cast<FixedVectorType>(SI->getType())) {
-         if (NumRoots != Numbers.size()) {
-             // broadcast the scalar root number to fill the vector
-             assert(NumRoots == 1);
-@@ -736,11 +736,12 @@ void LateLowerGCFrame::LiftPhi(State &S, PHINode *Phi) {
-     SmallVector<PHINode *, 2> lifted;
-     std::vector<int> Numbers;
-     unsigned NumRoots = 1;
--    if (auto VTy = dyn_cast<VectorType>(Phi->getType())) {
-+    if (auto VTy = dyn_cast<FixedVectorType>(Phi->getType())) {
-         NumRoots = VTy->getNumElements();
-         Numbers.resize(NumRoots);
-     }
-     else {
-+        // TODO: SVE
-         assert(isa<PointerType>(Phi->getType()) && "unimplemented");
-     }
-     for (unsigned i = 0; i < NumRoots; ++i) {
-diff --git a/src/llvm-multiversioning.cpp b/src/llvm-multiversioning.cpp
-index 68081eb53d3a..a82600162fa9 100644
---- a/src/llvm-multiversioning.cpp
-+++ b/src/llvm-multiversioning.cpp
-@@ -403,7 +403,12 @@ void CloneCtx::clone_function(Function *F, Function *new_f, ValueToValueMapTy &v
-         vmap[&*J] = &*DestI++;
-     }
-     SmallVector<ReturnInst*,8> Returns;
-+#if JL_LLVM_VERSION >= 130000
-+    // We are cloning into the same module
-+    CloneFunctionInto(new_f, F, vmap, CloneFunctionChangeType::GlobalChanges, Returns);
-+#else
-     CloneFunctionInto(new_f, F, vmap, true, Returns);
-+#endif
- }
- 
- // Clone all clone_all targets. Makes sure that the base targets are all available.
-diff --git a/src/llvm-remove-addrspaces.cpp b/src/llvm-remove-addrspaces.cpp
-index ada10c8d5f1f..7c6ef093fbce 100644
---- a/src/llvm-remove-addrspaces.cpp
-+++ b/src/llvm-remove-addrspaces.cpp
-@@ -345,7 +345,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M)
-         for (auto MD : MDs)
-             NGV->addMetadata(
-                     MD.first,
-+#if JL_LLVM_VERSION >= 130000
-+                    *MapMetadata(MD.second, VMap));
-+#else
-                     *MapMetadata(MD.second, VMap, RF_MoveDistinctMDs));
-+#endif
- 
-         copyComdat(NGV, GV);
- 
-@@ -372,7 +376,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M)
-                 NF,
-                 F,
-                 VMap,
-+#if JL_LLVM_VERSION >= 130000
-+                CloneFunctionChangeType::GlobalChanges,
-+#else
-                 /*ModuleLevelChanges=*/true,
-+#endif
-                 Returns,
-                 "",
-                 nullptr,
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch
deleted file mode 100644
index 5a8c2cde93d5..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-This patch is from julialang repository:
-  https://github.com/JuliaLang/julia/commit/47f9139e.patch
-but reference comes form ARCH Linux juia package
-  https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
-
-From 47f9139e88917813cb7beee5e690c48c2ac65de4 Mon Sep 17 00:00:00 2001
-From: Xuanda Yang <th3charlie@gmail.com>
-Date: Wed, 9 Jun 2021 22:35:14 +0800
-Subject: [PATCH] codegen: replace deprecated llvm::VectorType::getNumElements
- with new APIs (#41144)
-
----
- src/llvm-late-gc-lowering.cpp | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 50015045151b..4df303462d96 100644
---- a/src/llvm-late-gc-lowering.cpp
-+++ b/src/llvm-late-gc-lowering.cpp
-@@ -396,8 +396,14 @@ CountTrackedPointers::CountTrackedPointers(Type *T) {
-         }
-         if (isa<ArrayType>(T))
-             count *= cast<ArrayType>(T)->getNumElements();
--        else if (isa<VectorType>(T))
-+        else if (isa<VectorType>(T)) {
-+#if JL_LLVM_VERSION >= 120000
-+            ElementCount EC = cast<VectorType>(T)->getElementCount();
-+            count *= EC.getKnownMinValue();
-+#else
-             count *= cast<VectorType>(T)->getNumElements();
-+#endif
-+        }
-     }
-     if (count == 0)
-         all = false;
-@@ -408,8 +414,14 @@ unsigned getCompositeNumElements(Type *T) {
-         return ST->getNumElements();
-     else if (auto *AT = dyn_cast<ArrayType>(T))
-         return AT->getNumElements();
--    else
-+    else {
-+#if JL_LLVM_VERSION >= 120000
-+        ElementCount EC = cast<VectorType>(T)->getElementCount();
-+        return EC.getKnownMinValue();
-+#else
-         return cast<VectorType>(T)->getNumElements();
-+#endif
-+    }
- }
- 
- // Walk through a Type, and record the element path to every tracked value inside
-@@ -625,8 +637,14 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {
-     }
-     std::vector<int> Numbers;
-     unsigned NumRoots = 1;
--    if (auto VTy = dyn_cast<VectorType>(SI->getType()))
-+    if (auto VTy = dyn_cast<VectorType>(SI->getType())) {
-+#if JL_LLVM_VERSION >= 120000
-+        ElementCount EC = VTy->getElementCount();
-+        Numbers.resize(EC.getKnownMinValue(), -1);
-+#else
-         Numbers.resize(VTy->getNumElements(), -1);
-+#endif
-+    }
-     else
-         assert(isa<PointerType>(SI->getType()) && "unimplemented");
-     assert(!isTrackedValue(SI));
-@@ -686,7 +704,12 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {
-             assert(NumRoots == 1);
-             int Number = Numbers[0];
-             Numbers.resize(0);
-+#if JL_LLVM_VERSION >= 120000
-+            ElementCount EC = VTy->getElementCount();
-+            Numbers.resize(EC.getKnownMinValue(), Number);
-+#else
-             Numbers.resize(VTy->getNumElements(), Number);
-+#endif
-         }
-     }
-     if (!isa<PointerType>(SI->getType()))
diff --git a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch
deleted file mode 100644
index 0632a6e726f7..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This pacth comes from
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch
-
---- julia-1.3.0/Makefile.orig	2019-12-06 12:54:23.879790955 +0000
-+++ julia-1.3.0/Makefile	2019-12-06 12:54:36.329952953 +0000
-@@ -277,11 +277,6 @@
- 
- 
- install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
--ifeq ($(BUNDLE_DEBUG_LIBS),1)
--	@$(MAKE) $(QUIET_MAKE) all
--else
--	@$(MAKE) $(QUIET_MAKE) release
--endif
- 	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \
- 		mkdir -p $(DESTDIR)$$subdir; \
- 	done
diff --git a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch
deleted file mode 100644
index 7b8c3c7ba51b..000000000000
--- a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2021-12-21 09:38:26.782829864 +0100
-+++ b/Makefile	2021-12-21 10:52:40.760565902 +0100
-@@ -365,7 +365,7 @@
- endif
- 
- 	# Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`.  We only need to do this for Linux/FreeBSD
--ifneq (,$(findstring $(OS),Linux FreeBSD))
-+ifneq (,$(findstring $(OS),FreeBSD))
- 	$(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT)
- endif
- 
diff --git a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch
deleted file mode 100644
index be7d20368f6d..000000000000
--- a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-This pacth comes from:
-  https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch
-
-diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-index a7ca666b23..b84a42f4e7 100644
---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-@@ -31,9 +31,9 @@ elseif Sys.isapple()
-     const libmbedtls = "@rpath/libmbedtls.13.dylib"
-     const libmbedx509 = "@rpath/libmbedx509.1.dylib"
- else
--    const libmbedcrypto = "libmbedcrypto.so.5"
--    const libmbedtls = "libmbedtls.so.13"
--    const libmbedx509 = "libmbedx509.so.1"
-+    const libmbedcrypto = "libmbedcrypto.so"
-+    const libmbedtls = "libmbedtls.so"
-+    const libmbedx509 = "libmbedx509.so"
- end
- 
- function __init__()
-diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-index fa45e754e5..b51812e3a8 100644
---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
-     const libLLVM = "@rpath/libLLVM.dylib"
- else
--    const libLLVM = "libLLVM-12jl.so"
-+    const libLLVM = "libLLVM.so"
- end
- 
- function __init__()
-diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-index 8b98c76ac5..77ad9e3800 100644
---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
-     const libnghttp2 = "@rpath/libnghttp2.14.dylib"
- else
--    const libnghttp2 = "libnghttp2.so.14"
-+    const libnghttp2 = "libnghttp2.so"
- end
- 
- function __init__()
-diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
-index f0d4b5dda6..2ed3017b51 100644
---- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl
-+++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
-     const libgit2 = "@rpath/libgit2.1.1.dylib"
- else
--    const libgit2 = "libgit2.so.1.1"
-+    const libgit2 = "libgit2.so"
- end
- 
- function __init__()
-diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-index 215de8aed6..918d1ffdc2 100644
---- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-+++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
-     const libopenlibm = "@rpath/libopenlibm.3.dylib"
- else
--    const libopenlibm = "libopenlibm.so.3"
-+    const libopenlibm = "libopenlibm.so"
- end
- 
- function __init__()
diff --git a/dev-lang/julia/julia-1.7.1-r4.ebuild b/dev-lang/julia/julia-1.7.1-r4.ebuild
deleted file mode 100644
index 1ddfaf72dbc2..000000000000
--- a/dev-lang/julia/julia-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LLVM_V="13.0.0"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
-	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-	https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.1-llvm_13_compat_part_3.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.1-llvm_13_compat_part_4.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.1-llvm_13_compat_part_5.patch
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
-	system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
-	app-arch/p7zip
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0
-	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
-	dev-libs/mpfr:0=
-	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
-	>=dev-util/patchelf-0.13
-	>=net-libs/mbedtls-2.2
-	<net-misc/curl-7.81.0[http2,ssh]
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	>=sci-mathematics/dsfmt-2.2.4
-	>=sys-libs/libunwind-1.1:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
-	"${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch
-	"${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch
-	"${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_3.patch
-	"${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch
-	"${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch
-	"${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
-	"${FILESDIR}/${PN}"-1.6.5-libgit-1.4.patch
-	"${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
-	"${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch
-	"${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch
-)
-
-pkg_setup() {
-	use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
-	local tounpack=(${A})
-	# the main source tree, followed by deps
-	unpack "${tounpack[0]}"
-
-	mkdir -p "${S}/deps/srccache/"
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-
-	sed -i \
-		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting	git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# bug #855602
-	filter-lto
-
-	use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
-	# julia does not play well with the system versions of libuv
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		LOCALBASE:="${EPREFIX}/usr"
-		override prefix:="${EPREFIX}/usr"
-		override libdir:="\$(prefix)/$(get_libdir)"
-		override CC:=$(tc-getCC)
-		override CXX:=$(tc-getCXX)
-		override AR:=$(tc-getAR)
-
-		BUNDLE_DEBUG_LIBS:=0
-		USE_BINARYBUILDER:=0
-		USE_SYSTEM_CSL:=1
-		USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_PCRE:=1
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_LIBSUITESPARSE:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=1
-		USE_SYSTEM_MBEDTLS:=1
-		USE_SYSTEM_LIBSSH2:=1
-		USE_SYSTEM_NGHTTP2:=1
-		USE_SYSTEM_CURL:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_ZLIB:=1
-		USE_SYSTEM_P7ZIP:=1
-		VERBOSE:=1
-	EOF
-}
-
-src_compile() {
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	default
-	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use system-llvm ; then
-		local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
-		cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
-	fi
-
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-
-	# The appdata directory is deprecated.
-	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
-	elog "To use Plots, you will need to install sci-visualization/gr."
-}
diff --git a/dev-lang/julia/julia-1.7.3.ebuild b/dev-lang/julia/julia-1.7.3.ebuild
deleted file mode 100644
index 1b2d16111014..000000000000
--- a/dev-lang/julia/julia-1.7.3.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LLVM_V="13.0.0"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
-	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-	https://github.com/JuliaLang/julia/commit/677ce6d3.patch -> ${PN}-1.7.3-llvm_13_compat_part_1.patch
-	https://github.com/JuliaLang/julia/commit/47f9139e.patch -> ${PN}-1.7.3-llvm_13_compat_part_2.patch
-	https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.3-llvm_13_compat_part_3.patch
-	https://github.com/JuliaLang/julia/commit/99d4e655.patch -> ${PN}-1.7.3-llvm_13_compat_part_4.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.3-llvm_13_compat_part_5.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.3-llvm_13_compat_part_6.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.4.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-system-cblas.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libunwind-1.6.patch
-	https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libblastrampoline-4.patch
-	https://github.com/JuliaLang/Downloads.jl/archive/refs/tags/v1.5.3.tar.gz -> ${P}_Downloads.jl_1.5.3.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
-	system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
-	app-arch/p7zip
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0
-	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
-	dev-libs/mpfr:0=
-	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
-	>=dev-util/patchelf-0.13
-	>=net-libs/mbedtls-2.2
-	net-misc/curl[http2,ssh]
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	>=sci-mathematics/dsfmt-2.2.4
-	>=sys-libs/libunwind-1.1:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
-	"${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_1.patch
-	"${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_2.patch
-	"${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_3.patch
-	"${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_4.patch
-	"${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_5.patch
-	"${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_6.patch
-	"${DISTDIR}"/julia-libgit-1.2.patch
-	"${DISTDIR}"/julia-libgit-1.4.patch
-	"${DISTDIR}"/julia-libunwind-1.6.patch
-	"${DISTDIR}"/julia-system-cblas.patch
-	"${DISTDIR}"/julia-hardcoded-libs.patch
-	"${DISTDIR}"/make-install-no-build.patch
-	"${DISTDIR}"/julia-libblastrampoline-4.patch
-)
-
-pkg_setup() {
-	use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
-	local tounpack=(${A})
-	# the main source tree, followed by deps
-	unpack "${tounpack[0]}"
-
-	mkdir -p "${S}/deps/srccache/"
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-
-	sed -i \
-		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting	git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# bug #855602
-	filter-lto
-
-	use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
-	# julia does not play well with the system versions of libuv
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		LOCALBASE:="${EPREFIX}/usr"
-		override prefix:="${EPREFIX}/usr"
-		override libdir:="\$(prefix)/$(get_libdir)"
-		override CC:=$(tc-getCC)
-		override CXX:=$(tc-getCXX)
-		override AR:=$(tc-getAR)
-
-		BUNDLE_DEBUG_LIBS:=0
-		USE_BINARYBUILDER:=0
-		USE_SYSTEM_CSL:=1
-		USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_PCRE:=1
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_LIBSUITESPARSE:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=1
-		USE_SYSTEM_MBEDTLS:=1
-		USE_SYSTEM_LIBSSH2:=1
-		USE_SYSTEM_NGHTTP2:=1
-		USE_SYSTEM_CURL:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_ZLIB:=1
-		USE_SYSTEM_P7ZIP:=1
-		VERBOSE:=1
-	EOF
-}
-
-src_compile() {
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	default
-	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use system-llvm ; then
-		local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
-		cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
-	fi
-
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-
-	# The appdata directory is deprecated.
-	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
-	elog "To use Plots, you will need to install sci-visualization/gr."
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 1104445200c6..c60d8052940e 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -2,19 +2,13 @@ AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dff
 AUX perl-5.34.0-fallback-getcwd-pwd.patch 8158 BLAKE2B a6870b26dbfadb54c5ea4f075a4a5caad8d789853aade84ff434e5d994e9fdd82cdef6314a576b8cdb3a9948aa73aa650c1ff4656e9c8bca4fb58384396332b1 SHA512 fe778c2348da48006927b179d02d33489790f41afa079fabe6350853b2b2d8c168d0db7b81f1b6c988e3ac46d733326aab4aa4423a04d6380acf74eed91cfc5c
 AUX perl-5.34.0-gdbm-1.20.patch 1627 BLAKE2B 9cbe976f43134022aab2aca203ee6590af52ccf628fa240c00334b14f090d01959764cd7d495a39c59eb59cdf69b0e527900350450f9995d934769ee461aac33 SHA512 fc6481a6ccbef4a19a966453472bde0c5dd1ea321be2a9682eff009c7431e18043d2c75b26ef296232a5f4e310992fc8955d19aef439d9f30b42ba9e9c9d561e
 DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b
-DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112bbba3301b8ed724739c7ff96b041752aa505b938e257ef6ebf98a9b6dad1858e00f756c841a0520688d974e9a SHA512 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267
 DIST perl-5.34.1-zlib-1.2.12-encrypt-standard.zip.bin 207 BLAKE2B b52e1322930d5f7b8d6e3a319d24322b5dffb2313bdc757c0c8eb8713fd03adace199c8449ccc306e49b5b71e3c1b9786b2acb0ab8780a09d718a1c54f653226 SHA512 5a7e0950f0f94bd961fa9cf3e4ab5dd30006bee0f4553da755688a32d0411a4a850a28d4f998b36e7177dcf3aba192b899ca4138e84452baffef1a0b2ed1fb7b
 DIST perl-5.34.1-zlib-1.2.12.patch.xz 180480 BLAKE2B 39da5c1ef406d018f73e641d86ff81d5257cf1f7d6c1b0caac9651a546d70a2e0fff53bf0fc584907e792cb681a961c8442ab355f8f0c2cfffbb26c997cdbac0 SHA512 b32b57721b10943e21003429b42c535f7833e450f097855162241775a161a557fe0ea86ce615d6a9c885f165f45438cabba5580f9b299796d3a3da5ea720f1ff
 DIST perl-5.34.1.tar.xz 12760168 BLAKE2B 3768e55f66551c83295153e91d25d568b7b8638789141f7fcd5a304509cb391cb9ad0232ba6ac70113bb0881ddb00ca5b19c53aa01e1e206c44401dad60d8942 SHA512 9261958291b49eea30c120a89e5ee32dc6a5fd46de4869c89c3d6a4c1162d6cf192ebe429d01a293eda93d8680ce15294af27717fd4ec4c75f511c1fa820fdac
 DIST perl-5.36.0-patches-1.tar.xz 20352 BLAKE2B f5413c75c5bbced230ad7fa692998caef8e4041f3394ae5212dc2aaee465de619b56cf07551be1bb36f2e06b9ed7d0ddda31ad4a7ec81d5c0c64b698ddd80379 SHA512 ab24577b6d71a13d9ccf272efa0881b29933b6a39532ca0d71d4c9a134f451bbe5f3d87c6c851f26114702ac3f92af5c5a72129a458ebee31e372106955eb157
 DIST perl-5.36.0.tar.xz 13051500 BLAKE2B e4864a4c21e5242df4164c73db8af10f7b9c36b075e0c05777abec79716db7778ccbf2c0c9e7e749518ad310019d2a6b32bd8b5ab2af5a8b16b5d920f83d034f SHA512 6dd6ac2a77566c173c5ab9c238cf555f2c3e592e89abb5600bc23ce1cbd0c349e0233f6417cbbf1f6d0aefc6a734ba491285af0d3dc68a605b658b65c89f1dab
-DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982
 DIST perl-cross-1.3.7.tar.gz 118291 BLAKE2B dc9c060857d6905c817e91c3f5b1f546b76e02c6de02dc260185e0de8628a5ead3a557501da75549e2585cd30879190558740e697b1c78a69fa08ccb5649efcd SHA512 1111274f34f8b46e9f418883e9b1652ba4a5a9b4a5880a9a5b38bc8aeb5d75a9f4943233870f5ebf5fbcdc0c30b2983ace11ad051b55d3283327d8f2c15e172c
 DIST perl-cross-1.4.tar.gz 113861 BLAKE2B 7c7783afccc6a04ab122a7c60b1cff7f0a2725655b2b63325ca25d7b8acb0cf993b496e2a590db943054336337ad215550b6b2a565f1d91a5aa9cfe3a4c36db4 SHA512 bde73cac13c0b42c4c6783d7e30dea491d70b65131e1c8434ef75db1f39a8e15ef5857568b706e8456faa3822402676dd247a1f20f4bed983597fdd5a6b4faad
-EBUILD perl-5.34.0-r10.ebuild 25937 BLAKE2B bb47ec2a7285786444059b4bdbe0d042edc43a5060aeed47e924c94d7c1ecdd36c7428b5209530266239e6f2f81aa5228c3699a16916fc8e92dc489265fc1c82 SHA512 cdaed792f1eb988a38fe2f17f99e1cb5c8f5414374619f690832c7980ce412ad6e7276e1ca4285201c3c728e00ae631a5ce0657eba4e4b217b260c7d2acaf0ab
-EBUILD perl-5.34.0-r11.ebuild 25943 BLAKE2B 4608ec616c9109d4b7489ef51279b7b02cd82bb772cafa901de54940edd99b975dac51667a1053663e9bd0be95c53c4ca3d57f8c140479e467ad2034a2679b1c SHA512 54370926c8b81b5800a09709fccdb2c59e405c5909f235e40cde0955fd79896e813f3003ab60f1bc4febd8ece638347be4f2cf462e640f5f14e3ffa107e45a9f
-EBUILD perl-5.34.0-r9.ebuild 25681 BLAKE2B 40f1b6ac52be6e8df0b387a6024110a4c52c75e06ba3b8281ad1864b0c42bb7eb7ca98ff3fcbf6897d0fca79e90513d4fc2eea3015669ba67878155ea5ce986d SHA512 8ebea7faa3ae639845b44b64266eb643c5cdeb9df41a6ba529f7f5fabcc3944570a9c132bc1a186abf2d46e9436c55e4deca7f76a2bcdd8a945d3f469c317be9
-EBUILD perl-5.34.1-r2.ebuild 25771 BLAKE2B 3875ad6fa3de0ff25f96a2e76bc0e56a5760c169abbd6f44a0c85f36c22a32dd02dbc8b75903353404fa7d11e10c9049a2d98896477728047bdc847f7641544f SHA512 ae09f9195ce3cdecc9aa43759527f62bc4d0002ea21c659f29186ec1e2dd7eeccb58d947567a225ac8961a84fea590c7ec49bc1b51401651c9580613351b9aae
-EBUILD perl-5.34.1-r3.ebuild 26309 BLAKE2B 05be3cb2c0860cc59559bb502331dc49cf8d6908e9adca14474ca64f6f24a0cd5701463264910f6622135b75c4b9b1f8a34c7c0cf2da86abb5e38e321a78cd11 SHA512 f401b9cb0b285a91c97b3b0c1b39777a86567e43b7334cf071b877b086016ea33c979693a9a92f57719dfcb8e67f0c996b8bc91c06150d7377efd926ac67b5f3
-EBUILD perl-5.36.0.ebuild 25533 BLAKE2B 8d15f3430f9d865a588b67e86bfa1a4b31e40ff5e3179a4ef5145bce3e9cf6a578f5a18b84edba177a298389d40f5c75becbb2345c14e02bd62833b2d5e6339e SHA512 3d3a6ca1914e0957e79d3990e1953e7ca074b126e149c285afdac456f819b79d568ac67da0381c7a0295912b38b808dd802baa8f6100573d9f04c6ace2d74539
+EBUILD perl-5.34.1-r4.ebuild 26353 BLAKE2B 4eed897c147ce3bdd062e17a5ca9653956a70b50b9041e16ef7293fcb9ffafd7b74d96ec2b4497a4eaa69bf9fc4018374127593eba514adbee98df2296522c7d SHA512 e0005cc1674804e274e072e19bd4208c3bc84e1eec788689997104ec15489613fc7fc5252fafa2a3eecc8b9fc1c8560a8d0e90fa6962b1adb78d1dfbc2ef3d03
+EBUILD perl-5.36.0-r1.ebuild 25577 BLAKE2B b94fea0a61054533995d612248c7f52e294ad1e0a686cef34ba2b650f8ef9242f49ab982088c52cce21bc2459529e4b93d36e449d00401eb874fe391658d8f2a SHA512 195ee185fd64d99bfb13c9d957046589ad7332800727df36114fd2c4f3b5069366e71d2f18671763e033b19ba254882330925f4992bbe997dcd6608b0fe8fc6c
 MISC metadata.xml 621 BLAKE2B 8a14a3efd31858bd5be39476ff86bb9facf3984bbb1110c5b30c3af7aacfe0148357cf7c838ad94799c090a42ed036cc5a51205c3fcfd0d010833e0dad0e4820 SHA512 656902acadb21bf951bf08ca7775c095a5ec76f881215a2b7d3a42eb344a2b9e337cb9260ab87ff5a1730b5a0ef4efe852affdf2e418df9c7c39f18a0a7b89d4
diff --git a/dev-lang/perl/perl-5.34.0-r10.ebuild b/dev-lang/perl/perl-5.34.0-r10.ebuild
deleted file mode 100644
index b94dfcf6d2c5..000000000000
--- a/dev-lang/perl/perl-5.34.0-r10.ebuild
+++ /dev/null
@@ -1,828 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.6
-PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-CPAN-2.290.0
-		>=virtual/perl-Encode-3.120.0
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.280.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif
-		 (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use quadmath && ! has_version dev-lang/perl[quadmath] ) || \
-		 ( ! use quadmath &&   has_version dev-lang/perl[quadmath] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads, quadmath, or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use quadmath ; then
-		myarch+="-quadmath"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 794463, needs further analysis what is exactly wrong here
-	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darwin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	add_patch "${FILESDIR}/${P}-gdbm-1.20.patch" "0101-Fix-build-with-gdb120.patch"\
-			"Fix GDBM_File to compile with version 1.20 and earlier"\
-			"https://bugs.gentoo.org/802945"
-
-	if use prefix ; then
-		add_patch "${FILESDIR}/${P}"-fallback-getcwd-pwd.patch "0102-5.34.0-fallback-get-cwd-pwd.patch"\
-			"Fix installation during Prefix bootstrap (finding 'pwd' from coreutils)"\
-			"https://bugs.gentoo.org/818172"
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# fix environ linkage absence (only a real issue on Darwin9)
-		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
-			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
-				Makefile.SH || die
-		fi
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y" or like "5.x"
-#
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${SUBSLOT}"
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-
-versions_to_gentoolibdirs() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	use quadmath && myconf -Dusequadmath
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH, in addition, we override
-	# cflags, so we loose PERL_DARWIN which enables compat code that
-	# apparently on more recent macOS releases is no longer necessary
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__ -DPERL_DARWIN
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Dccflags="${CFLAGS}" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ -z "${ROOT}" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.34.0-r11.ebuild b/dev-lang/perl/perl-5.34.0-r11.ebuild
deleted file mode 100644
index 23b0a697df81..000000000000
--- a/dev-lang/perl/perl-5.34.0-r11.ebuild
+++ /dev/null
@@ -1,828 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.6
-PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-CPAN-2.290.0
-		>=virtual/perl-Encode-3.120.0
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.280.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif
-		 (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use quadmath && ! has_version dev-lang/perl[quadmath] ) || \
-		 ( ! use quadmath &&   has_version dev-lang/perl[quadmath] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads, quadmath, or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use quadmath ; then
-		myarch+="-quadmath"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 794463, needs further analysis what is exactly wrong here
-	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darwin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	add_patch "${FILESDIR}/${P}-gdbm-1.20.patch" "0101-Fix-build-with-gdb120.patch"\
-			"Fix GDBM_File to compile with version 1.20 and earlier"\
-			"https://bugs.gentoo.org/802945"
-
-	if use prefix ; then
-		add_patch "${FILESDIR}/${P}"-fallback-getcwd-pwd.patch "0102-5.34.0-fallback-get-cwd-pwd.patch"\
-			"Fix installation during Prefix bootstrap (finding 'pwd' from coreutils)"\
-			"https://bugs.gentoo.org/818172"
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# fix environ linkage absence (only a real issue on Darwin9)
-		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
-			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
-				Makefile.SH || die
-		fi
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y" or like "5.x"
-#
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${SUBSLOT}"
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-
-versions_to_gentoolibdirs() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	use quadmath && myconf -Dusequadmath
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH, in addition, we override
-	# cflags, so we loose PERL_DARWIN which enables compat code that
-	# apparently on more recent macOS releases is no longer necessary
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__ -DPERL_DARWIN
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Accflags="${CFLAGS}" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ -z "${ROOT}" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.34.0-r9.ebuild b/dev-lang/perl/perl-5.34.0-r9.ebuild
deleted file mode 100644
index ba13129590ca..000000000000
--- a/dev-lang/perl/perl-5.34.0-r9.ebuild
+++ /dev/null
@@ -1,820 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.6
-PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-CPAN-2.290.0
-		>=virtual/perl-Encode-3.120.0
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.280.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 794463, needs further analysis what is exactly wrong here
-	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darwin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	add_patch "${FILESDIR}/${P}-gdbm-1.20.patch" "0101-Fix-build-with-gdb120.patch"\
-			"Fix GDBM_File to compile with version 1.20 and earlier"\
-			"https://bugs.gentoo.org/802945"
-
-	if use prefix ; then
-		add_patch "${FILESDIR}/${P}"-fallback-getcwd-pwd.patch "0102-5.34.0-fallback-get-cwd-pwd.patch"\
-			"Fix installation during Prefix bootstrap (finding 'pwd' from coreutils)"\
-			"https://bugs.gentoo.org/818172"
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# fix environ linkage absence (only a real issue on Darwin9)
-		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
-			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
-				Makefile.SH || die
-		fi
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y" or like "5.x"
-#
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${SUBSLOT}"
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-
-versions_to_gentoolibdirs() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH, in addition, we override
-	# cflags, so we loose PERL_DARWIN which enables compat code that
-	# apparently on more recent macOS releases is no longer necessary
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__ -DPERL_DARWIN
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Dccflags="${CFLAGS}" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ -z "${ROOT}" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.34.1-r2.ebuild b/dev-lang/perl/perl-5.34.1-r2.ebuild
deleted file mode 100644
index 2d2c3d383cf5..000000000000
--- a/dev-lang/perl/perl-5.34.1-r2.ebuild
+++ /dev/null
@@ -1,824 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.7
-PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-CPAN-2.290.0
-		>=virtual/perl-Encode-3.120.0
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.280.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.80.100_rc   enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.203.130 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif
-		 (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use quadmath && ! has_version dev-lang/perl[quadmath] ) || \
-		 ( ! use quadmath &&   has_version dev-lang/perl[quadmath] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads, quadmath, or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use quadmath ; then
-		myarch+="-quadmath"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 794463, needs further analysis what is exactly wrong here
-	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darwin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	if use prefix ; then
-		add_patch "${FILESDIR}/${PN}"-5.34.0-fallback-getcwd-pwd.patch "0102-5.34.0-fallback-get-cwd-pwd.patch"\
-			"Fix installation during Prefix bootstrap (finding 'pwd' from coreutils)"\
-			"https://bugs.gentoo.org/818172"
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# fix environ linkage absence (only a real issue on Darwin9)
-		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
-			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
-				Makefile.SH || die
-		fi
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y" or like "5.x"
-#
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${SUBSLOT}"
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-
-versions_to_gentoolibdirs() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	use quadmath && myconf -Dusequadmath
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH, in addition, we override
-	# cflags, so we loose PERL_DARWIN which enables compat code that
-	# apparently on more recent macOS releases is no longer necessary
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__ -DPERL_DARWIN
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Accflags="${CFLAGS}" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ -z "${ROOT}" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.34.1-r3.ebuild b/dev-lang/perl/perl-5.34.1-r4.ebuild
index c92f6b9c1571..608bf4e02465 100644
--- a/dev-lang/perl/perl-5.34.1-r3.ebuild
+++ b/dev-lang/perl/perl-5.34.1-r4.ebuild
@@ -600,9 +600,12 @@ src_configure() {
 
 	# modifying 'optimize' prevents cross configure script from appending required flags
 	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
+		append-cflags "-fwrapv"
 	fi
 
+	# bug #877659, bug #821577
+	append-cflags -fno-strict-aliasing
+
 	# Autodiscover all old version directories, some of them will even be newer
 	# if you downgrade
 	if [[ -z ${PERL_OLDVERSEN} ]]; then
diff --git a/dev-lang/perl/perl-5.36.0.ebuild b/dev-lang/perl/perl-5.36.0-r1.ebuild
index bcc7e531057a..1ae7dd84b33a 100644
--- a/dev-lang/perl/perl-5.36.0.ebuild
+++ b/dev-lang/perl/perl-5.36.0-r1.ebuild
@@ -583,9 +583,12 @@ src_configure() {
 
 	# modifying 'optimize' prevents cross configure script from appending required flags
 	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
+		append-cflags "-fwrapv"
 	fi
 
+	# bug #877659, bug #821577
+	append-cflags -fno-strict-aliasing
+
 	# Autodiscover all old version directories, some of them will even be newer
 	# if you downgrade
 	if [[ -z ${PERL_OLDVERSEN} ]]; then
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 54720069d16a..97d158dc36ad 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 9fbb040af366..5630b208a224 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,3 @@
-DIST expat-2.4.9.tar.xz 459284 BLAKE2B 105fef732e26b691f6c212341b7377b518d693aa67f106d0ff2f0fbccd798b7526473ed21e22b6d2b6f1ca8aa7d0eb0adc62ffdefc3c2cb81a6af5a379e64de9 SHA512 8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169
 DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6b152f215a5302ad3238c69c2386393d7a6c70bc284be35ce97bf27d87115c3391f4bc17406e509d739d3e31 SHA512 2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516
-EBUILD expat-2.4.9.ebuild 2284 BLAKE2B 2f75d5b3709f2891725858a1b4f0f3d357288453653c40e32fcc599caedc1e0d6e0755ce497d00a535f2ac6ebc925c7ad4b9703bb6e88c58ee6f6a45f49dbb52 SHA512 216cf850735cbd4d992b7163dd2fe921f368876af70fa9d84229bdfb81f54d61078937ad007645d6b4578f4262f6ad963a19d13546d0d28aa5ae87cfddf6ff00
 EBUILD expat-2.5.0.ebuild 2284 BLAKE2B 2f75d5b3709f2891725858a1b4f0f3d357288453653c40e32fcc599caedc1e0d6e0755ce497d00a535f2ac6ebc925c7ad4b9703bb6e88c58ee6f6a45f49dbb52 SHA512 216cf850735cbd4d992b7163dd2fe921f368876af70fa9d84229bdfb81f54d61078937ad007645d6b4578f4262f6ad963a19d13546d0d28aa5ae87cfddf6ff00
 MISC metadata.xml 571 BLAKE2B ebefe11eb4a54dda87048089930a051a629fd99a6983b3c804dfd033eee4017c3b1871cbdff56c8659cdf74b19651cd7f2134721a9bab3e8a752d4a1694c6266 SHA512 8d726b1dee71528e43c8693bd4b08cf33a94f43470126aa18a51ed248b032c5e8b9d801c5b2d5f58c2fd7896b32ee9e6eb3953395e5a6004cdf00569d114ad1d
diff --git a/dev-libs/expat/expat-2.4.9.ebuild b/dev-libs/expat/expat-2.4.9.ebuild
deleted file mode 100644
index 284d45d381c1..000000000000
--- a/dev-libs/expat/expat-2.4.9.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="examples static-libs unicode"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0e1efae7b55a..f644dc2bca12 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -2,7 +2,9 @@ AUX libfilezilla-0.37.1-pthread.patch 371 BLAKE2B d00dae184c6229628b7a37de6f0884
 DIST libfilezilla-0.37.2.tar.bz2 609128 BLAKE2B 8ff4bee0c007c2c527d172bef8a6efd4e3238e9a265d75d5a8bcc50a204e0fcef09876f112d7eacd4df4f4cf6551361e99646dd7729ab09774a7416440c5ee06 SHA512 a8902977bae5f442045faa8a68c2f85e667a2371b1e643fde49e592fa9544b0a672c476246b01b2ba7b52390b37b0f1f33e5196be4499eddf5783f225091c93a
 DIST libfilezilla-0.38.1.tar.bz2 621099 BLAKE2B f998fda61907edeaa62d29f686a2dfa2ef34f35866010720c4a6d8a7e16ffa7b079d0ed2098ec7df24a3921bf437362fde48d7cd53af9eca2fefd326441e65bd SHA512 486aa4934f3fde4684c134ac7648edd0dfbd2dd2082909cd8ecafcccf9e3e9a86874c250773bc28ad25a8c40c8d34f242008636efdf4d311764682cf89b6fe39
 DIST libfilezilla-0.39.1.tar.bz2 622574 BLAKE2B 2845f0309f8a9036f42930203b89d503ffe5897dbb819cc9249b3179deb24f5c562843471712702d7a302df0b3c7dead1bc108de9dd5dd4b1cb1501cd3ef9ba1 SHA512 b5c4dcaef146ea3e249a4972e66aa441187693bea148f0ead0c08568ecf1856a78c7455cbc70737d82b9c33c2af5d6abe79dd4cb2dfbb65bdcefd6765016dfb6
+DIST libfilezilla-0.39.2.tar.bz2 623763 BLAKE2B f3fac951ea46e36d45748697f4f8d78b46176d457c42a031355f3d35713d419b31b2e886bfcba9f769814c67b8cd797ebc67b2ec6f338213a22dda7cc0282b6e SHA512 ffa0728aaaa90e1561f8ab6bb855bf21068d0a653dd764560064b36efc20b9d0182d97151fb528a7fb26fb2f1779a884d23f1e4cf0b13fa7984e7f3568c9c217
 EBUILD libfilezilla-0.37.2.ebuild 1279 BLAKE2B c006b6b170ed278276c58d06e1f020c7222ca3b885b7347fdd4040e48090a71a18988f9312ec0a2737961d3d19b3edf841a560e10b91f55d20e3fc064459f4d3 SHA512 c7051a0f53fdba70e31b60210abf737af21bb9777ba9076a8d1fe86354783d6fda5cbbb4a5e6e0a761564ab5112546b54ded95dc1f363400e7e333fb344e99b5
 EBUILD libfilezilla-0.38.1.ebuild 1283 BLAKE2B 915534e57d936d9d65b9611e9eef3be233268d1fb2402c63c19e0804093f3651a374d45265176728269cbaf1c40de27f20f72e87878217fcb71f016c0e35b8dc SHA512 eb437975641dd579897053ea508c2b177624b7cc6fa76125bbf8b68c4604738ade22ad147f931d76827147f9e805bc409f9f6df8b1aaaf789ca767d1416389ed
 EBUILD libfilezilla-0.39.1-r1.ebuild 1283 BLAKE2B 740ac24c9607e504f82df7898f8a0bf39da88054140aec9c3ad11b518595af95d266962f920b6dd9086d936fff4eb2f711d8e512272b523d9ce732d4544ecdbc SHA512 6dfffef9304cb007edaeae5eabb7ef439689e598f24a7016d9256fa718bc014fa8b55c9e358561a0075083dd6404e6d8d5ca43e651df385f434e3c829acc1572
+EBUILD libfilezilla-0.39.2.ebuild 1283 BLAKE2B a035da3ed2331f22470d989d9b582087ec7f1dbcc73a69fec37bfd94d94f5b6804c499e6867fded465b564c319b2f462d030eae16513a4c45bb95ef86afed522 SHA512 24484380ffb8ca6e59417a5825e4e9970c8a92a823ba72c6eec7a168d84c7789cfc223ddc06fcaf4a53386324439c5e23b6f9c68f1a840354a7af706774cf47c
 MISC metadata.xml 1125 BLAKE2B eddf5dd9e7af700c9cdfd68918acef8a6064a8f26e4531f047315df70a4c2d1e2d2a4b3257062e5af1973fef5490606f08a0c6460e220d25b3d615c7d4626e57 SHA512 6038a9eb07bf8c4adaf9bd3abaa3abc283ba8d8c432aa193fcc1932071afdbd6a6bb50a16e5e7f4f0cce4afbc341bb26b1b265b8f0da12728f8db06103d73ba5
diff --git a/dev-libs/libfilezilla/libfilezilla-0.39.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.39.2.ebuild
new file mode 100644
index 000000000000..f3634e7ca805
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.39.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/32" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 402343564e91..12d3912d8265 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -9,16 +9,11 @@ DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b1
 DIST simdjson-2.1.0.gh.tar.gz 1618798 BLAKE2B 019e04ae5c5d0e43bf81734edb72d969d95fa4325f2e9aa51258d71587a6d71e4f26edd9beb2797fbf420ee4d7434985e7d960943dacedfab3a6afe616ca20b9 SHA512 6689349195ac4f0f94d47915f90b69663b6a010523fcf58fbe8bb3815db946c65208104c6f1e5d97e42cc1e1b883e5488c059df0afcc7f6e648e2ab3eb97af13
 DIST simdjson-2.2.2.gh.tar.gz 1623231 BLAKE2B 1caea4b5224194770af5b43c82110faf9fd17450935af67e3f9e6d3da164ffd3d40a4cca49a4d1b3007549835ecb838b6788e97059548dfa86b206ce240bdbd9 SHA512 a11698491d12aac3b92dae0fd994d0809910cf5c88550058c84035aa3bec02ab4541ab99e12db6605581f6ba61d7951a2cf3988fc20a467f4993f35d24cf2a76
 DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
-DIST simdjson-data-1.0.2.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-DIST simdjson-data-1.1.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-DIST simdjson-data-2.0.4.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-DIST simdjson-data-2.1.0.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-DIST simdjson-data-2.2.2.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-DIST simdjson-data-3.0.0.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-EBUILD simdjson-1.0.2.ebuild 1835 BLAKE2B a6aed9d075d74a17c1e27a94eef4f83414705e797987445d8000565989730f1accbf832ca531f05ba8fe7feb388b1ce2abcc250ff3286cda5489c76fa56f3d4b SHA512 c20ff75ec5887825b30564f0e6cd48bc533bcdff290cd278b09b87a53cbd5685b066b87c0bdc148959f6424feceaa9910b975f52875e450bb32f484ec17986d9
-EBUILD simdjson-1.1.0.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
-EBUILD simdjson-2.0.4.ebuild 1842 BLAKE2B f7ddb79888fc5224565e6e58203db7c22f444732d159ca55efd6a0af4617f23db7e8a7ea0eebf828ab2285dc4a6ce9b030238bcaa10c7c162313a3b0ccc21e7c SHA512 c42d70b050e1819f0e735bd06a7cf306fb3bd57328499a573f69775a362089c6eb214d5171f385384e6c66bbd6cc6df02c70c8b553d8aae322db127267a2a4c3
-EBUILD simdjson-2.1.0-r1.ebuild 1843 BLAKE2B e7048ec0f2ecee5481551faf3275a0b02ede89cfdce97d466b2ee48c2bde561127ab2c0a0c33e76fb7157d961f616df6ef38e1f16bb3b5e0cb71f7cfc0255d40 SHA512 5591ea1c18f56d6341ed60c30f644b23d17013e7004da0f270b3cda5f2709911978e9318eb6e135559152aa61b834bdb09308cd5d179e318dfbab36c8aa5a0c9
-EBUILD simdjson-2.2.2.ebuild 1944 BLAKE2B 4f677e417e9556d5bd7044dd22e844ee9192ed69890800c2c957df44fd17b693c9ce45c6550525cb6528becd975064d444854cb38c4b7b280a024fc9349e5ef4 SHA512 5d04913b39bfc174ea856156816cafc7601cde569edb4d2404a9bf1b1ef09b7b2d4161e2ff6b006ae04381bc4af6b7878e85cceddebf4b18d79fb38cc42e0d6c
-EBUILD simdjson-3.0.0.ebuild 1963 BLAKE2B d9521b53f395cd8728105223383fd206075e33f37d29fa0f3ccafd3245443f982e0dca9e4250674f136f7776c4e6d20b884ee431b490bd30dcafe67298997536 SHA512 ae8d7b843690baee5bad72afd498eaacc72d14e298cc8ff6dae9e9c56fa16606a88a84419595a42ecdd34a65de658e8166b73ca69b854021e11c2097f4b772a7
+DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
+EBUILD simdjson-1.0.2.ebuild 1842 BLAKE2B 0ec96a582374f90cc251c439d53efa12525eb1972690ad375230d52c46776e596163709fb8153b7dd659dc050bf2b10f4808b4ae59aecd6c5c7b1d2cf6bb9276 SHA512 c5456dab7147fb0c12ad614510d4cd4113393488e81b07e1df4b8eeca2e51b6c5743bb96b441f4b162d9af0311b39fb8243921b68483cc1b721058bde82afa12
+EBUILD simdjson-1.1.0.ebuild 1843 BLAKE2B 277dd893ec0192e28d5f4d6b9827b4e77137424494a6343d5d80d19b03de810a30769537175fea60bd7cd6eb9cccb470f743c4539dea6950205d455dae5f0260 SHA512 b866ed3ee6f160c534384addf22a6fc5c82825c5c0fa99515e4a220254abff566ff7f2d97ffec6479226120a2fe571bc41a7df304cfdd54fac353f4f0c100387
+EBUILD simdjson-2.0.4.ebuild 1846 BLAKE2B 518b0373b05e663bdc1f15220cd1cd712aea0e3afcb36225f1c2c5855292a1e3339e564ea8dff1f08a4f7282d649ad3ecd0b76192ffd785a9fc0b8e120782845 SHA512 d56d1753269fd5bb568d65697fc9320708088d48b61c6009fa90910740211e1ed2b4b890f90dcf33ad5d10eef7cd7fce7034e3fe39a99526240b2d53e4b83a88
+EBUILD simdjson-2.1.0-r1.ebuild 1847 BLAKE2B d55871b794b0182455e6b76256a4f419d53f76f7e0d4e1888ae377672537a3fb4c3f39a0eaa02fe7e706ba064e491ca145713bf95ec1dc8bbe659527b8483d55 SHA512 b9578e0e6adc1251ecc0927263778a79f8c9b853692a0b99a52275e9a5b7e4482ffb9fb04f50b600f4ae3e46a7ea9e6c59dbbab2aa0121d02d992821757a5384
+EBUILD simdjson-2.2.2.ebuild 1948 BLAKE2B 57a0584a67609a2b9d0f770eb8d8afbacba3703efd95f2a637ea8d9ceea1bc3ebefa67ae6d91bf0b7e1411937b690e160582e1c204d15210d0ea9753a7d548b0 SHA512 7872d6151ce862e9aa1db794c5881ee30a9a22233ba572fd87186abd19fdb05ccff0cd3cd8f2e60461cc022580a74daee6550c439434e32a6f18bb11e13a8e8a
+EBUILD simdjson-3.0.0.ebuild 1967 BLAKE2B 178ba82680b3af401cfe1dbb3f1a0668348923a7142252503e9952b30d1843fd38c6d19e913cac0d22c159eb07ebd5061a7b7177ddfb48301f06ab9343e8c9d1 SHA512 027959194f1270605e19cd7271f909e0b0df228bfb5db283f39278124c8c752209bc3d92a6db1adbaa06f2f4640e2e5f7d39758f705431f8d226c767d0e5a3b8
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-1.0.2.ebuild b/dev-libs/simdjson/simdjson-1.0.2.ebuild
index 27dccfd0acd0..71e7e89153e9 100644
--- a/dev-libs/simdjson/simdjson-1.0.2.ebuild
+++ b/dev-libs/simdjson/simdjson-1.0.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.tar.gz )
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-libs/simdjson/simdjson-1.1.0.ebuild b/dev-libs/simdjson/simdjson-1.1.0.ebuild
index 01fbcc889778..6f9106ac1e38 100644
--- a/dev-libs/simdjson/simdjson-1.1.0.ebuild
+++ b/dev-libs/simdjson/simdjson-1.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.tar.gz )
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-libs/simdjson/simdjson-2.0.4.ebuild b/dev-libs/simdjson/simdjson-2.0.4.ebuild
index c4d2349ceae7..b8e15288e648 100644
--- a/dev-libs/simdjson/simdjson-2.0.4.ebuild
+++ b/dev-libs/simdjson/simdjson-2.0.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild b/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
index fd5c432b2c77..55fc98496a4e 100644
--- a/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
+++ b/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-libs/simdjson/simdjson-2.2.2.ebuild b/dev-libs/simdjson/simdjson-2.2.2.ebuild
index 7df57819e2e7..976892c2f0c0 100644
--- a/dev-libs/simdjson/simdjson-2.2.2.ebuild
+++ b/dev-libs/simdjson/simdjson-2.2.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-libs/simdjson/simdjson-3.0.0.ebuild b/dev-libs/simdjson/simdjson-3.0.0.ebuild
index 756653fa008a..cac6dd3f9eba 100644
--- a/dev-libs/simdjson/simdjson-3.0.0.ebuild
+++ b/dev-libs/simdjson/simdjson-3.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6d6c34ee1e9a..1f7faa6c25d5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index c67cab8854bd..4bb0c34c7720 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,4 +1,6 @@
 AUX abydos-0.5.0-fix-py3.10.patch 719 BLAKE2B e0607ecb3633642be5b2b034088b7dd097d9dab3acf44619a3fb9493b8cc91dee4b7fdfc2564d88d60ffb83991a95d1f71838e2b48968a1983cf491a59d15c91 SHA512 12730eb82a3186f62da662456fd6648437ac631a3f0278d5840919b13d2798c154115c60f2301560b64234c28b30c68bf761989c682e57cd34c6279e92dcb531
+DIST abydos-0.5.0.gh.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 EBUILD abydos-0.5.0-r1.ebuild 981 BLAKE2B b7fed06f873295a9b8e9e63fbb74e9c1f22554680d278afaf7ef8ace71e5e7ca3f4dc736eb07f3125a01e67d1a224e5ab5378716954c230bb9cc48102efecc9b SHA512 5804aa55c3672d492e12299a7d7612eb3736429779bce20d7084e88d1b0ef5c9aef9f3397a92b0c02f00774e4754d2ab3e7afbb3507a92ad2e4cf66fd78db477
+EBUILD abydos-0.5.0-r2.ebuild 1017 BLAKE2B ec16a44c4b7533ab84d941a24e193f42555b78d2888bd923ada5d36aade9b5c5ab6004dc32cddd89f5a37943d4ba735cb90be49dd609002937b9c21562871fad SHA512 df39b0a9651d1ab7ff2ec54886a6ac6e089b0dac8e156c7d28bb0383823bbd48e00088f758d7cacb711875aa77350a7f5a0063f127a1da7e1488c2e8730dc5b2
 MISC metadata.xml 407 BLAKE2B f28b4d12169f91e75d4bdb117fef6bc8e3a1a1a9bce3498aa11a26d1ad71c486d4ee8a76084551d3563530a2d492c2f47b4d8f830e00d7379fe079ba1e3df8a8 SHA512 1738b7309d3a9f0e90c5716ac0376274d1f34bb3264d8a3bf69dfe020724417f1b89b1883eae34bba9cd0147b5f2e8962114a216a5e684fd10365505f684fac4
diff --git a/dev-python/abydos/abydos-0.5.0-r2.ebuild b/dev-python/abydos/abydos-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..22bcda516f48
--- /dev/null
+++ b/dev-python/abydos/abydos-0.5.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Abydos NLP/IR library"
+HOMEPAGE="https://github.com/chrislit/abydos"
+SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+# Requires access to the internet
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/nltk[${PYTHON_USEDEP}]
+)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+distutils_enable_tests pytest
+# Extension error: You must configure the bibtex_bibfiles setting
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
+
+python_prepare_all() {
+	# do not depend on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 4ed1087b2fd4..0b08d9d0dd35 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
-EBUILD aiohttp-3.8.1-r1.ebuild 3657 BLAKE2B 2da81b97e0b3f1d167557b6d675acd9a857e45b45166e924493900eaf395e77cee71d45b2f0c7e428ce7a0f22bd47cbfabc49fbb9e462216029a271a57dc5f7c SHA512 d9b644e44be853ab68704d175ac8a99bb292fd09fc8097c356ee0f8b06335420c3cec66bee3d20a554c0413d278e35c25cda08251fc5e00fcca20f2f68cb0e69
 EBUILD aiohttp-3.8.3.ebuild 2922 BLAKE2B 7b83eef57c1f351019b48661f6cab4e73f2228eb54a3494f5519d96fb094f65cadc8f75e4e0591b72fbe1e516374bcaaba6952f86c1f5f603fbbdb3d186e1f47 SHA512 1bce1e9c1aa73de44f1716d2921295689c637c305e6de8db94110a55389e1168ccacf86c7bcdca92ad51c1b63d17d50807990f24fdbc38fb1b6e0c72f701f254
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
deleted file mode 100644
index 2f2c34c7277c..000000000000
--- a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-LLHTTP_COMMIT=69d6db2008508489d19267a0dcab30602b16fc5b
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
-
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-
-	# which(1)...
-	sed -i -e 's:which:command -v:' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	# workaround missing files
-	mkdir requirements tools || die
-	> requirements/cython.txt || die
-	> tools/gen.py || die
-	chmod +x tools/gen.py || die
-	# force rehashing first
-	emake requirements/.hash/cython.txt.hash
-	> .update-pip || die
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# runtime warnings
-		'tests/test_client_functional.py::test_aiohttp_request_coroutine[pyloop]'
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# C extensions are not used on PyPy3
-				tests/test_http_parser.py::test_c_parser_loaded
-			)
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# known problem with tests, not code itself
-				'tests/test_client_functional.py::test_timeout_on_reading_headers[pyloop]'
-				'tests/test_client_functional.py::test_timeout_on_conn_reading_headers[pyloop]'
-				'tests/test_client_request.py::test_data_stream_exc_chain[pyloop]'
-				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_with_loop
-				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_without_explicit_loop
-				tests/test_test_utils.py::TestAioHTTPTestCase::test_inner_example_without_explicit_loop
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
-	rm -rf aiohttp || die
-	epytest -n "$(makeopts_jobs)" --forked
-}
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
index 72bd65e5e86e..352f7b6c8ace 100644
--- a/dev-python/klein/Manifest
+++ b/dev-python/klein/Manifest
@@ -1,3 +1,4 @@
+AUX klein-21.8.0-test_resource.patch 1068 BLAKE2B ac1dceb24d74a5cc23eb1c89cd26f2fb308a834c1a6ef7452fe20dc46fd312ab38f4cb3479aa74af5f82744f3184528ca91556e3186e70c0fa930fb40710f63d SHA512 89a1ddbd4b53e3a0d0f6b1e0972805411f2d935e6b4059afd0f4259259b9e3e7db5df2c31063cddcb183ddc256d087f496b47cb40165d14d67ed7a96ec731b7f
 DIST klein-21.8.0.tar.gz 100578 BLAKE2B ea2535e93affebe822ff086eb5749481edf7811340a35b11319b7c23b23d3877f6208ac1ef6cc7a4bb9eedd33d087820304f2ee71695413d72308e83c47aa2ee SHA512 cce28865e172effb6044f73c1841875fa5eb55daf20dcea482d0764604ab826ca5063a4679165bb253953d54428a42c2082022fd273e2a1083aefa595a563ccd
-EBUILD klein-21.8.0.ebuild 1133 BLAKE2B c4fbb1fdb49b926560d96026ed8fc700acfc9e32de6147738cf4840f78cf5b447d81fd53cd5535f61911b2d387c4e834a8260a76ed7dd4a4ef2c029285ed6210 SHA512 8b99ef4deeb0cad871bdab7678b5983b7cad86108099fb89b55ec8821e5262e978b7785bf9ad3012cdf60d311c7f519eb54089758072cf95bffba6833d60027f
+EBUILD klein-21.8.0.ebuild 1186 BLAKE2B 452f7d5215506f9d4374cfb0c04f1ffb25e44e0fb2c575b08895aa394ce0991f2958faf5561637290c761d8a4b2eb130704f03b802df0b80959c1e165806986f SHA512 8bbe59cd936459a993f6907cb01441e06a0193bbf56ce1e803c71887f5b380e464ca792f00b864754edda8e5fcab597b37decebded9d5d27f72f4972d50a5322
 MISC metadata.xml 973 BLAKE2B 870f3a89f25a7b230a3b837287ed3c0f96bb2ada0eeaf464b0bbf70c4982be57a783c73671309044053d24c57f9c77d79e72ec65d031d8ddd4e7e406822823fc SHA512 9e81588cbd096d31af040b48e467af6d124d4f4249abf808b4ee4a8f1171b5c02a8e5d87bcb869d8f4d86c3224c9e555a1e5f3d4aba8a1b2a179f3c5aa609726
diff --git a/dev-python/klein/files/klein-21.8.0-test_resource.patch b/dev-python/klein/files/klein-21.8.0-test_resource.patch
new file mode 100644
index 000000000000..c9779c46ac17
--- /dev/null
+++ b/dev-python/klein/files/klein-21.8.0-test_resource.patch
@@ -0,0 +1,28 @@
+https://github.com/twisted/klein/commit/bce8b85036a6d185b9e8aab037c805f81354544c
+
+From bce8b85036a6d185b9e8aab037c805f81354544c Mon Sep 17 00:00:00 2001
+From: Glyph <glyph@twistedmatrix.com>
+Date: Tue, 31 May 2022 17:44:13 -0700
+Subject: [PATCH] testing exact content-length is way too strict
+
+--- a/src/klein/test/test_resource.py
++++ b/src/klein/test/test_resource.py
+@@ -2,7 +2,7 @@
+ from io import BytesIO
+ from types import MappingProxyType
+ from typing import Any, Callable, List, Mapping, Optional, Sequence, cast
+-from unittest.mock import Mock, call
++from unittest.mock import ANY, Mock, call
+ from urllib.parse import parse_qs
+ 
+ from werkzeug.exceptions import NotFound
+@@ -642,7 +642,7 @@ def foo(request: IRequest) -> KleinRenderable:
+         request.setHeader.assert_has_calls(
+             [
+                 call(b"Content-Type", b"text/html; charset=utf-8"),
+-                call(b"Content-Length", b"258"),
++                call(b"Content-Length", ANY),
+                 call(b"Location", b"http://localhost:8080/foo/"),
+             ]
+         )
+
diff --git a/dev-python/klein/klein-21.8.0.ebuild b/dev-python/klein/klein-21.8.0.ebuild
index 3008d5599a89..da5e00f51a2b 100644
--- a/dev-python/klein/klein-21.8.0.ebuild
+++ b/dev-python/klein/klein-21.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="micro-framework for developing production-ready web services with Python"
@@ -30,6 +30,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test_resource.patch
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index d52aaa77d735..67582e3bf398 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,3 +1,3 @@
 DIST nltk-3.7.tar.gz 2851947 BLAKE2B 4cd4fed9f26de7996bcabbd71d500c072489e79ae0edb29f09577e465227c948efa7130af6975b029e77fb79db015437a9e3311eb28048d02dcc2356441d0908 SHA512 66d79afa59f18f2bf7d086dcb22813c7b92239c05669daa62866dbda06c0ca22367317749cf19db3e41a7bdb405d4f87f72b695aa58fd0669bf36de64f1f9888
-EBUILD nltk-3.7.ebuild 1748 BLAKE2B 5d2a3752c513001ad9b6ac47d8f5b34436cb81b6907ea5ca00716096b974d2425312c1b256aa47cc090202ce23566b70a64f828cad7d36b8d1b95dc126f0048e SHA512 1a2fbdb43ccbd916f0a1d3f79d32ef97181fe634b459c0d0d38c2efb4986de4c3dc68494b9fd245d9cc7163d94740e26a37b4d7355913f923ae8a78b3373d45d
+EBUILD nltk-3.7.ebuild 1748 BLAKE2B 5d3b06138802ee36b269b01eeb62249051c9a5de807b249f2ec4efeda7860508d779f997c627097f907427d950d7e516b06c45718640f3413078ab83662b0967 SHA512 d72f2d36b1f3d3a83d7685cb8d3e2d4020d9264fc5772e8643fd9090985274ff3c3c7084228ca240c80b7c945eba3341af8dc9cf96e7b2debc9eeafbf09b9fda
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/nltk-3.7.ebuild b/dev-python/nltk/nltk-3.7.ebuild
index 0eb34545c3f7..0855f4a1b8fc 100644
--- a/dev-python/nltk/nltk-3.7.ebuild
+++ b/dev-python/nltk/nltk-3.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite,tk?,xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 915fa8d39ee3..ccfefa0148b3 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,7 +1,8 @@
 AUX pythran-0.10.0-tests-werror.patch 480 BLAKE2B ac7b6fe2cd4b4aeed3be4baf2a433ff48ae9e2bedc7be70c04122bf097906480e57d077ed485e0e47c6414d390e64fdef47d5ef77a890af99403defcc43b0bc8 SHA512 e699298e03b5d0e868aa2704100f47368baf2477c4f3632d97f1c65af0ff6babbbecab3c083f09f09353194dedc3b77b653b1b8ae9ac7967ebc65c8932bf8bdf
+AUX pythran-0.12.0-gcc13.patch 1472 BLAKE2B f385cfd607a77a72fd5815502416b267342dc6d9307b5d6974ea4a5188233b19efaf389fa90051b9435130a63aa892870a9d573d3c7f50a5cdf83b034a15d3d1 SHA512 b42398b068da7fbe35e9f8fdf76579102347f63f63b94ed2db1966b15e3ff53c26a1a015a8a5a53a36d4e0cd1ed4689f9f4fae120741dd6804fc9a3adc78404a
 DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
 EBUILD pythran-0.11.0.ebuild 1216 BLAKE2B 3bbdd186dec832ba93efc8681b36738f28779b6b30068b27309ce7a3701a15a95387e56878bf77aa7f7ecbd316328dc9d815178a2c471e0441bf12ca5deb86bd SHA512 78fdf9b66ddf94d3513a2a07203ac1274e9d1dc928afabea0a573e47716006606a5ae38c372a98c7e601195080bd876a3bb816e74c3aaaa49b9f3f56f106ea87
-EBUILD pythran-0.12.0-r1.ebuild 1438 BLAKE2B 8e9886ec0cf6b2f7e51d32abebf8c4d718c7722537a0d29a887a8ed1f29ded7e8fe160f517213a304ec0b24e628b494ea60549220285629b1194b8052bcf83e8 SHA512 08a540208a25712104cfc21668f972fa1eaa021d02e1e1980ae3576415f3ec08dce71f5296127295e687a154c0932649ad60ad0743c9a65e5e530252c94ce49d
+EBUILD pythran-0.12.0-r2.ebuild 1478 BLAKE2B 3548ddd74816e938f39338d2c0b258595f49581fe80f2afdce6b0f07b3968c38410b531618500e147e2aae58078738f9a750dd361140af681830a51bb892070a SHA512 ae94645859d96d389e04ef9918a40c9793fec41f9f6fd0c2d64133d754bd5e1628945528c148ef1000f8d36e00a6e7f8480ebe246c5dba2bce501568b3fbcee6
 EBUILD pythran-0.12.0.ebuild 1190 BLAKE2B ef04054cb343d9a3c3e0bdc5fe2f6c41aef90bef6cb2eaf2d3fbadf35430677072a45e0888fc05a8874bfe6b61bb799b0cf9b86a93fc493e95a5e1c6e95dcce1 SHA512 794a5d327f8c9aeea34cdccd596726c7084a14e8a9a9af7ec604afad6f602409b814eac6fb042a7a8a8626a38a5e1e3aadcaa531d0233bcefccffe3647312dfd
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/files/pythran-0.12.0-gcc13.patch b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
new file mode 100644
index 000000000000..d7b9f28f0f45
--- /dev/null
+++ b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
@@ -0,0 +1,36 @@
+https://github.com/serge-sans-paille/pythran/pull/2029
+
+From 13a89edad477077331ae8071eadf239e88adea0c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 28 Oct 2022 12:47:35 +0100
+Subject: [PATCH] Fix build with GCC 13 (missing <cstdint> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When building scipy, one gets:
+```
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:304:17: error: ‘uint8_t’ was not declared in this scope
+  304 | SCALAR_COMBINER(uint8_t)
+      |                 ^~~~~~~
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:300:21: note: in definition of macro ‘SCALAR_COMBINER’
+  300 |   struct __combined<Type, Type> {                                              \
+      |                     ^~~~
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:5:1: note: ‘uint8_t’ is defined in header ‘<cstdint>’; did you forget to ‘#include <cstdint>’?
+    4 | #include "pythonic/include/types/traits.hpp"
+  +++ |+#include <cstdint>
+```
+
+Bug: https://bugs.gentoo.org/878527
+--- a/pythran/pythonic/include/types/combined.hpp
++++ b/pythran/pythonic/include/types/combined.hpp
+@@ -1,6 +1,8 @@
+ #ifndef PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
+ #define PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
+ 
++#include <cstdint>
++
+ #include "pythonic/include/types/traits.hpp"
+ PYTHONIC_NS_BEGIN
+ namespace types
+
diff --git a/dev-python/pythran/pythran-0.12.0-r1.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
index 585d64925bd1..3a8d913b453c 100644
--- a/dev-python/pythran/pythran-0.12.0-r1.ebuild
+++ b/dev-python/pythran/pythran-0.12.0-r2.ebuild
@@ -49,6 +49,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
+	"${FILESDIR}"/${PN}-0.12.0-gcc13.patch
 )
 
 src_configure() {
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 427a20e621bb..a3aa7aa6eadb 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -39,15 +39,10 @@ DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
 DIST pyo3-0.17.1.crate 394706 BLAKE2B 30d4d6285c977f0eb3581dd89e4d2cdb2c9badce3729c03f7f8f41bc0be9253bf4ef0d30b0c137007fb26cad02e17efdfbbe6d248829edf111be0ecf9c25a2fb SHA512 d5e28c9931abd06050e7dbf261024aeaf7a81b079b27cfdd610a2be08ee2e64c60f0c4d90eee28565a98a6ee34ba228e7085b7fecc85dfc504b66a6cf77dcfca
-DIST pyo3-build-config-0.16.5.crate 28880 BLAKE2B b821818831e410dc75df12f9f9625986ceea97d00f3160fc8cbf7315f003f94bad425bcfb3db73cca07ec62de47b763196e019e37d16beed9d5cf7386c05ca6c SHA512 91a9eb743b05808ccb5816a631e381167b16707515a68bbc43c04dee333c2537fd03ca1ae4a02b26738c79baa695b5dfa603753eee58e9002ac6b33320d275c6
 DIST pyo3-build-config-0.17.1.crate 29232 BLAKE2B 76e95012c0c2713f41bd70c49ef06f5e48ee6d89cce158902eb7d2c805c241e6cadfbac426de35bd3078307f120814d06a39fd227e093982807e825b868a3308 SHA512 1ec2d8069a8eb247b3e152adb47f675ba3d05aaecf13f7d3a580bac128339b9220f9dcf9f984009e0e8d4b9e11415d0b563c0087fcdd1499acbe8d263b3330bd
-DIST pyo3-ffi-0.16.5.crate 60737 BLAKE2B 84907201cf48e57a6b692a9261d67d005d0b773965116dd22d679eff2a3a02ee4f59678dde896635052e62c55ee2703f30726a65651a0f38fdcb31e8c95e3059 SHA512 8b4a486dfd204ea5c394b6832f5e2ead5cd88bc2a943bbc156fcf70e8212be6fa96af5c9ce06ce28a2d0e702fee858f26b49094070e00be658ffe3fa84265496
 DIST pyo3-ffi-0.17.1.crate 62851 BLAKE2B f23c29b4ba41ef59dc0723fbf4622e3a1f32ca127cf76d72f5e4f8988da448bbe9a7a324fbb57233e5ac1369e60b1ed0ef02f7ebb1576a31447fe060919c63d0 SHA512 f67462e48b8acb8a9b01c93f9100a37b45801271598398a106d7fc7bf9721c51ba114fe6d0b919b2199e29fdc8a0945a79ba18d766d1f22a536ff75ed5902235
-DIST pyo3-macros-0.16.5.crate 8456 BLAKE2B c37f31ebcea08fec38849ac52e6a52613b07e7532d7c79889ad52693461a0966e69a6cf29d4c2c8da19bce7e7d05e8c103dddccbb41667c69b28bb15cd388230 SHA512 c4f4993ab67d2f8fc6f1fe5c0eeffc00c10024e201c64fb49f3075f5c33af63d2d455f7696b094fe9786091469a27c5472cb11aea3e9c3b73404578ba76a93fc
 DIST pyo3-macros-0.17.1.crate 7229 BLAKE2B ef54df6d41d309dfd6bee907e83c63c53352b0a5fdc910bb1617b999bf5cc316c0ec81e504200d72b69ea9819e2da3e74027106f6ae08d8de751b91bc4fee7c6 SHA512 2958728e8d9d5c99ad785aee9755bca4ae6bf8b5b8e13af4a00a4fce9250af51d64093aaef8f19c8861557eb8f6448de75c55b1c637968d481241ff2ae8abc3e
-DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a7b63f1fd83ab20c7458fbafa17e61ff34053c8f81d22151a30aa78980bc983a73cb1e56b2cdc5a55c5d8ab9b7e3941ab7503 SHA512 c85a1f53311355e96284cffc40d181aa65d63f9fffcdf8fa33fa989b771bb1b412ab118c9d3b08b1f686936797edb24c61c000dc59bbc5c69aacccf70b035b4f
 DIST pyo3-macros-backend-0.17.1.crate 49872 BLAKE2B 91d58229cdb012bfa701816d091309cf02e397a80e91663f050a800868cc7a7e54128c27c3b7a82467487c3c84b341baecaa2a36d0154a14602a272aa634421c SHA512 e4b706a80c9239d23c8c3b125d17e6f66ec64a442294d2cba3f21b50bd8ed839e6ef8816bacf9dcd9c5a15d4e0660f0594b4c1a213ffa3b59b19630720b76948
 DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -62,7 +57,6 @@ DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
-DIST setuptools-rust-1.5.1.gh.tar.gz 293895 BLAKE2B 039e1fc36e4d1d49bf930c01c124cb98a5e0d6d913ba6b96bea9121457a855446e3ac3a3b3be471fcf4fb8849e38ff7dc41a9f4ddc400f78f723ba3e0bfed571 SHA512 0a763f371b88f3d22ff0dced8dc23d29534130a70133b63fa9097f7466957e13ee1ac812bbdea1a46ac3effb39a2d4349f1314e6cb0d20dfba407e07d37c7c14
 DIST setuptools-rust-1.5.2.gh.tar.gz 294274 BLAKE2B b0de905facd0fe110c25c037980826b09d64bab625be0a5be53ff981d37b02bba2b0aa3458ff0a95cdb1fb4ecdbafe08236167b76c1606c534dd8a4e04d68287 SHA512 e80d1296fd09c24b644d821e981261153ff19ae62d978fc8ee81c78e440d215f9d1e91e33d758effb94fcb64985937445940f2e2f032ad1b8c2aa39be79cf19d
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
@@ -80,6 +74,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD setuptools-rust-1.5.1.ebuild 3212 BLAKE2B aded7568d241e6ae09bcffd5378365a395e472ee33a3ca3a0c1040a3e7036361e14aca32f6d2cba46bf6b61b9ea52098ba66bd7311a0bda8ff8b283984cd7acc SHA512 5cf29bffae0f68610bb7498820f87a42a10b1cdc9cc707d9282e8ae33610c19c716a56d5063a146d302389b9f45b56cb98105ff83e115657305b6c3c30e87e18
 EBUILD setuptools-rust-1.5.2.ebuild 3244 BLAKE2B df7c8607fd3eb91db25d607b26c9b8b627620e9f688eb0dd38021a4a10c923547cc41671a9918c902b3b683e46d280985bea9a7b21dca067361c0e7a74cba25f SHA512 cbcdc75f387b0869ca1864bff50f21b1632a7632b6b85f0761e9d48d06d2d8554fae7af9148b230e71680d63f9bf8a96a5331cdb691d1d057d7d84dd2d219afc
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
deleted file mode 100644
index 948cfcc46b3c..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	convert_case-0.4.0
-	cssparser-0.27.2
-	cssparser-macros-0.6.0
-	derive_more-0.99.17
-	dtoa-0.4.8
-	dtoa-short-0.3.3
-	futf-0.1.5
-	fxhash-0.2.1
-	getrandom-0.1.16
-	html5ever-0.25.1
-	indoc-1.0.4
-	instant-0.1.12
-	itoa-0.4.8
-	kuchiki-0.8.1
-	lazy_static-1.4.0
-	libc-0.2.121
-	lock_api-0.4.6
-	log-0.4.14
-	mac-0.1.1
-	markup5ever-0.10.1
-	matches-0.1.9
-	new_debug_unreachable-1.0.4
-	nodrop-0.1.14
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_macros-0.8.0
-	phf_shared-0.10.0
-	phf_shared-0.8.0
-	ppv-lite86-0.2.16
-	precomputed-hash-0.1.1
-	proc-macro2-1.0.36
-	proc-macro-hack-0.5.19
-	pyo3-0.16.5
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	quote-1.0.16
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	rand_pcg-0.2.1
-	redox_syscall-0.2.11
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	selectors-0.22.0
-	semver-1.0.6
-	serde-1.0.136
-	servo_arc-0.1.1
-	siphasher-0.3.10
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	string_cache-0.8.3
-	string_cache_codegen-0.5.1
-	syn-1.0.89
-	target-lexicon-0.12.3
-	tendril-0.4.3
-	thin-slice-0.1.1
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	utf-8-0.7.6
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? ( $(cargo_crate_uris ${CRATES}) )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 2398c5edae6f..feefd3e51410 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,3 +1,3 @@
 DIST treq-22.2.0.tar.gz 72922 BLAKE2B ab4637c801e5e777f81f6e6a6e12e36ef47e052a4103eb70bf4e10d3fb44b60f144f32734625b4babb375acc96e3cad1895634d3d2fc08ac3095769180e65328 SHA512 465a02481a51ac246ac85f561f2e7a59d97aeeda9f0953dd83678ff836802a187a6aedcce830a9e3095a9c72227bd06113610c3be0967f1362a645a31278bde0
-EBUILD treq-22.2.0-r1.ebuild 1147 BLAKE2B b4633f061fe0fb1ce042759ca5eeece1290eeb5afe29d233f83905f693160bc0ac4fc5dd192444497ee44c389796f5951162a87d88bf21137e2be056892078fd SHA512 172a330b81610b2b70d9119bf7b6f49908993f5b96117417e7070f1a0fd5993d103d77886880259db89e695ef525994c931fb45a63920270e016a2df7b42742b
+EBUILD treq-22.2.0-r1.ebuild 1147 BLAKE2B 2b7d72317bcf194c0f7355ac007b26c88670c155e74dd8a7934e0381c30e5279b32a1b6ddf465b491aa3a1047e56616c72eefba7b9ea3dd0cc676f9de558c643 SHA512 db683296a8ebfc0af6a81f2f80906c952d7cf50f3c3dfc598ceab085966f5fe9073be251dc409c5e35281bfe2ab9965707925dcaced4644c7eba52c0664e29b7
 MISC metadata.xml 781 BLAKE2B a50fa9d74c53d5c948cfd940ff1e454a2aa9c44bf29c8e39495007ddab02e212a979f757335fae531ceae43743342a02a4ae049b5b12425ba779293c6977eb07 SHA512 1d45744f461efe3cd03802e3886dee60a19eb508b681e3235817f478dd98ca164c822194f03b05891e0000e3d09af4790e8b10e07f3e303abf9ad308712ca9b6
diff --git a/dev-python/treq/treq-22.2.0-r1.ebuild b/dev-python/treq/treq-22.2.0-r1.ebuild
index 02970f97aa02..738cd26e7b9b 100644
--- a/dev-python/treq/treq-22.2.0-r1.ebuild
+++ b/dev-python/treq/treq-22.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 53052eb8929c..eb0d84f572f7 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,9 +1,3 @@
-AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
-DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
-DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb69388720775c9555bdb0ce19341cb58fc051ab6f92066a3478acf729513dafafd79f31115b064bf1d3660479de SHA512 dd6dcec38f7f94dc0cf0123302fd6fe404428196b452a80a8258a207654e3f67e210233be3d649668c22b48390232d0347706b1d87fb50016287142c742b806d
 DIST uvloop-0.17.0.tar.gz 2279973 BLAKE2B 7ccbf3b8e723e36c1010a70e256de0ad1a9728fe10b3538e05c57157b16ea7e5369347c855cd1460e49f89197ebb05628c4b6fcd7e50c623b1aaa5890ac64b5f SHA512 861d7f28ad879ecbfa40d53b9626e38660f02618fd433edbd5a8ea5100a17ade042a26549def04bc23f928aca3adc83d62503f0548038cd400284f5654003ee4
-EBUILD uvloop-0.15.3-r1.ebuild 1393 BLAKE2B 025fce332c25bb7e1fb1188ad9257a8d807da11c71a3b6bcf02b3bcdb54b22b0522cbe0ebf3ee7a2bacc90342d6820ea6952473e45baf9dd92e7638dc1a545ae SHA512 b6e13f27b6b06046c133c0af0d55a03a211c5a56cbf8eb37fe8f6b33b4e8a3440f2353f50485dfe415145f0c17b1b6f24329d5fa16524d86baae68cba3ab4a64
-EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
-EBUILD uvloop-0.16.0.ebuild 1418 BLAKE2B 5ee1d50ac599e891886a6a2b9e72a93a2e0da3d327cb6d645e01b0ee02ddf05c5ca3a941144a5b98af6618c313dae561a5903f2099be11de8b82044d7d386014 SHA512 9ca8fadb5a77f5888479828f225b378c9f501e2fa520a646cfa46c7b44cba8981f846d9862c983fffadb0db7e7f2f7d33656a665d95ee8fff1e391e8c73266cb
 EBUILD uvloop-0.17.0.ebuild 1842 BLAKE2B adcf5bcefe09bccca8d35adda876393d3068c20e9b51a0f9bc21fc4ac2d1cef753bba15dba5bcf785b95754d53205f0701d4e821d0bc9fbde500b7d54a12632c SHA512 6e5eedc5495201f54250e44ac80d61589cc9f828df8b97f8234a42e2a7a0cb9a19c72c22279aba8bc57b5088add1f99f2c4ce153c36321d21ac516a63f1d7810
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch b/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
deleted file mode 100644
index a74fedd308e9..000000000000
--- a/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 732df28f0739d84c687d3e6d81995dafa18ac775 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 28 Jul 2021 09:21:00 +0200
-Subject: [PATCH] Revert 32-bit thread ID hack
-
-Apparently the hack used to fix 32-bit platforms actually breaks 64-bit
-platforms using large thread IDs (e.g. sparc).
-
-Reverts: b5b4abb16ba558cf957cf40120dfd4937c53aea5
----
- uvloop/includes/stdlib.pxi | 2 +-
- uvloop/loop.pyx            | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/uvloop/includes/stdlib.pxi b/uvloop/includes/stdlib.pxi
-index adf9806..21d69e6 100644
---- a/uvloop/includes/stdlib.pxi
-+++ b/uvloop/includes/stdlib.pxi
-@@ -135,7 +135,7 @@ cdef int ssl_SSL_ERROR_WANT_READ = ssl.SSL_ERROR_WANT_READ
- cdef int ssl_SSL_ERROR_WANT_WRITE = ssl.SSL_ERROR_WANT_WRITE
- cdef int ssl_SSL_ERROR_SYSCALL = ssl.SSL_ERROR_SYSCALL
- 
--cdef uint64_t MAIN_THREAD_ID = <uint64_t><int64_t>threading.main_thread().ident
-+cdef uint64_t MAIN_THREAD_ID = <uint64_t>threading.main_thread().ident
- cdef threading_Thread = threading.Thread
- 
- cdef int subprocess_PIPE = subprocess.PIPE
-diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx
-index d9b5aaa..96c9cde 100644
---- a/uvloop/loop.pyx
-+++ b/uvloop/loop.pyx
-@@ -707,7 +707,7 @@ cdef class Loop:
-             return
- 
-         cdef uint64_t thread_id
--        thread_id = <uint64_t><int64_t>PyThread_get_thread_ident()
-+        thread_id = <uint64_t>PyThread_get_thread_ident()
- 
-         if thread_id != self._thread_id:
-             raise RuntimeError(
--- 
-2.32.0
-
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
deleted file mode 100644
index c52b01da9204..000000000000
--- a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/${P}-uint64-thread-id.patch
-)
-
-python_prepare_all() {
-	cat <<-EOF >> setup.cfg || die
-		[build_ext]
-		use_system_libuv=1
-	EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-	# TODO: broken by cythonize
-	rm tests/test_cython.py || die
-	# force cythonization
-	rm uvloop/loop.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
deleted file mode 100644
index 53214c0c6779..000000000000
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	cat <<-EOF >> setup.cfg || die
-		[build_ext]
-		use_system_libuv=1
-	EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
deleted file mode 100644
index b01168428710..000000000000
--- a/dev-python/uvloop/uvloop-0.16.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 -riscv sparc x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/uvloop-0.15.3-uint64-thread-id.patch
-)
-
-python_prepare_all() {
-	cat <<-EOF >> setup.cfg || die
-		[build_ext]
-		use_system_libuv=1
-	EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-	# TODO: broken by cythonize
-	rm tests/test_cython.py || die
-	# force cythonization
-	rm uvloop/loop.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 20d5dd25f932..9222e3cc082e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 1ef88de1a733..24548d6141b4 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,7 +1,9 @@
 DIST bats-1.5.0.tar.gz 108052 BLAKE2B 68bba9d263e4206ead7039da2b09c5211c834445efdf429dca6c53acc5409de1052ce7ffa9143e732d3aeaeb6ea6dcaf9b419adc02776e601545557dea776e36 SHA512 e0386fb32214db67ae001a2040c44277988af7fa909a820843237c7d47eedfa4e370238d5b2d06a4667b874cad4b00f2cd14624b1bc45628192e5d693bd5073a
 DIST bats-1.7.0.tar.gz 124590 BLAKE2B eab244f018ec568c280d20540013eaa9e5a8d84ead8e23b9db2f8d18bbd7ebd43c60ab38cee008e0d016a219f16aa6f52733d5f891ffb8733ca8576a5738dd22 SHA512 22ca033e004087cabf645417ea184d2e1a0704575f702a94de5b63b3af6d1fd4caaecad86a5cb49687c606728d875dd13b4d5de66599b83324980fdc71cb92e2
 DIST bats-1.8.0.tar.gz 144262 BLAKE2B 4f12d4c5211535f11a3cbc856233a59e0c3bcd892c6f021055458960b450f908f3b865cee38ad2c2569be41ab81e2fdb973003be85890f70f8894c8a17812b42 SHA512 e51ea85bf2f455881a90220d783b4a261bd91331326a7184eb31ea9adf31c18a79a062fd77af12d082ccef953d992382ec19ca9a27395b2a03c4a9a120bdda76
+DIST bats-1.8.2.tar.gz 143952 BLAKE2B 0c2302f2c77f5ee0446a6559355d24fae8bb2f178b5b17778fea44ec2f069c061c2930814f73e56671bf6f7cea44a74cea9b6436ca80941a1747197ccddcec02 SHA512 7eace32f19789e081112af1ce8ab33ff210d52bd3ea84962bbec226349b3b8d8912b6a495f5524f9cc7cfe692f1d23d684c93c24e182752e2b30731670d6eeea
 EBUILD bats-1.5.0.ebuild 939 BLAKE2B 0750c121bef1d633f9b5eefc3074b091c195ed9e79a2c9c1108dabf67cb1b36b3f9edbb1c051016241ef8323319fb98ac67e899073dae9afd6b1fa6b313224a0 SHA512 a7a9d1f19f587d6164b6bce7f45ecd3c9d72d8ed02e19ec8b41cf1ffb6a931f5c49a083f17ddaea40a39f4eb65d4e23b800e6227cacfa3280b56393d95a77ed9
 EBUILD bats-1.7.0.ebuild 961 BLAKE2B 9784652ae9dd598080e0e6eecadd271f1339d07d578c6cd7002c15ca72d5ca81b2898fee0bf43d1187ccdfaeab7850603ab9aa9e6078b6daec1f73c27e8da305 SHA512 a893f28d5d1734476b2ae7361b28870b30731cc3ad9cf8a4c29d6cdce5789af44a4467840e743df1723aef15f9b1aaa15c60cea237934e34fedf961fbd08c328
 EBUILD bats-1.8.0.ebuild 962 BLAKE2B e564d5e54a8cd1b3761a872a2c9050bee6e8397ed0c3a650ab38116c919094aad9ee1cd7dfbe375afeb06ab1e013dde960102c3198fa37308cf3f66c44b69429 SHA512 ddf8d88853f77f71041467ec3c51b11706755603760da354ab8a941de5209642e919a87f41ba9fe8eda3e9895951584872f64e3423d0dcfcd671054df8dfad73
+EBUILD bats-1.8.2.ebuild 962 BLAKE2B e564d5e54a8cd1b3761a872a2c9050bee6e8397ed0c3a650ab38116c919094aad9ee1cd7dfbe375afeb06ab1e013dde960102c3198fa37308cf3f66c44b69429 SHA512 ddf8d88853f77f71041467ec3c51b11706755603760da354ab8a941de5209642e919a87f41ba9fe8eda3e9895951584872f64e3423d0dcfcd671054df8dfad73
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.8.2.ebuild b/dev-util/bats/bats-1.8.2.ebuild
new file mode 100644
index 000000000000..d42eecab71cd
--- /dev/null
+++ b/dev-util/bats/bats-1.8.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	local my_jobs=$(makeopts_jobs)
+	if ! command -v parallel >/dev/null; then
+		my_jobs=1
+	fi
+	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index c33c7a4d4fa5..8cbda3bcc44d 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
-EBUILD geany-plugins-1.38-r2.ebuild 2961 BLAKE2B cb88625ef671b21c9b2f1963d213c8202362c94589bc2a5c7b0f9454fda10cb3d8e204d333263858d75b541c98ef762a50df5bfdad5ce996729d4eb6d0d32f8b SHA512 1aa2d6fbf79d54dd019a5c44d30bc0bce9f1c92f9b93074c28808e55f57e701465fddcb9c70671de4ce8b33da7e2a65945233161619d6937c8a3a08caa94fd4e
+EBUILD geany-plugins-1.38-r3.ebuild 3149 BLAKE2B 87ecf0359f05615c1245276a07e4124d4a525804bd346a325b2062051f3dd652737d64531f37f7aa7c1625b3869c6f9a81d23b0bdc071564940d2ec58f7a145b SHA512 4f21de3e93bcca6057ae70433a8c85a0cb7406611969654f1f2ac0df65c9e095863d0188d2096ee1e15a27874c00fd422bc8ccfb4635e74da8aa453040aef8d3
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r3.ebuild
index 5cd0d8af7efd..f74c64c1a2e0 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 
-inherit lua-single
+inherit flag-o-matic lua-single
 
 DESCRIPTION="A collection of different plugins for Geany"
 HOMEPAGE="https://plugins.geany.org"
@@ -52,6 +52,10 @@ pkg_setup() {
 }
 
 src_configure() {
+	# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+	# deprecated (in 5.1) luaL_openlib API (#878529)
+	use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 	local myeconfargs=(
 		--disable-cppcheck
 		--disable-extra-c-warnings
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index a040b416c7e6..695d3b96579a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,16 +1,13 @@
 AUX musl.supp 758 BLAKE2B 168ff4f38cc6b3c11e949fbc6d7c1e024259d2c02ae1424123b1f99d77c123994270ab56067ac6f1923c0dc1e8b29336a2f9fa7a9010f99e5731f6a7be5bb7d1 SHA512 55f57c84241ad32443095e7cd74607ec8ebd1dd1e67de3ab2b87e996e416980484cc9b9ef13e54bb0c0584d2ffbbd4ae9389cf1215b9c8751dcb77d2816e49f0
 AUX valgrind-3.13.0-malloc.patch 1086 BLAKE2B 004bb1c56f4e8b73838c62563503a3a550d8ced9fda8114d3dd02dc3013171de8116f1510561010256c1855e5ff3e62dd1921f82cfcb14ae78cb566d43423d60 SHA512 15b4d485bbb1fadfaea0ddc0e10874f09438ec4085bf70c2209c0854eaa9bd587f96bc0cf1c367a07fb09acb9dee17b5756a41237d04ceaa573bba0bda0ec523
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
-AUX valgrind-3.17.0-lld.patch 2837 BLAKE2B 331c5eb91f476271a82d6730b5aa628ecf3a9b63765b480dab0d0f43669f078764272b3ca2813747b863fde70664a71b8f801590374ee340618ea0b8f1bc193b SHA512 d96fc27cc28dbf9def7b73d92ab2eb54c32ffe04590b3621a5d2e2926c420de46ace81a75466d8b50ff7b27186c5134ad810916f120e620afc6e902c0f3823f5
 AUX valgrind-3.19.0-clang-15.patch 1263 BLAKE2B 0b1734061165735c0eba127d46250bca3bffc4a5c884c4ced121172561e36c7bebc9e138ef6e0ee519de5fb3dac37050540fdf576da5e7690e47a8ecac6a6f32 SHA512 d7af318c02815f705cf307ab673622de7c1b9afa4cc9fdbedfe6b06a98ac7798e1d19ee5836826f0d45c331a2ec2518c5515f7d908b6b8f22d3e4753b176d977
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
-DIST valgrind-3.17.0.tar.bz2 16459075 BLAKE2B 96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c SHA512 94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f
 DIST valgrind-3.18.1.tar.bz2 16149159 BLAKE2B a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935 SHA512 a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b
 DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
-EBUILD valgrind-3.16.1.ebuild 3703 BLAKE2B 311cbc2ba147e6bde2c6e8352eed928361be75f96c84086870b45decf3675107a2fdae7ae48bca5ddbc1ea5dbbd29bdb886b15f514bbb40d7eaf65772e46f5f3 SHA512 9f87ff366eb7e51d697527350c8135778537b8d2a09ceddc38e96b830f07eed040ade236bb204637e625b336f12508ed36240d0f8818aaa2e60a64e136947ead
-EBUILD valgrind-3.17.0.ebuild 3749 BLAKE2B 6d2fa93b2b3beee059041ea84c24ce99b96379907b707745d90799db4a4e5d034cd34cbaf22c8ef1a61be0c5d4f47877e71ea40080e36f58e5310153a46d0e86 SHA512 c892f4b885b12b9acd73e1a7c1af38256c72329d322ba9f1d1a9d4e815c1eea03e5754376be404a752735c84a1ec8213b0fcf2b010d222967ef71c409d7aea0c
+DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
 EBUILD valgrind-3.19.0.ebuild 3959 BLAKE2B a4599eeb28141def0b522a3e23abe83db44ec8ea47e1438ea2e10abb9bf49fc643e2c1fc7d8cab414ae4108479041575c30c8b204ae296f22b1076fea013db53 SHA512 ae7bc5cdb6f2fc9a882508ea7d7e5407851354fb34a4e8f1dbe5e48814e0d30426c2ab9089217ce4ab57716b4bee42fa54d24e70fe90d8316f956ddc261cf432
+EBUILD valgrind-3.20.0.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
 EBUILD valgrind-9999.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/files/valgrind-3.17.0-lld.patch b/dev-util/valgrind/files/valgrind-3.17.0-lld.patch
deleted file mode 100644
index 56a7c0f72f46..000000000000
--- a/dev-util/valgrind/files/valgrind-3.17.0-lld.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=439046
----
-diff --git a/configure.ac b/configure.ac
-index 4582fb5d0..63fd6c25e 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -2639,30 +2639,52 @@ CFLAGS=$safe_CFLAGS
- # will reside. -Ttext aligns just the .text section start (but not any
- # other section).
- #
--# So test for -Ttext-segment which is supported by all bfd ld versions
-+# LLVM ld.lld 10.0 changed the semantics of its -Ttext. See "Breaking changes"
-+# in https://releases.llvm.org/10.0.0/tools/lld/docs/ReleaseNotes.html
-+# The --image-base option (since version 6.0?) provides the semantics needed.
-+# -Ttext-segment generates an error, but -Ttext now more closely
-+# follows the GNU (bfd) ld's -Ttext.
-+#
-+# So test first for --image-base support, and if that fails then
-+# for -Ttext-segment which is supported by all bfd ld versions
- # and use that if it exists. If it doesn't exist it must be an older
- # version of gold and we can fall back to using -Ttext which has the
- # right semantics.
- 
--AC_MSG_CHECKING([if the linker accepts -Wl,-Ttext-segment])
--
- safe_CFLAGS=$CFLAGS
--CFLAGS="-static -nodefaultlibs -nostartfiles -Wl,-Ttext-segment=$valt_load_address_pri_norml -Werror"
-+AC_MSG_CHECKING([if the linker accepts -Wl,--image-base])
-+
-+CFLAGS="-static -nodefaultlibs -nostartfiles -Wl,--image-base=$valt_load_address_pri_norml -Werror"
- 
- AC_LINK_IFELSE(
- [AC_LANG_SOURCE([int _start () { return 0; }])],
- [
-   linker_using_t_text="no"
--  AC_SUBST([FLAG_T_TEXT], ["-Ttext-segment"])
-+  AC_SUBST([FLAG_T_TEXT], ["--image-base"])
-   AC_MSG_RESULT([yes])
- ], [
--  linker_using_t_text="yes"
--  AC_SUBST([FLAG_T_TEXT], ["-Ttext"])
-   AC_MSG_RESULT([no])
-+
-+  AC_MSG_CHECKING([if the linker accepts -Wl,-Ttext-segment])
-+
-+  CFLAGS="-static -nodefaultlibs -nostartfiles -Wl,-Ttext-segment=$valt_load_address_pri_norml -Werror"
-+
-+  AC_LINK_IFELSE(
-+  [AC_LANG_SOURCE([int _start () { return 0; }])],
-+  [
-+    linker_using_t_text="no"
-+    AC_SUBST([FLAG_T_TEXT], ["-Ttext-segment"])
-+    AC_MSG_RESULT([yes])
-+  ], [
-+    linker_using_t_text="yes"
-+    AC_SUBST([FLAG_T_TEXT], ["-Ttext"])
-+    AC_MSG_RESULT([no])
-+  ])
- ])
-+
- CFLAGS=$safe_CFLAGS
- 
--# If the linker only supports -Ttext (not -Ttext-segment) then we will
-+# If the linker only supports -Ttext (not -Ttext-segment or --image-base) then we will
- # have to strip any build-id ELF NOTEs from the statically linked tools.
- # Otherwise the build-id NOTE might end up at the default load address.
- # (Pedantically if the linker is gold then -Ttext is fine, but newer
-@@ -2688,7 +2710,7 @@ AC_LINK_IFELSE(
-   AC_MSG_RESULT([no])
- ])
- else
--AC_MSG_NOTICE([ld -Ttext-segment used, no need to strip build-id NOTEs.])
-+AC_MSG_NOTICE([ld --image-base or -Ttext-segment used, no need to strip build-id NOTEs.])
- AC_SUBST([FLAG_NO_BUILD_ID], [""])
- fi
- CFLAGS=$safe_CFLAGS
--- 
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
deleted file mode 100644
index 268884944a78..000000000000
--- a/dev-util/valgrind/valgrind-3.16.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.17.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index d1d6fdd5f4cc..aed73f6be21b 100644
--- a/dev-util/valgrind/valgrind-3.17.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -1,26 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="https://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# Respect CFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+)
+
 src_prepare() {
 	# Correct hard coded doc location
 	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
@@ -28,12 +35,11 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
-
-	eapply "${FILESDIR}"/${PN}-3.17.0-lld.patch
+	# Conditionally copy musl specific suppressions && apply patch
+	if use elibc_musl ; then
+		cp "${FILESDIR}/musl.supp" "${S}" || die
+		PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
+	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
@@ -44,8 +50,7 @@ src_prepare() {
 		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
 	fi
 
-	# Allow users to test their own patches
-	eapply_user
+	default
 
 	# Regenerate autotools files
 	eautoreconf
@@ -66,12 +71,14 @@ src_configure() {
 	# -fstack-protector-strong See -fstack-protector (bug #620402)
 	# -m64 -mx32			for multilib-portage, bug #398825
 	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
 	filter-flags -fstack-protector-all
 	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
+	filter-lto
 
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf+=("--enable-only64bit")
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 8cb6159ce151..12f14f103461 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh
index 32a0a944706e..5f1cd2036047 100755
--- a/eclass/tests/scons-utils.sh
+++ b/eclass/tests/scons-utils.sh
@@ -3,6 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+_PYTHON_R1=1
 source tests-common.sh || exit
 
 inherit scons-utils
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 105762659ddc..ef8c9ad3668e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index acbb8d4be334..a1346184d9f1 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -8,5 +8,5 @@ AUX fontconfig-2.14.1-gperf-meson.patch 2559 BLAKE2B 203cdd0d208acaf417e81973810
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73 SHA512 ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
 EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f
-EBUILD fontconfig-2.14.1.ebuild 6556 BLAKE2B e9808d495912d487ce2ebbfa0e6a180334e75c404d1bb415dc0617e2cadf636663c2e944b3906dbc76045b563724d37f997d00cd6f37df611e38e51f26b03ed6 SHA512 412b60c8afeb9c190a516c424d6ddc500eeecbb06102fe90b906eb559d36277de39760fb11ad1373b6f976ec476e6483cda3d787c0f27ec8753dd0c0c74d1006
+EBUILD fontconfig-2.14.1-r1.ebuild 6604 BLAKE2B b48c536470267527ecea36728010bee850dacb531b2a2a34f1319a420bbd2217d258dc1dac6b1b4ed97ccfe8d7e1f16822253feb110c70f0c4e5563b3546a86b SHA512 9a89ff58f3d0c75696ac60f2f94d9066c5b329c9593d3c2cc753d6627c2cb2ab4e42ad61319039dad0f3a62447470d4178b3c6c56af4ebeb0808dfb607dc5126
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.14.1.ebuild b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
index 0cc0f9683203..1b69d23f740f 100644
--- a/media-libs/fontconfig/fontconfig-2.14.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
@@ -124,6 +124,7 @@ multilib_src_configure() {
 		$(meson_feature test tests)
 
 		-Dcache-build=disabled
+		-Dcache-dir="${EPREFIX}"/var/cache/fontconfig
 		-Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts
 		-Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" )
 		-Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 535ad3514894..534825ad89ca 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e7f79ab71578..2f676fedcc0b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 07:39:49 +0000
+Fri, 28 Oct 2022 14:09:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 85adf3de2251..da2dee31dca7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-28T07:39:53Z
+TIMESTAMP 2022-10-28T14:09:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbh0lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNb4rBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCn7g//dVOmLP6h4lEATe/kBBqBHSMmZomVeF7Q6potAWnenKFShvBNugcEazI+
-cYygrvzHVu2eXPsqzMAPxfjN0Bz03icoVPrKMMBrLQRUCLXt4XGRV9ki06oO9mtP
-bw+dHWEcaDxnPNjSnvxpTarh7+wSWBsKxUXXBa1Ohpys8xtOcGdo6vp0rOd3rHG6
-Hf4b50Ywz/tIEZ4hTXwLqqcBFq+qVxHz9txr6nqLBVLqH3jKLPc8rvZcv2dQwAeL
-D9Udj4GkyaqIj86MqaLsK98ZMFAJdRrqMgQjaMU82dNlmJcY9E+gTnQ3NESS5pyU
-rWsExNc95UfRx7YNMiLA0t3jhleukXrc2LNyjMgrh/e+ebwcOeWWR/6LAFSmvI1V
-wCbmlRDAoDZsnSb3Zso3TJwtVPwwcWTp9KLjnoxIDpL+Hqd9grms8HRe5u5qaZKx
-DHAWKgg0Rfa7FePmvKHTkQ/D8k9naXsvqdjDFfGqgkbuLCU9pFxKPj9ofVaVsCyk
-vTL5SR0g/ZEFpttFhM+bDKWuGwQo7VR1mNCFAOLCz/0O6P8uxrA5mwpB22nH4XgC
-OYH7JcG0tk+YtSc7kJCl6F4+l4mevYZ+oZFuv7EnyAOdOHjHUzdrsGVFU3rDlOTp
-ViWOQ2AjfWtC8XwBgcjobYHWCGCX7v+5RILgBjnso+JctMkZMAI=
-=XNDf
+klDS0w/9Ezwm8CW2rjjSFZaOgKzk64zZXx4MwXTTq1AJUyG5yLgWXHpsi835eN3j
+i2PCtr5kygW5Tri5vWlxuByUE25BWfXsp7VSg88HaA6Bsl8/F8cG2odfOs9LTDQQ
+mR3koiyF0VEUSGZRGm4S53xcp92rHOWw407Fj0AZn/YYjWVXcj8pNy4qRuvaBpNw
+KQ8AbfzdvYsoxh039D0F5WF0kfXaUyXgPMRTqxM/csWQErlkUy097OR/nEh+/Lrb
+2ul6AlLzqJVqvRKtWuRx+kaN4EpzZW8F/S6C+98rRrzcnKGrvORq0DeNjdsNvLdN
+yH/48DazYSChE5ZPiGTi933TDlYVYjLYra2s4c9UUZtwm+eXZN0E1xzvUfnyKiAV
+/73Ke8tu+dem/g5FBCpatl3wHObaNPS0bJoKj8mH27v3Vas7sASPxIcHPhlcWuhD
+pvWaOoCkniUPG1zIir0NJgis2g5j+IHMzFVpBnJIm6U45ob/ZEdCs9y7W+TKDkm4
+7sVFIqe7u8QVfVk5OyCubdF19PAkOKCJ7f+YANIrsvo0HhuW10gf/0J0Ej42hXAn
+BWWHzc23m1Cg6/dxQ7IHhf+tl3mxv0h+9H4yR5+t5zJwltEhtkqrjgT0RnRv9J6/
+6hpDpEa7rjE4Ya3Sb2Wmn0U1Raf3pyr5Ms8r+QTVDx9o89Jhmnw=
+=HSGE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e7f79ab71578..2f676fedcc0b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 07:39:49 +0000
+Fri, 28 Oct 2022 14:09:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5002efe9af71..dca74ee086cc 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 8280381295d1..534256b932d6 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.34.1 b/metadata/md5-cache/app-admin/syslog-ng-3.34.1
index ca920283b6e8..552170d8d893 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.34.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.34.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
+HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
 INHERIT=autotools python-single-r1 systemd
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.34.1/syslog-ng-3.34.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ae42fdb29bb02267e6bae34d73a65490
+_md5_=498b43d80e6d033aa439e22011230979
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.35.1 b/metadata/md5-cache/app-admin/syslog-ng-3.35.1
index 0d25c1328352..6b6ffa66b675 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.35.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.35.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=8
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
+HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
 INHERIT=autotools python-single-r1 systemd
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.35.1/syslog-ng-3.35.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a70f2cdd4ec7d99fdd69bc79669e9048
+_md5_=89dcf17acc7efbddce478bd310776e39
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.36.1 b/metadata/md5-cache/app-admin/syslog-ng-3.36.1
index effe06716b17..162b17dc40d0 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.36.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.36.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=8
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
+HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
 INHERIT=autotools python-single-r1 systemd
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.36.1/syslog-ng-3.36.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1a828c44b92b046b403105e03421f886
+_md5_=47b217804c4b99b1b9574b6b9df2c035
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.37.1 b/metadata/md5-cache/app-admin/syslog-ng-3.37.1
index 6f596d7080ae..4a2f86da2146 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.37.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.37.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=8
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
+HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
 INHERIT=autotools python-single-r1 systemd
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.37.1/syslog-ng-3.37.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=adb740f3e7138a5e22a7bc339d16189f
+_md5_=1441e8ae3bbaaea81946a376c9c9cfe2
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.38.1 b/metadata/md5-cache/app-admin/syslog-ng-3.38.1
new file mode 100644
index 000000000000..1487366c6446
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.38.1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/bison-3.7.6 sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
+DESCRIPTION=syslog replacement with advanced filtering features
+EAPI=8
+HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
+INHERIT=autotools python-single-r1 systemd
+IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.38.1/syslog-ng-3.38.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=1441e8ae3bbaaea81946a376c9c9cfe2
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 259b78e7e111..ded27956366c 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/broot-1.16.1 b/metadata/md5-cache/app-misc/broot-1.16.1
new file mode 100644
index 000000000000..68166107612d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.16.1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.60 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libgit2:= sys-libs/zlib X? ( x11-libs/libxcb:= )
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+INHERIT=bash-completion-r1 cargo
+IUSE=X debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=dev-libs/libgit2:= sys-libs/zlib X? ( x11-libs/libxcb:= )
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.16.1.tar.gz -> broot-1.16.1.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi_colours/1.1.1/download -> ansi_colours-1.1.1.crate https://crates.io/api/v1/crates/anyhow/1.0.64/download -> anyhow-1.0.64.crate https://crates.io/api/v1/crates/argh/0.1.8/download -> argh-0.1.8.crate https://crates.io/api/v1/crates/argh_derive/0.1.8/download -> argh_derive-0.1.8.crate https://crates.io/api/v1/crates/argh_shared/0.1.8/download -> argh_shared-0.1.8.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.2/download -> bet-1.0.2.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.11.0/download -> bumpalo-3.11.0.crate https://crates.io/api/v1/crates/bytemuck/1.12.1/download -> bytemuck-1.12.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.1/download -> char_reader-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/clap/3.2.20/download -> clap-3.2.20.crate https://crates.io/api/v1/crates/clap_complete/3.2.4/download -> clap_complete-3.2.4.crate https://crates.io/api/v1/crates/clap_derive/3.2.18/download -> clap_derive-3.2.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.4.2/download -> clipboard-win-4.4.2.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/coolor/0.5.0/download -> coolor-0.5.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crokey/0.4.3/download -> crokey-0.4.3.crate https://crates.io/api/v1/crates/crokey-proc_macros/0.4.0/download -> crokey-proc_macros-0.4.0.crate https://crates.io/api/v1/crates/crossbeam/0.8.2/download -> crossbeam-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.6/download -> crossbeam-queue-0.3.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.crate https://crates.io/api/v1/crates/crossterm/0.23.2/download -> crossterm-0.23.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.8/download -> csv2svg-0.1.8.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deser-hjson/1.0.2/download -> deser-hjson-1.0.2.crate https://crates.io/api/v1/crates/directories/4.0.1/download -> directories-4.0.1.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/error-code/2.3.1/download -> error-code-2.3.1.crate https://crates.io/api/v1/crates/exr/1.5.0/download -> exr-1.5.0.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/flume/0.10.14/download -> flume-0.10.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/futures-core/0.3.24/download -> futures-core-0.3.24.crate https://crates.io/api/v1/crates/futures-sink/0.3.24/download -> futures-sink-0.3.24.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/git2/0.14.4/download -> git2-0.14.4.crate https://crates.io/api/v1/crates/glassbench/0.3.3/download -> glassbench-0.3.3.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.47/download -> iana-time-zone-0.1.47.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/image/0.24.3/download -> image-0.24.3.crate https://crates.io/api/v1/crates/include_dir/0.7.2/download -> include_dir-0.7.2.crate https://crates.io/api/v1/crates/include_dir_macros/0.7.2/download -> include_dir_macros-0.7.2.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.3/download -> itoa-1.0.3.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.6/download -> jpeg-decoder-0.2.6.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/lazy-regex/2.3.0/download -> lazy-regex-2.3.0.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.3.0/download -> lazy-regex-proc_macros-2.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lebe/0.5.2/download -> lebe-0.5.2.crate https://crates.io/api/v1/crates/lfs-core/0.11.0/download -> lfs-core-0.11.0.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.4+1.4.2/download -> libgit2-sys-0.13.4+1.4.2.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/lock_api/0.4.8/download -> lock_api-0.4.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.7/download -> memmap2-0.5.7.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimad/0.9.1/download -> minimad-0.9.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/mio/0.8.4/download -> mio-0.8.4.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/onig/6.4.0/download -> onig-6.4.0.crate https://crates.io/api/v1/crates/onig_sys/69.8.1/download -> onig_sys-69.8.1.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/opener/0.5.0/download -> opener-0.5.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.10.0/download -> phf_macros-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project/1.0.12/download -> pin-project-1.0.12.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.12/download -> pin-project-internal-1.0.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plist/1.3.1/download -> plist-1.3.1.crate https://crates.io/api/v1/crates/png/0.17.6/download -> png-0.17.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rgb/0.8.33/download -> rgb-0.8.33.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_json/1.0.85/download -> serde_json-1.0.85.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/snafu/0.7.1/download -> snafu-0.7.1.crate https://crates.io/api/v1/crates/snafu-derive/0.7.1/download -> snafu-derive-0.7.1.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/splitty/1.0.0/download -> splitty-1.0.0.crate https://crates.io/api/v1/crates/str-buf/1.0.6/download -> str-buf-1.0.6.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/svg/0.10.0/download -> svg-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/syntect-no-panic/4.6.1/download -> syntect-no-panic-4.6.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/termimad/0.20.3/download -> termimad-0.20.3.crate https://crates.io/api/v1/crates/terminal-clipboard/0.3.1/download -> terminal-clipboard-0.3.1.crate https://crates.io/api/v1/crates/terminal-light/1.0.1/download -> terminal-light-1.0.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.34/download -> thiserror-1.0.34.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.34/download -> thiserror-impl-1.0.34.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.7.3/download -> tiff-0.7.3.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.14/download -> time-0.3.14.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/umask/2.0.0/download -> umask-2.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.3/download -> x11-clipboard-0.5.3.crate https://crates.io/api/v1/crates/xcb/0.10.1/download -> xcb-0.10.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/xterm-query/0.1.0/download -> xterm-query-0.1.0.crate https://crates.io/api/v1/crates/xterm-query/0.2.0/download -> xterm-query-0.2.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=189330bc7277febb47b8e1d0fb6f01e4
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3fd86aa7434b..76ea64aca689 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.36 b/metadata/md5-cache/dev-db/mariadb-10.3.36
new file mode 100644
index 000000000000..7cd1832bca37
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.36
@@ -0,0 +1,18 @@
+BDEPEND=virtual/yacc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
+IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !extraengine !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.3/18
+SRC_URI=mirror://mariadb/mariadb-10.3.36/source/mariadb-10.3.36.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.3.36-patches-01.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9f7b1ba50df7cb0e91c85b3f7b128cff
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.26 b/metadata/md5-cache/dev-db/mariadb-10.4.26
new file mode 100644
index 000000000000..63d9df4e6b46
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.26
@@ -0,0 +1,18 @@
+BDEPEND=virtual/yacc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
+IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.4/18
+SRC_URI=mirror://mariadb/mariadb-10.4.26/source/mariadb-10.4.26.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f78caae154d905e1bf8aaf397f283e0e
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.17 b/metadata/md5-cache/dev-db/mariadb-10.5.17
new file mode 100644
index 000000000000..0a6248e03fbe
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.17
@@ -0,0 +1,18 @@
+BDEPEND=virtual/yacc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
+IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.5/18
+SRC_URI=mirror://mariadb/mariadb-10.5.17/source/mariadb-10.5.17.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.5.17-patches-01.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5527e064d6df881d90f659124bd41cd8
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.10 b/metadata/md5-cache/dev-db/mariadb-10.6.10
new file mode 100644
index 000000000000..52c9a1b18fab
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.10
@@ -0,0 +1,18 @@
+BDEPEND=virtual/yacc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
+IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.6/18
+SRC_URI=mirror://mariadb/mariadb-10.6.10/source/mariadb-10.6.10.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fafbc7ed7490cd6a49927b6a833c231d
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b8a9f73cdd0d..9f9e170502d0 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/julia-1.7.1-r4 b/metadata/md5-cache/dev-lang/julia-1.7.1-r4
deleted file mode 100644
index f051f5e31dc3..000000000000
--- a/metadata/md5-cache/dev-lang/julia-1.7.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) app-arch/p7zip dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= >=dev-libs/libutf8proc-2.6.1:0=[-cjk] >=dev-util/patchelf-0.13 >=net-libs/mbedtls-2.2 <net-misc/curl-7.81.0[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= >=sci-mathematics/dsfmt-2.2.4 >=sys-libs/libunwind-1.1:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack virtual/pkgconfig !system-llvm? ( dev-util/cmake ) !!sys-devel/llvm:0
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=7
-HOMEPAGE=https://julialang.org/
-INHERIT=flag-o-matic llvm pax-utils toolchain-funcs
-IUSE=+system-llvm
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) app-arch/p7zip dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= >=dev-libs/libutf8proc-2.6.1:0=[-cjk] >=dev-util/patchelf-0.13 >=net-libs/mbedtls-2.2 <net-misc/curl-7.81.0[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= >=sci-mathematics/dsfmt-2.2.4 >=sys-libs/libunwind-1.1:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
-SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.7.1/julia-1.7.1-full.tar.gz https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> julia-1.7.1-llvm_13_compat_part_3.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> julia-1.7.1-llvm_13_compat_part_4.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> julia-1.7.1-llvm_13_compat_part_5.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fa2454b230eddd136883e9d604029ece
diff --git a/metadata/md5-cache/dev-lang/julia-1.7.3 b/metadata/md5-cache/dev-lang/julia-1.7.3
deleted file mode 100644
index d4fb635e4795..000000000000
--- a/metadata/md5-cache/dev-lang/julia-1.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) app-arch/p7zip dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= >=dev-libs/libutf8proc-2.6.1:0=[-cjk] >=dev-util/patchelf-0.13 >=net-libs/mbedtls-2.2 net-misc/curl[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= >=sci-mathematics/dsfmt-2.2.4 >=sys-libs/libunwind-1.1:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack virtual/pkgconfig !system-llvm? ( dev-util/cmake ) !!sys-devel/llvm:0
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=8
-HOMEPAGE=https://julialang.org/
-INHERIT=flag-o-matic llvm pax-utils toolchain-funcs
-IUSE=+system-llvm
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) app-arch/p7zip dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= >=dev-libs/libutf8proc-2.6.1:0=[-cjk] >=dev-util/patchelf-0.13 >=net-libs/mbedtls-2.2 net-misc/curl[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= >=sci-mathematics/dsfmt-2.2.4 >=sys-libs/libunwind-1.1:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
-SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.7.3/julia-1.7.3-full.tar.gz https://github.com/JuliaLang/julia/commit/677ce6d3.patch -> julia-1.7.3-llvm_13_compat_part_1.patch https://github.com/JuliaLang/julia/commit/47f9139e.patch -> julia-1.7.3-llvm_13_compat_part_2.patch https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> julia-1.7.3-llvm_13_compat_part_3.patch https://github.com/JuliaLang/julia/commit/99d4e655.patch -> julia-1.7.3-llvm_13_compat_part_4.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> julia-1.7.3-llvm_13_compat_part_5.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> julia-1.7.3-llvm_13_compat_part_6.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.4.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-system-cblas.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libunwind-1.6.patch https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libblastrampoline-4.patch https://github.com/JuliaLang/Downloads.jl/archive/refs/tags/v1.5.3.tar.gz -> julia-1.7.3_Downloads.jl_1.5.3.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=125ffd075ad424bd381e482279685303
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0-r10 b/metadata/md5-cache/dev-lang/perl-5.34.0-r10
deleted file mode 100644
index 047fe9687121..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.34.0-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-IUSE=berkdb debug doc gdbm ithreads minimal quadmath
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.34
-SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
-_eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=278be5a85938139e419193c2a0877cb3
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0-r11 b/metadata/md5-cache/dev-lang/perl-5.34.0-r11
deleted file mode 100644
index 289db1cd888e..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.34.0-r11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-IUSE=berkdb debug doc gdbm ithreads minimal quadmath
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.34
-SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
-_eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=98ee2297224dd24ec0d98b4161c59620
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0-r9 b/metadata/md5-cache/dev-lang/perl-5.34.0-r9
deleted file mode 100644
index 959a1de1bb8f..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.34.0-r9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-IUSE=berkdb debug doc gdbm ithreads minimal
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.34
-SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
-_eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c3d1e50f1c05cf58dd70e3093940cddd
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.1-r2 b/metadata/md5-cache/dev-lang/perl-5.34.1-r2
deleted file mode 100644
index 50b4aa029101..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.34.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-IUSE=berkdb debug doc gdbm ithreads minimal quadmath
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.34
-SRC_URI=mirror://cpan/src/5.0/perl-5.34.1.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.tar.gz
-_eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fa1a9a9f6c15dcf865d94748fbb639f3
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.1-r3 b/metadata/md5-cache/dev-lang/perl-5.34.1-r4
index b340cdad89d4..adf479fba4fa 100644
--- a/metadata/md5-cache/dev-lang/perl-5.34.1-r3
+++ b/metadata/md5-cache/dev-lang/perl-5.34.1-r4
@@ -13,4 +13,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.34
 SRC_URI=mirror://cpan/src/5.0/perl-5.34.1.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.1-zlib-1.2.12.patch.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.1-zlib-1.2.12-encrypt-standard.zip.bin
 _eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8fff0efe927a5f3d2495f7b1220a4912
+_md5_=f648697319e82056dc59c950a866962a
diff --git a/metadata/md5-cache/dev-lang/perl-5.36.0 b/metadata/md5-cache/dev-lang/perl-5.36.0-r1
index c0b904571593..57238f7a3fb0 100644
--- a/metadata/md5-cache/dev-lang/perl-5.36.0
+++ b/metadata/md5-cache/dev-lang/perl-5.36.0-r1
@@ -13,4 +13,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.36
 SRC_URI=mirror://cpan/src/5.0/perl-5.36.0.tar.xz mirror://cpan/authors/id/R/RJ/RJBS/perl-5.36.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.36.0-patches-1/perl-5.36.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.36.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.tar.gz
 _eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c01af661b7cbaf54d6bb0b1c74075156
+_md5_=6c9be054ad0293b7c58be3f3fa5759ea
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4eba02da53ae..bef973d1e3d8 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/expat-2.4.9 b/metadata/md5-cache/dev-libs/expat-2.4.9
deleted file mode 100644
index a5a33f01c36c..000000000000
--- a/metadata/md5-cache/dev-libs/expat-2.4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=unicode? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stream-oriented XML parser library
-EAPI=8
-HOMEPAGE=https://libexpat.github.io/
-INHERIT=autotools multilib-minimal
-IUSE=examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_4_9/expat-2.4.9.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=940d355674cd9d7dd9373527db607c91
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.39.2 b/metadata/md5-cache/dev-libs/libfilezilla-0.39.2
new file mode 100644
index 000000000000..e0176eda2460
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.39.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install pretend
+DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:= test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=8
+HOMEPAGE=https://lib.filezilla-project.org/
+INHERIT=flag-o-matic
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.39.2.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=574736d3328fe8d6ecba7050974f6e5a
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.0.2 b/metadata/md5-cache/dev-libs/simdjson-1.0.2
index cf0de2eb794d..9528e6fd0805 100644
--- a/metadata/md5-cache/dev-libs/simdjson-1.0.2
+++ b/metadata/md5-cache/dev-libs/simdjson-1.0.2
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v1.0.2.tar.gz -> simdjson-1.0.2.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-1.0.2.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v1.0.2.tar.gz -> simdjson-1.0.2.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a1e46f961d9da3d53a5ce35d153f9a08
+_md5_=7eb714b2a385ab601ea85519fcde911f
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.1.0 b/metadata/md5-cache/dev-libs/simdjson-1.1.0
index 4df96b445944..1fc23f59816f 100644
--- a/metadata/md5-cache/dev-libs/simdjson-1.1.0
+++ b/metadata/md5-cache/dev-libs/simdjson-1.1.0
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v1.1.0.tar.gz -> simdjson-1.1.0.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-1.1.0.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v1.1.0.tar.gz -> simdjson-1.1.0.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e114898d74f2714e68e32b91dc84d1f5
+_md5_=a9854f2a5ece1ccca5efb110415f7511
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.0.4 b/metadata/md5-cache/dev-libs/simdjson-2.0.4
index 8c530a189157..a3119db1f180 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.0.4
+++ b/metadata/md5-cache/dev-libs/simdjson-2.0.4
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.0.4.tar.gz -> simdjson-2.0.4.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-2.0.4.gh.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v2.0.4.tar.gz -> simdjson-2.0.4.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b36ded3850e387aadec391f041a0b7ce
+_md5_=9a9fdba7097c2a13d4e086911810be11
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1 b/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
index 9bec972709af..cb946289a0b5 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/11
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.1.0.tar.gz -> simdjson-2.1.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-2.1.0.gh.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v2.1.0.tar.gz -> simdjson-2.1.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cec4428a63ad5721cfbc5d962fbda638
+_md5_=876c439a9c5a2147ac6d1c0970891969
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.2.2 b/metadata/md5-cache/dev-libs/simdjson-2.2.2
index 882f91f8550d..63bbba3afc15 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.2.2
+++ b/metadata/md5-cache/dev-libs/simdjson-2.2.2
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/13
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.2.2.tar.gz -> simdjson-2.2.2.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-2.2.2.gh.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v2.2.2.tar.gz -> simdjson-2.2.2.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=24ed34e726ec55e57faf1b2cacf4970b
+_md5_=6bbc82c7ff520ea77198272926b0bc29
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.0.0 b/metadata/md5-cache/dev-libs/simdjson-3.0.0
index 1d3a7fdfb14c..896a2157ee66 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.0.0
+++ b/metadata/md5-cache/dev-libs/simdjson-3.0.0
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/14
-SRC_URI=https://github.com/simdjson/simdjson/archive/v3.0.0.tar.gz -> simdjson-3.0.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-3.0.0.gh.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v3.0.0.tar.gz -> simdjson-3.0.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e2fdaf0fe7730de2d65605cd2ae17bc6
+_md5_=df71b3d08b0f3807321c30565a12abcd
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 26d30bc4c91c..ffb0833c1e9b 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/abydos-0.5.0-r2 b/metadata/md5-cache/dev-python/abydos-0.5.0-r2
new file mode 100644
index 000000000000..f392540a5af8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/abydos-0.5.0-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/nltk[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abydos NLP/IR library
+EAPI=8
+HOMEPAGE=https://github.com/chrislit/abydos
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3+
+PROPERTIES=test_network
+RDEPEND=dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/chrislit/abydos/archive/v0.5.0.tar.gz -> abydos-0.5.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f5e70cb28735d368c81f0156ea857aec
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1 b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
deleted file mode 100644
index e7eb1a2a0d03..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_11(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_11(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_11(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_11(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] >=dev-python/alabaster-0.6.2[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] dev-python/sphinxcontrib-blockdiag[python_targets_pypy3(-)] dev-python/sphinxcontrib-newsfeed[python_targets_pypy3(-)] dev-python/sphinxcontrib-spelling[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-aiohttp-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=http client/server for asyncio
-EAPI=8
-HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test-rust test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.8.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=aea91bb3cf375ec8f765d2eb69af1fc3
diff --git a/metadata/md5-cache/dev-python/klein-21.8.0 b/metadata/md5-cache/dev-python/klein-21.8.0
index a7d1c6ac5561..543b3547de8c 100644
--- a/metadata/md5-cache/dev-python/klein-21.8.0
+++ b/metadata/md5-cache/dev-python/klein-21.8.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hyperlink[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tubes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hyperlink[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tubes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=micro-framework for developing production-ready web services with Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/klein/ https://github.com/twisted/klein/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hyperlink[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tubes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hyperlink[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tubes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/klein/klein-21.8.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=59f6abe760ef686e389cd2be34f0851b
+_md5_=2bdfbbbe70b69882bd1ea19fdf0337c9
diff --git a/metadata/md5-cache/dev-python/nltk-3.7 b/metadata/md5-cache/dev-python/nltk-3.7
index 8bddd822c78f..b5afc36180e7 100644
--- a/metadata/md5-cache/dev-python/nltk-3.7
+++ b/metadata/md5-cache/dev-python/nltk-3.7
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nltk-data-20211221 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,tk?,xml(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nltk-data-20211221 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,tk?,xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,tk?,xml(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Natural Language Toolkit
 EAPI=8
 HOMEPAGE=https://www.nltk.org/ https://github.com/nltk/nltk/
 INHERIT=distutils-r1
-IUSE=tk test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=tk test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Apache-2.0
 PDEPEND=dev-python/nltk-data
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,tk?,xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,tk?,xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,tk?,xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nltk/nltk/archive/3.7.tar.gz -> nltk-3.7.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9a7fc85c14fd73b6ad4952c68e8fcf42
+_md5_=80d39416040dac1ad64c90ae82894970
diff --git a/metadata/md5-cache/dev-python/pythran-0.12.0-r1 b/metadata/md5-cache/dev-python/pythran-0.12.0-r2
index b128e0bf832f..2c071c295933 100644
--- a/metadata/md5-cache/dev-python/pythran-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/pythran-0.12.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.12.0.tar.gz -> pythran-0.12.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b5bfdb83d9bdaaa76d91ed367816929f
+_md5_=9d9c0f38e7a2c70f21e9c7b2d047a878
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.5.1 b/metadata/md5-cache/dev-python/setuptools-rust-1.5.1
deleted file mode 100644
index 5ac5458a1390..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A plugin for setuptools to build Rust Python extensions
-EAPI=8
-HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
-INHERIT=distutils-r1 cargo
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/setuptools-rust/archive/v1.5.1.tar.gz -> setuptools-rust-1.5.1.gh.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=84d257a9b46d99f9cdfcfc490e723c95
diff --git a/metadata/md5-cache/dev-python/treq-22.2.0-r1 b/metadata/md5-cache/dev-python/treq-22.2.0-r1
index 390a5874892a..82d934d5a265 100644
--- a/metadata/md5-cache/dev-python/treq-22.2.0-r1
+++ b/metadata/md5-cache/dev-python/treq-22.2.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A requests-like API built on top of twisted.web's Agent
 EAPI=8
 HOMEPAGE=https://github.com/twisted/treq/ https://pypi.org/project/treq/
 INHERIT=distutils-r1
-IUSE=doc test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[ssl(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18.7.0[crypt(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-18.7.0[ssl(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[crypt(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-22.2.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=02fd563a6d27a9e8d6ede2b26938c938
+_md5_=c825283daf9fc8f6eda18decb7886b2b
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3 b/metadata/md5-cache/dev-python/uvloop-0.15.3
deleted file mode 100644
index ad507fc04fc1..000000000000
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libuv-1.11.0:=
-DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
-EAPI=8
-HOMEPAGE=https://github.com/magicstack/uvloop
-INHERIT=distutils-r1
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5e139133627668b3545ad101f4f57a1b
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1 b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
deleted file mode 100644
index ff062e86da0c..000000000000
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libuv-1.11.0:=
-DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
-EAPI=8
-HOMEPAGE=https://github.com/magicstack/uvloop
-INHERIT=distutils-r1
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 -riscv sparc
-LICENSE=MIT
-RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1926203a9360029f0baab7d1d5dab14d
diff --git a/metadata/md5-cache/dev-python/uvloop-0.16.0 b/metadata/md5-cache/dev-python/uvloop-0.16.0
deleted file mode 100644
index 2fe5a31875cb..000000000000
--- a/metadata/md5-cache/dev-python/uvloop-0.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libuv-1.11.0:=
-DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
-EAPI=8
-HOMEPAGE=https://github.com/magicstack/uvloop
-INHERIT=distutils-r1
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 -riscv sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/uvloop/uvloop-0.16.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=02d68f972f5ea6fcde8b2d89bbbe0a23
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3cc4e3da4b91..dc5bf69d2e0d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bats-1.8.2 b/metadata/md5-cache/dev-util/bats-1.8.2
new file mode 100644
index 000000000000..7a2bc2dbfd47
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bats-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst test
+DEPEND=app-shells/bash:*
+DESCRIPTION=Bats-core: Bash Automated Testing System
+EAPI=8
+HOMEPAGE=https://github.com/bats-core/bats-core/
+INHERIT=multiprocessing optfeature
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=app-shells/bash:*
+SLOT=0
+SRC_URI=https://github.com/bats-core/bats-core/archive/v1.8.2.tar.gz -> bats-1.8.2.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=54c50f2af04515d25c00b46ad47b8679
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.38-r2 b/metadata/md5-cache/dev-util/geany-plugins-1.38-r3
index 53c8e88c9a22..152d798832ba 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.38-r3
@@ -4,7 +4,7 @@ DEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=8
 HOMEPAGE=https://plugins.geany.org
-INHERIT=lua-single
+INHERIT=flag-o-matic lua-single
 IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
 KEYWORDS=amd64 arm ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.38.tar.gz
-_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=68575556ed7f2dc5106a6e3a04b00d95
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=29516d432becd2f91a898002d33a9250
diff --git a/metadata/md5-cache/dev-util/valgrind-3.16.1 b/metadata/md5-cache/dev-util/valgrind-3.16.1
deleted file mode 100644
index 6c7afdfc04f1..000000000000
--- a/metadata/md5-cache/dev-util/valgrind-3.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi )
-DESCRIPTION=An open-source memory debugger for GNU/Linux
-EAPI=7
-HOMEPAGE=https://www.valgrind.org
-INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
-IUSE=mpi
-KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b2fb88f6bc23be10075ec08377b62325
diff --git a/metadata/md5-cache/dev-util/valgrind-3.17.0 b/metadata/md5-cache/dev-util/valgrind-3.17.0
deleted file mode 100644
index 2c12efe97d62..000000000000
--- a/metadata/md5-cache/dev-util/valgrind-3.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi )
-DESCRIPTION=An open-source memory debugger for GNU/Linux
-EAPI=7
-HOMEPAGE=https://www.valgrind.org
-INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
-IUSE=mpi
-KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=483843ad9c64b9058f8699cdafab7b61
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0 b/metadata/md5-cache/dev-util/valgrind-3.20.0
new file mode 100644
index 000000000000..3f74adec2099
--- /dev/null
+++ b/metadata/md5-cache/dev-util/valgrind-3.20.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi )
+DESCRIPTION=An open-source memory debugger for GNU/Linux
+EAPI=8
+HOMEPAGE=https://www.valgrind.org
+INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=1d1e380e665631b4f3a6315b8ce3a3d9
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f69e78fe8339..c0b07f7879a6 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.14.1 b/metadata/md5-cache/media-libs/fontconfig-2.14.1-r1
index df81484d016c..34d69d7ad839 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.14.1
+++ b/metadata/md5-cache/media-libs/fontconfig-2.14.1-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.14.1.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=980661242e6aa55717538fda8c7850e4
+_md5_=8b5d53c4ecbbe357501dd2f226034df3
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index b2de87f6b19c..004b7b0676d1 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.62.0 b/metadata/md5-cache/net-ftp/filezilla-3.62.0
new file mode 100644
index 000000000000..f9ecc0305ee2
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.62.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.39.2:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) test? ( >=dev-util/cppunit-1.13.0 )
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=8
+HOMEPAGE=https://filezilla-project.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools wxwidgets xdg
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.39.2:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.62.0_src.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=175612cedabe89daf163f1fc192f40fb
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 89709bc953a6..23ce5ce3078d 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/synapse-1.68.0 b/metadata/md5-cache/net-im/synapse-1.68.0
index 6dec41202ff4..d00466ef9562 100644
--- a/metadata/md5-cache/net-im/synapse-1.68.0
+++ b/metadata/md5-cache/net-im/synapse-1.68.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
 INHERIT=cargo distutils-r1 multiprocessing optfeature systemd
 IUSE=postgres systemd test debug python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
 RDEPEND=acct-user/synapse acct-group/synapse python_single_target_python3_9? ( dev-python/attrs[python_targets_python3_9(-)] dev-python/bcrypt[python_targets_python3_9(-)] dev-python/bleach[python_targets_python3_9(-)] dev-python/canonicaljson[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] dev-python/frozendict[python_targets_python3_9(-)] dev-python/ijson[python_targets_python3_9(-)] >=dev-python/jinja-3.0[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] >=dev-python/matrix-common-1.3.0[python_targets_python3_9(-)] dev-python/msgpack[python_targets_python3_9(-)] dev-python/netaddr[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] dev-python/phonenumbers[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),webp] dev-python/prometheus_client[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pydantic[python_targets_python3_9(-)] dev-python/pymacaroons[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/signedjson[python_targets_python3_9(-)] dev-python/sortedcontainers[python_targets_python3_9(-)] dev-python/treq[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/typing-extensions[python_targets_python3_9(-)] dev-python/unpaddedbase64[python_targets_python3_9(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) systemd? ( dev-python/python-systemd[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/attrs[python_targets_python3_10(-)] dev-python/bcrypt[python_targets_python3_10(-)] dev-python/bleach[python_targets_python3_10(-)] dev-python/canonicaljson[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] dev-python/frozendict[python_targets_python3_10(-)] dev-python/ijson[python_targets_python3_10(-)] >=dev-python/jinja-3.0[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] >=dev-python/matrix-common-1.3.0[python_targets_python3_10(-)] dev-python/msgpack[python_targets_python3_10(-)] dev-python/netaddr[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] dev-python/phonenumbers[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),webp] dev-python/prometheus_client[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pydantic[python_targets_python3_10(-)] dev-python/pymacaroons[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/signedjson[python_targets_python3_10(-)] dev-python/sortedcontainers[python_targets_python3_10(-)] dev-python/treq[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/unpaddedbase64[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) systemd? ( dev-python/python-systemd[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matrix-org/synapse/archive/v1.68.0.tar.gz -> synapse-1.68.0.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2/0.10.4/download -> blake2-0.10.4.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/once_cell/1.13.1/download -> once_cell-1.13.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/pyo3/0.16.6/download -> pyo3-0.16.6.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.6/download -> pyo3-build-config-0.16.6.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.6/download -> pyo3-ffi-0.16.6.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.6/download -> pyo3-macros-0.16.6.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.6/download -> pyo3-macros-backend-0.16.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fe3d8615952e78ee01524cf8d829f792
+_md5_=6d669d4c4f02b0944c637ee7bb5ad364
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 3f4910ccf06b..5b91b29f02d8 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/ii-2.0 b/metadata/md5-cache/net-irc/ii-2.0
new file mode 100644
index 000000000000..83b2ffddf081
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ii-2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A minimalist FIFO and filesystem-based IRC client
+EAPI=8
+HOMEPAGE=https://tools.suckless.org/ii/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/ii-2.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6d931a8c0e525d57d2c4507488a22c48
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f43c7c0cbac8..7e9f076af226 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/curl-7.79.1-r1 b/metadata/md5-cache/net-misc/curl-7.79.1-r1
deleted file mode 100644
index dfb5bc10701f..000000000000
--- a/metadata/md5-cache/net-misc/curl-7.79.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=A Client that groks URLs
-EAPI=7
-HOMEPAGE=https://curl.haxx.se/
-INHERIT=autotools prefix multilib-minimal verify-sig
-IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://curl.haxx.se/download/curl-7.79.1.tar.xz verify-sig? ( https://curl.haxx.se/download/curl-7.79.1.tar.xz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=f2c481bc63194ac2638933896d600776
diff --git a/metadata/md5-cache/net-misc/curl-7.83.1 b/metadata/md5-cache/net-misc/curl-7.83.1
deleted file mode 100644
index 49159101f3ea..000000000000
--- a/metadata/md5-cache/net-misc/curl-7.83.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=A Client that groks URLs
-EAPI=8
-HOMEPAGE=https://curl.haxx.se/
-INHERIT=autotools prefix multilib-minimal verify-sig
-IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl nghttp3 quiche abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://curl.haxx.se/download/curl-7.83.1.tar.xz verify-sig? ( https://curl.haxx.se/download/curl-7.83.1.tar.xz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=f1a836c3dbe27ec5b7506cacabda1317
diff --git a/metadata/md5-cache/net-misc/curl-7.86.0 b/metadata/md5-cache/net-misc/curl-7.86.0
new file mode 100644
index 000000000000..788d1c472ce1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.86.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=A Client that groks URLs
+EAPI=8
+HOMEPAGE=https://curl.haxx.se/
+INHERIT=autotools prefix multilib-minimal verify-sig
+IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl nghttp3 quiche abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=curl
+RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.86.0.tar.xz verify-sig? ( https://curl.haxx.se/download/curl-7.86.0.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=b80471d692557ff8f65534b583def4b2
diff --git a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.201.0 b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.201.0
deleted file mode 100644
index bbfd33894766..000000000000
--- a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.201.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=sys-libs/zlib-1.2.12 dev-lang/perl
-DESCRIPTION=Low-Level Interface to zlib compression library
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Compress-Raw-Zlib
-INHERIT=perl-module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=sys-libs/zlib-1.2.12 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.201.tar.gz
-_eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=e2a00b0c836adbf0f568562c5e0feba0
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 1463a46a8745..d83d607ac66a 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c345dc164a1e..92532d7d93c1 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/systemd-tmpfiles-249.7 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7
deleted file mode 100644
index 40f5cccdbf5f..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
-DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-INHERIT=flag-o-matic meson python-any-r1
-IUSE=selinux test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.7.tar.gz -> systemd-stable-249.7.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.5-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.5-r1.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=619a8c442a971df7b85b95bef665a311
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.9 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.9
deleted file mode 100644
index e6a2e4b8a959..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
-DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-INHERIT=flag-o-matic meson python-any-r1
-IUSE=selinux test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.9.tar.gz -> systemd-stable-249.9.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.5-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.5-r1.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3f025295bb6beba6b041278be33176eb
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 879a37ba83e1..0ee0694c4dff 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/hpssacli-6.10.14.0 b/metadata/md5-cache/sys-block/hpssacli-6.10.14.0
new file mode 100644
index 000000000000..88d69dfde1df
--- /dev/null
+++ b/metadata/md5-cache/sys-block/hpssacli-6.10.14.0
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=install unpack
+DESCRIPTION=HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)
+EAPI=8
+HOMEPAGE=https://support.hpe.com/connect/s/softwaredetails?language=es&softwareId=MTX_95c2c88d976c467ab58c30279f
+INHERIT=rpm
+KEYWORDS=-* amd64
+LICENSE=hp-proliant-essentials
+RDEPEND=sys-libs/glibc
+SLOT=0
+SRC_URI=https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v211181/ssacli-6.10-14.0.x86_64.rpm
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
+_md5_=5f7c631dd40254e6ca0d49e52c37a2c2
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 10d2a8132a14..500e69e957e2 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-249.9 b/metadata/md5-cache/sys-boot/systemd-boot-249.9
deleted file mode 100644
index 8817474e60a1..000000000000
--- a/metadata/md5-cache/sys-boot/systemd-boot-249.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 sys-devel/gettext dev-util/gperf virtual/pkgconfig || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-apps/util-linux-2.30 >=sys-boot/gnu-efi-3.0.2 sys-libs/libcap
-DESCRIPTION=UEFI boot manager from systemd (formerly gummiboot)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/
-INHERIT=meson python-any-r1 toolchain-funcs
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.9.tar.gz -> systemd-stable-249.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5298ca13374ca97233b2375a0ad15368
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 3c9f4a9bc61e..617ee7869b7c 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index fc9e0773cc8f..b819038104a8 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -13,4 +13,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=debug? ( strip ) test
 SLOT=0/9999
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	557a93bd51735200952a735894f6628e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e97e9ec1d1798903580a014056b3e370
+_md5_=9544a38040f9591a542ceced9ac0acd9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 65afb0220946..4578a41afd86 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.151 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.151
new file mode 100644
index 000000000000..14b65be72c38
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.151
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.151
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-160.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-160.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-160.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-160.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-160.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-160.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-160.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-160.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-160.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0291c92546f651fb7d887c78e6063906
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.19_p1
deleted file mode 100644
index 656a427b4b11..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=8
-HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
-INHERIT=kernel-2 optfeature
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_p1
-SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v5.19-pf1.tar.gz -> linux-5.19-pf1.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.19/prjc_v5.19-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6b4221dbb585346d44b2c70c195f4476
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.19_p3
deleted file mode 100644
index 252d1e0c9c45..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=8
-HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
-INHERIT=kernel-2 optfeature
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_p3
-SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v5.19-pf3.tar.gz -> linux-5.19-pf3.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.extras.tar.xz https://gitlab.com/torvic9/linux519-vd/-/raw/master/prjc-519-r1-vd-test.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=be28594954158d5b394e03923e1089fc
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.19_p4
deleted file mode 100644
index bc99aa6f599c..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=8
-HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
-INHERIT=kernel-2 optfeature
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_p4
-SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v5.19-pf4.tar.gz -> linux-5.19-pf4.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.extras.tar.xz https://gitlab.com/torvic9/linux519-vd/-/raw/master/prjc-519-r1-vd-test.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=be28594954158d5b394e03923e1089fc
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.19_p5
deleted file mode 100644
index 0ec006be0c8d..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=8
-HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
-INHERIT=kernel-2 optfeature
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_p5
-SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v5.19-pf5.tar.gz -> linux-5.19-pf5.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.extras.tar.xz https://gitlab.com/torvic9/linux519-vd/-/raw/master/prjc-519-r1-vd-test.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=be28594954158d5b394e03923e1089fc
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p2 b/metadata/md5-cache/sys-kernel/pf-sources-6.0_p3
index 97ce834e39bc..7cf476e3a969 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.19_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-6.0_p3
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.19_p2
-SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v5.19-pf2.tar.gz -> linux-5.19-pf2.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.19-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.19/prjc_v5.19-r0.patch
+SLOT=6.0_p3
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v6.0-pf3.tar.gz -> linux-6.0-pf3.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.0-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.0-1.extras.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6b4221dbb585346d44b2c70c195f4476
+_md5_=5efebbcec7b9ad7645decc7fcd5fc620
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index de1b8c9f8fda..ba07cb248f30 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0-r1
deleted file mode 100644
index 665797c622dc..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Bzip2
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( ~dev-lang/perl-5.34.0 =dev-lang/perl-5.34.1 ~perl-core/Compress-Raw-Bzip2-2.101.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.101.0 !>perl-core/Compress-Raw-Bzip2-2.101.0-r999
-SLOT=0
-_md5_=f7a70b2206c958da9f3bedc89dd87abe
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r3
index 0927a2a77ce7..e090e1d42c6c 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r3
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
 EAPI=8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.36* =dev-lang/perl-5.34.1-r3 ~perl-core/Compress-Raw-Bzip2-2.103.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.103.0 !>perl-core/Compress-Raw-Bzip2-2.103.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.36* =dev-lang/perl-5.34.1-r4 ~perl-core/Compress-Raw-Bzip2-2.103.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.103.0 !>perl-core/Compress-Raw-Bzip2-2.103.0-r999
 SLOT=0
-_md5_=6a5dc455789391669a3a9356a2150b91
+_md5_=6d6304b4b4c330eddf15ae5dfbc565b9
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0-r1
deleted file mode 100644
index 09183ac6a1c0..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Zlib
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( ~dev-lang/perl-5.34.0 =dev-lang/perl-5.34.1 ~perl-core/Compress-Raw-Zlib-2.101.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.101.0 !>perl-core/Compress-Raw-Zlib-2.101.0-r999
-SLOT=0
-_md5_=f7a70b2206c958da9f3bedc89dd87abe
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
deleted file mode 100644
index 59a7ec8f8c34..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Zlib
-EAPI=8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/Compress-Raw-Zlib-2.103.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.103.0 !>perl-core/Compress-Raw-Zlib-2.103.0-r999
-SLOT=0
-_md5_=98a04a07fe9af7ca7b4edaa8d93b528f
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.105.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.105.0
deleted file mode 100644
index 3edafbdebd9b..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.105.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Zlib
-EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.36* ~perl-core/Compress-Raw-Zlib-2.105.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.105.0 !>perl-core/Compress-Raw-Zlib-2.105.0-r999
-SLOT=0
-_md5_=ee8124d08a39356f192e7d0fd91b4336
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.201.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.201.0
deleted file mode 100644
index 2b0b7af2ede5..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.201.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Zlib
-EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=~perl-core/Compress-Raw-Zlib-2.201.0 dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.201.0 !>perl-core/Compress-Raw-Zlib-2.201.0-r999
-SLOT=0
-_md5_=e19c021ed1af770d834103fd77907eb5
diff --git a/metadata/md5-cache/virtual/perl-Encode-3.80.0-r1 b/metadata/md5-cache/virtual/perl-Encode-3.80.0-r1
deleted file mode 100644
index c4568c72762f..000000000000
--- a/metadata/md5-cache/virtual/perl-Encode-3.80.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Encode
-EAPI=8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.34.0* ~perl-core/Encode-3.80.0 ) dev-lang/perl:= !<perl-core/Encode-3.80.0 !>perl-core/Encode-3.80.0-r999
-SLOT=0
-_md5_=4b3333a571a963fc6d16efe8e82eaf66
diff --git a/metadata/md5-cache/virtual/perl-Encode-3.80.100_rc b/metadata/md5-cache/virtual/perl-Encode-3.80.100_rc
deleted file mode 100644
index 65c857573a5e..000000000000
--- a/metadata/md5-cache/virtual/perl-Encode-3.80.100_rc
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Encode
-EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.34.1* ~perl-core/Encode-3.80.100_rc ) dev-lang/perl:= !<perl-core/Encode-3.80.100_rc !>perl-core/Encode-3.80.100_rc-r999
-SLOT=0
-_md5_=3f669ab11371a6fd9626bdcec435579a
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0-r1 b/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0-r1
deleted file mode 100644
index 1dd5cf70d17f..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO-Compress
-EAPI=8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( ~dev-lang/perl-5.34.0 =dev-lang/perl-5.34.1 ~perl-core/IO-Compress-2.102.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.102.0 !>perl-core/IO-Compress-2.102.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.101.0 >=virtual/perl-Compress-Raw-Bzip2-2.101.0
-SLOT=0
-_md5_=ba4657d7149540de57eb522f93b24a65
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1 b/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r2
index 052f6685826e..0e76511f8bd1 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/IO-Compress-2.103.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.103.0 !>perl-core/IO-Compress-2.103.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.103.0 >=virtual/perl-Compress-Raw-Bzip2-2.103.0
+RDEPEND=|| ( =dev-lang/perl-5.34.1-r4 ~perl-core/IO-Compress-2.103.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.103.0 !>perl-core/IO-Compress-2.103.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.103.0 >=virtual/perl-Compress-Raw-Bzip2-2.103.0
 SLOT=0
-_md5_=edff49dbc28d273595d56d5023c3435f
+_md5_=1d7a7a0fa53155e4685f486021fa4ce8
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
deleted file mode 100644
index c0ee631b1e7b..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-CoreList
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.34.0* ~perl-core/Module-CoreList-5.202.105.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.105.200 !>perl-core/Module-CoreList-5.202.105.200-r999
-SLOT=0
-_md5_=2b71ef4c395b55b9592e623c3aca0d20
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 99c75a2f90ce..9966c7995cdd 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/elinks-0.15.1-r1 b/metadata/md5-cache/www-client/elinks-0.15.1-r1
index b93b44c8200f..ab468b027d7a 100644
--- a/metadata/md5-cache/www-client/elinks-0.15.1-r1
+++ b/metadata/md5-cache/www-client/elinks-0.15.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=8
 HOMEPAGE=http://elinks.or.cz/
 INHERIT=meson lua-single python-any-r1
-IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd +lua_single_target_lua5-1
+IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
+RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/rkd77/elinks/releases/download/v0.15.1/elinks-0.15.1.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f76245022eee0181640046f67bd082bd
+_md5_=f7be7af405f3374a5a28472abb368857
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 13f22aef7fd9..6cf9a93aa6ff 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/mozo-1.26.1 b/metadata/md5-cache/x11-misc/mozo-1.26.1
new file mode 100644
index 000000000000..f5652ad8c05c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/mozo-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=Mozo menu editor for MATE
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate python-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/mozo-1.26.1.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1246d13b658f149cbf1413e14a6e2f3e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f69ae6c32b60..f49c3a8f9235 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-28T07:39:53Z
+TIMESTAMP 2022-10-28T14:09:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbh0lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNb4rBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBMQw/+NQUV2lujgDRPk4FUDzUzWh1TblXqtrXV4w4j5NxQpWlWoC9eItmMuwMu
-i/9oN6zFzqisKeJ+YhHUJ0kpULz23CCGZ6kTRBrqmDfAzb4IoclulKMUl/2sO3Af
-4B+mA/fqgR7m63KJI96Zgh7feyjV6jeZMZ2AZ9I9ZV4mBZHtSUXK1IS8mX5I3lAp
-Mm3HvUf2i4ImfYrAdME6aem8tuoMg8WIkiWRniC5veTp5bDsziFAjiLZoYn1gI7M
-M/26kBAIBEIZqlalPSoQ9IXTDt1bsvGcy7f/6F0qq36kfjDjLnOxivlfIDUrhMJ6
-y9aXfW4NBLP2jd0ZiVjjhZ3m3fpPsSdUCtvy/bMFi3uKj1uMqivRniYB8xVPyzlU
-xQG/7qOdWWSOdXjMqIC0r7QRkqWA53eC36/Fwwisr5M0zspfHO9tUYjt6yjRf2UP
-eMvdqJCZeMsJkRhHRvnQZkqT7OjWbjTEXmA5iR5siiE89QAo+ShwGI4a4G84dLml
-x69Gq1Yb53PGlcTNJdv9KvvoAxJZDpcBwmKmRtKlrQV1WoB2501YyKZeL1T6NIRk
-fTeb6eJevZjyZWCX/G6yi8Ha98GY1udae+ihUT7wkSy5oQZYEbO+bQN1Ha30c1qT
-Qqnh5y9llnXuSAIYMlJWo/IuYM+1c5T4g4+AlmE0JpbziOwY5fI=
-=j9ks
+klAkkBAAmj3zBDKs/f6T//M2TgJ/DCgvxEBXJde++T6quHbPlSXQJN3AKmCzQyWV
+igwkZ77C8YaXe6x9VILyaoW3o0K+LhqWLtTbMlWPdWlGMQdKC5g6YwNhdGOULwZ5
+oqIc6Su+v5ApxVvCebw5GH5PMkkArp4A1lfK/pKUErlSsUwYfdbPIFYBm3qCTnR/
+ad+2W9TS0D7Ac5EIR6cN4tRJ8tZDPH/OsCd7SwILA9iuiGRBHZKUfqk4GDSNWck0
+Bu61AVv8CAsnYrO9wInvT7KSC8htXDzvg5/c2nFiFSbs8fbzZLN9NICjg8nA/B/g
+5zbQsuREg0QEjJ8Kz2hFBZrgia0zPrwhTkoXxhVL8KfIXWSdytocaUMXA4OHT6yC
+Vk9vDEPzO81MwLOkXAYATqE1sDuvfV3IJGiR65YtL7/b5BSuDhYfL+MRF8f0QRpM
+voaJKwui+YfHvb9v4XwQI6fycHC1Poo9PKM3DJk3X01A5h7PDa+dMeP/yefr66Sm
++UhEUlJHJvqSC4z79/zziEbuU0LSQBThQvyhQPKaT63Ka19GZQy4wZH+bodUzcnh
+XTulaYWUoFezdI5kZhLGrI8aojM52ZOZh0PveUlsMt/5S10xpFVxyF4KhJQgttWx
+TGoE+umiX2TmxXxitiV6Wa4D96w8VgQ5TpzdYWJ+aixfelXu8WI=
+=3Kud
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e7f79ab71578..2f676fedcc0b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 07:39:49 +0000
+Fri, 28 Oct 2022 14:09:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e011c46d1a30..25a7ff427a57 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 28 07:39:49 AM UTC 2022
+Fri Oct 28 02:09:49 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7678a0092d79..c926f56fb03e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 08:15:01 +0000
+Fri, 28 Oct 2022 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6e2bef45017b..238b2f1aad71 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-20503a2f0881b3b519ebfdc32b25ec8bf99ad3c2 1666941439 2022-10-28T07:17:19+00:00
+aedea4be9692b07f412a34fe1752c809c8c7302c 1666965742 2022-10-28T14:02:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8b451c77c1e3..d74518ce709a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666942801 Fri 28 Oct 2022 07:40:01 AM UTC
+1666966201 Fri 28 Oct 2022 02:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e7f79ab71578..2f676fedcc0b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 07:39:49 +0000
+Fri, 28 Oct 2022 14:09:49 +0000
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index b7d1943417fe..8e8cb5856a3c 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 222efa266975..fb91d2bfc4c8 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -6,7 +6,9 @@ AUX filezilla-3.60.1-desktop.patch 245 BLAKE2B 6bb06fcc851240d6bfe57c239084b7e9e
 DIST FileZilla_3.60.1_src.tar.bz2 4954184 BLAKE2B 94a2d95729e2e540a3ff6ed1b9ed8fc5f4ccb96eb1e4edae655476b5d099c489ecb0ed58c26cab2df97518c9ab4f7058af1f4633fead924dcb400909e1913eeb SHA512 417b97afd8e9434c625392c4025ab7d977d58fad2dfe17c8ff856233c70b5d77df22c4e1b76120d9d5dba3bce1c61453808deb26314dbde7ec425d643c4f83d9
 DIST FileZilla_3.60.2_src.tar.bz2 4965221 BLAKE2B c4a750e2fc5498ef1cda04e197c8198931aae44fe4cb2daade03b1dac76fc012ff747c9a5764f49a8365b2b969346c6f9564a02dcf1c06d59df2118a77c73cac SHA512 2660d25c2e8390cc34c08a8ad84349c8a5d5245a708223d6d5935579a29568f4276e6672a62ab3a8e187e649f30a436dca0aa1fdc6b4d6e59394f6cad10a299a
 DIST FileZilla_3.61.0_src.tar.bz2 4939127 BLAKE2B 2c2096b7cb49223b02bea7ae363dde7b58eea4da3fbe62a228edcc6e82c0909e28ff20b6cf909ac7b36209308c66b99faf7c1c4fd571ecd9248c2c3f905c2e85 SHA512 97469bc038eab32f526859ae5db58eeef6f1a8128f67bc653b6b3707b1aa7c9771ef5caa780daa4d11d20d4e7ed8e5df24ef8bd70ee2353f80d77d5410cfa722
+DIST FileZilla_3.62.0_src.tar.bz2 4943534 BLAKE2B e6f410eec85fb40ed9fdbba2889d530b1e1dcec27507e79c8542668698292a79de1fbbba3444710fd28c3b73eba56d0480eb4156392e39fc14b5cbd20d74d865 SHA512 4852f81cdaed5fc7bf3acf850ad22c34052099477de09e07115db5f1bd440fd4ec2c04c22c484048e5cd82e4ee3474350a81d91905d0459a98cbedddbe5b6a47
 EBUILD filezilla-3.60.1-r1.ebuild 1614 BLAKE2B c4aa6ed90a9bbbc8e12bcaca7669faa2bc887730849569d97f8e0fc9c54a1d1ae794ba11782658be4b4ba5126ce8bddd24321e619e9718c4a18127df8c0c7346 SHA512 7b84a73577a056602622dd53d3cdfcd66360f0e3cc8461ed37b0eacf12f0a1ba45613e15f310f36fabdc3a35a5136cea77deaee011bfd3ff178dfb56acb54296
 EBUILD filezilla-3.60.2.ebuild 1618 BLAKE2B 667c666355cafd50d34c061f7cbb3a6d1cc23bedcdc97cf19fce38b0a4856d09bd780f08f849537b2614c76d3e94cae9986322ee84f53e2c29b39aeace3bd34c SHA512 cebab343d6f4f60f09488a858d93b87fce3ac3a65b8336e736607af98cc9ea7b1bb5542138a4a47b705f196c99ec7bc347a99f32a02656bc91325bb39d9747b1
 EBUILD filezilla-3.61.0.ebuild 1618 BLAKE2B 1e2030d7b14e9010b80e3c131f9a36361078a1ceb2ce34fda2a060d4756403e199b19f4947fa8290172c092254a1a9e557390552eb2e9978081958f778f46dda SHA512 dacccd2a0b432c43872554fc0e0029080ea6532adc78d4b18d0e77c31897f0a97f2e1f52b43e44a455889b9597e9809980b27b8bef1b9d9281ffc76f1f0a98ba
+EBUILD filezilla-3.62.0.ebuild 1618 BLAKE2B 53ce72501d94a40593d743cad2fd5e51c185d2b3fd02714130dd097c987824dccd203e8979e3aeb8187482f8b51cd7acfd758dbef27b7709ced7af060cf19244 SHA512 99b4a0387e6b7da09626f437848ee5543d14810d8450b3c8e8f0b8c61d028a80f8e01597a1080bead695ffd2b2d51fe16d7440c69a1034e309b6138697911e11
 MISC metadata.xml 449 BLAKE2B 3a9fbf5c444404c3922fac61b0a36429acda9bd582d3b2049e9637088acf1a33af6c9a68052325969037951640ec3b9c8e2d357cbbd06a4655a504cb363e0c58 SHA512 f33dccada194313d97e91f514ca89685a2c643a0fb736e3a90065b246aced161fc45198aa05fea8fb96ff7827ddb8722344158e7d4c4b68c1bd008097fa99b7c
diff --git a/net-ftp/filezilla/filezilla-3.62.0.ebuild b/net-ftp/filezilla/filezilla-3.62.0.ebuild
new file mode 100644
index 000000000000..5c1ee4a26cf5
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.62.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+MY_PV="${PV/_/-}"
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="dbus nls test"
+RESTRICT="!test? ( test )"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND="
+	>=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.39.2:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.0 )"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8cfb593f4ca1..ff827cf40c65 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 0697b9261dac..f7ecb79441ef 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -45,5 +45,5 @@ DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac96759816
 EBUILD synapse-1.65.0.ebuild 3233 BLAKE2B 71350eac2241e7120793fc8b7d75cf4c793ddd7b58843f6f915ee2a8f523edd5410b1aa4cc16542fdcb2adb0b63c8bf9d5114843c65f4a99d57ef2366a2c509c SHA512 40a7b789943218c70b05d60b4687f3a66a8a70efa51fe8185757e0cc222525cb25643e96dbf6f3beb082fea2782fc2968e9b664a9e57bacb996568cb0f757914
 EBUILD synapse-1.66.0.ebuild 3667 BLAKE2B 620dfcb6dee5038f7fc70428ca7466606ce366f25ed3b152b41c476c549721311966ea40526545c3a7a5db6cd2e707c27cf3225e4ce58fa838a71567a9978f73 SHA512 07f2c1cfe3a8be9d999c943bd500759c6dfca8ea2bc3f1b49972ae136876997aef893743e84c8cedfd27230735f6821bb6a5596406de682d21aea6cdf0128b8f
 EBUILD synapse-1.67.0.ebuild 4021 BLAKE2B ca1bb25dd3a2c6bedf6ddeaafda7a5d992a9818d329832851cfab73e33452456f0e8b29528252d701353cbf303336d2014a819428e033187a2598ab1345bf39d SHA512 ad961008127dfa62d9fa816b6225affd00d257899fa62994fded820ebcc7446e9fe0436a0b2063bdd9a5a2bda11a20b76dc874502a235c5f42309a7aa82421f2
-EBUILD synapse-1.68.0.ebuild 5083 BLAKE2B 47c9d27aa9edab08836238560af03a414e1dbab4486827ba3d5f314c623aeaefbc25098e1d0327f4265de4f104c212930e8cac4b1537c1a63b345e466b0c8777 SHA512 1e7867ffa051d2a7d35e067719ef6e8b4548283c80a679615588eeec81637afc075c1559c0fdd419c3d2a671beeafc633c5732bf8d7e5b335d339ed3c07e22ea
+EBUILD synapse-1.68.0.ebuild 5082 BLAKE2B cd32cc245580bf72428df2b0c2e06517d962aa571a7d9213585fc90463952c5a29c1dbe5672825005b27c58b13f22db08dd14b2c381973646dd9dbdc9731be20 SHA512 af4de4cfbc19bc0314dd6029709482401bd58956559ad1313fea1ce231a9bd9077ca0e9cac3cb4ad363ed0a17d155547817a8f179bf3ef3f816a1eb9129008dd
 MISC metadata.xml 474 BLAKE2B 1e990bd0b3e6234f15e2e036ca6c9157b6bb27c36542e24d5e80a5f2a8dc04a592ee267869869d79bee00177ac8c11ddb630483d802c3d6be49317d41ea41cdb SHA512 6447082bda7509c395fc60bd23fb506d1d61cc0d6b89aca7d68c263270bb7d941f3ea95b18f428c301b0f0cd536688856b85ea264b0facea7cb5d51bd5909c46
diff --git a/net-im/synapse/synapse-1.68.0.ebuild b/net-im/synapse/synapse-1.68.0.ebuild
index 2916a28b5011..521e34eda23b 100644
--- a/net-im/synapse/synapse-1.68.0.ebuild
+++ b/net-im/synapse/synapse-1.68.0.ebuild
@@ -68,7 +68,7 @@ LICENSE="Apache-2.0"
 # Additional licenses needed for Rust crates
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index db71d8735c95..1f8d59893723 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 76d8a7456ea0..7d986a4fd9c7 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,6 +1,8 @@
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
 DIST ii-1.9.tar.gz 12672 BLAKE2B 95da596de00fb311a69b907ab25c0089aafa512085b25fe5753206cdeaa0fec3d9a16eb38d60c68542f7002efd1052e69e1f5542f535363d38760cab508b3d99 SHA512 a665a6d1e1ffe56e370da2d703e677436ef4e18e763bb3cadbbf55e01812454ce4b79e8a20eda23846fdbe5a441ec8c534c9394995b3441472ce8a74c9035279
+DIST ii-2.0.tar.gz 11129 BLAKE2B ee8b4e1169f1f59a9f09fa2a96fc898b0c48a337708a19a208fd344453f620bb3a832e25c26a20f7d14e2e5a7924d8a1d97efabdbb269125c2117f453d5f737f SHA512 ab8102b5669495b7bc6a3311245f3eb49d2add1e387290e41deb51e121f4c7c98a09d117052c345d8b896149276a83790c0b78efe3ed19fc52bc00575bf8e44a
 EBUILD ii-1.8.ebuild 681 BLAKE2B b91c1438d2126cd64e484fb3bdbbfe2f0733615a234f7a4f4e37767b5eb17568a08f5d95e594dbd5cc3e2d489bca0114e1deb54e1ce24248ec49d3f2708c9084 SHA512 a673a6739c66535c39b458de7816cf3b7eadee202dacf9468fb22d1fae81c6887c260b2347da28d17ffe157d2c4b836945e8f9c2d091c1457d6fdb54ff213aa1
 EBUILD ii-1.9.ebuild 731 BLAKE2B 462ca23c0871c10e8eea1abffc6c60cb1c8836343b7ae09c7a0c1f554adf004e0b1eee7c059bece930bbe9e25c0a498e69aef1310e3fcf6c95c4a4284e2e4a1a SHA512 5d87484e6c93a72861bfebeb482d5dc8197f68bb5c4062d60ce5a089b2a15786e5e372e69bfe84b2885d5a17d5e58ebbfc1e2ea0e4a796796b8dc3936ba23440
+EBUILD ii-2.0.ebuild 562 BLAKE2B 11533667672efe67c25794327663b0f2730d8d32b93abef337b1b9f19fb381a993b11594b0d027ffa1811758d8424c0cf14ac635931a8cdf4d528898fc1cde8a SHA512 98c032499758bf4fa88a4161822c95380e620636cc8997f1873e2ec9825b3d8c0f4928d8aa3cc237b6978b9faa0d769b38dd234978734b3f738fa814da0b9684
 EBUILD ii-9999.ebuild 494 BLAKE2B fefdff75afb882164b47c19f9da9deeb1a2e0f6d8842e661dc4f2021ab65d89fb32f9c1bc80babfb4b6a0eb0f67722c916be12e73ee9dca7dbcde684174877b9 SHA512 6aeeaa27a87772da8879f575616ad2d933dcf508801c5013aa32014df0c873d61e5221268577445dad39aad10d296e28c7ee179829b5d91418f9150fe37147bf
 MISC metadata.xml 399 BLAKE2B befed27e539720bd0181729b2bad9ae3d2a08455842ffc8ffc74e221c0bcce28b9081821d9c4d8963159c729af972ac7719b51f37991964770f60116ba129fce SHA512 783203ecd1b1934c4a52d9588bd449e340d9cfadcc35316e7986a2a144494e0a508a6a91daa9e0551e5b96483a1050fc97ff24cac75e045bd3e70d8011038be3
diff --git a/net-irc/ii/ii-2.0.ebuild b/net-irc/ii/ii-2.0.ebuild
new file mode 100644
index 000000000000..e932246b3013
--- /dev/null
+++ b/net-irc/ii/ii-2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
+HOMEPAGE="https://tools.suckless.org/ii/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9d1d3f2a0e20..b11d813205bf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 8707bcb1958d..3d3fd3007b22 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,16 +2,13 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-7.84.0-easylock.patch 856 BLAKE2B a77854a75a06ad66ef4dc7d6a2555fe2678f4bfd170e961c35e5ad2a82a62891d125ead2d15a311e2a8951404732c755a03636dd4bf4dd3ad16e8bf32ff4f7ca SHA512 7b94f941577d5b0a240e4e879a7e4c659dbdd4ff50d67465bd1a0adf30f5e37a0af7f15b71810feb05d19b833359b069f86aa3ac4c396fd8ba8ed2012b60fb8f
 AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea98acbd166f18eba538ecd4666152653c36784569f1945b095480120c61124573b094e26ce26c8b85f62baedb40e20d758 SHA512 4be64eff67e56c2584f6c9ee0c9c7b7aca55fc15c8d4be6f9f79da9bb3c1bb1532bcb80eb4f87be2db1058dd41a32e366bfe83988d28b4b263fbb6679b5ec806
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
-DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94
-DIST curl-7.83.1.tar.xz 2474940 BLAKE2B 491427b12f082c2246ef6cb2a129340079db28bd93b4381889e7328bef1d61a79bb57cba4b8372759baa4f6e77644966ed95cfa8f839ee9db634786757fb1ce0 SHA512 2f63327d6d3687ba36fb7b8d5d3d15599eca33ebfb08681613612ea9c4b629d3b6ce4d2742fa1ebd7a997ed332001d3a4c798985f9277c83b9e7a9aecdb1b1ee
-DIST curl-7.83.1.tar.xz.asc 488 BLAKE2B 78f7a6d9a32cab97e9ce26430eb2be2bc4e20552cf8c59238f30f127e9d7af5b4f9808c3fe0846c18c8f7a67b49f2f75d865d17b7760bb664872934799949441 SHA512 f0d29de315488c844eb81ed5a89ed6334910970224c8cac43e7e6f2d58c35ad0064c0b6122e69b3a34ce91f4b56873c63e2e8aea1c602ef40711bfd62a01b191
 DIST curl-7.84.0.tar.xz 2477944 BLAKE2B 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1 SHA512 86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce
 DIST curl-7.84.0.tar.xz.asc 488 BLAKE2B d74dea89fa89b6ed0a928e01987669f7dde0bcbb30423ea0f3af9f31eea1e059d458629d80455d772264d744fab236d4f506545afa1bfbd6ded7e2b27192a7c8 SHA512 80ff5274277ad97448fa53511bab6e8a1c302bcb25fc0916d78b8dc6c6af43d944c37c4ed46668b651cc639ec4964780725117ca0e85168ea66ad7cc98d29702
 DIST curl-7.85.0.tar.xz 2480648 BLAKE2B 7d0e0212541c05352040391b400e0314e0d38a96b199dfd70ccaaca3fd7f809b7ed96b877c4663c06fc05c483468521458255dcf025226f1bdf4d6c9dd9b8873 SHA512 b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd
 DIST curl-7.85.0.tar.xz.asc 488 BLAKE2B 8fb84955ee458af7f2cecef4b48c5375db2e8179e5c17a5215a4a92e28e5ec7dd59a9dc057563643016c683e547a04c494276e16d113dbd498f94b7a7183e1e3 SHA512 7022daf84b330b24112d595edee715cdeb881a4ba8a4fa7eec23aed28292e5d943af778f03aadd036d44d875f9e226096ea142d18afe516b6bdbd475fcd3aca6
-EBUILD curl-7.79.1-r1.ebuild 8166 BLAKE2B 69d521028d1ff2d37b270539c8ad37a8033923d60ad057a347b843587a035c0afb829361fb605ef4186243657bef6a94156e493321161c62d16ecc2b4a73d0f0 SHA512 05ef78d4080f609ff1a5deb191d1d7d09ddfe58c617cd8688c231c4e71268784ebc9c2eee1a5a023488868d23b15db7b04718e6e7a3b4dbe17ac9880eeaa1eb9
-EBUILD curl-7.83.1.ebuild 8274 BLAKE2B b9f06416a4b68a17616c90d91be3a629020110aaa7c3d9caac79937c3606982f0c28d4fe8a798311cdf623e62455d4c6aa8708faff46bb1805ed2a514bf014d9 SHA512 77992858391e805764c4b5b9eccff0e87465def7eeb105151e5a5754270d29e5e815d4239f90c6543dcad90dccac46cae843194e278ea8335aa1669a8deff4c8
+DIST curl-7.86.0.tar.xz 2518356 BLAKE2B a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce SHA512 18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656
+DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a9d5caf51c0d5a4a2e6881fb478f1768a6b71efbd9283563e2c7e2badbc5a6d6df265013e14eee2ec7e9be148 SHA512 9e97d5f44b3c856f401fe30ba713e1ca1f74edfc693dc42f1ce8e43f9f6dd4bf6998c579bc9c5d0f749f475a7d67d232e92ab6f89b95141acdb53e149f2312f0
 EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
 EBUILD curl-7.85.0-r2.ebuild 8204 BLAKE2B ed3363c2ea324f4485c411ccfd7f049126e64ef6a748a9df9f0518f1e3864e4022f5e1689e2534f2eabeadebe12357d516d8c5f39b59d7a13d4e25aee5634ae5 SHA512 e46aa564a0d73a987e6b30d00d89d43e303074130df9aa0b984b929bceba0ec4db2e6564ce7c3b73b64119b59650f5cd304e15e27853890573c15dd2fb6fba44
-MISC metadata.xml 2099 BLAKE2B fd6994bf9bf8dcfe79a8677cbf2449a8638cdbfbca8bd21bd0a84ab65ab31bc4e001cd595df95b3884c20626160fa7b4310614d856891e3fb699c43a4d142dd5 SHA512 3905bca0ea55e6756f68535d9e5de11e8c7ae37768a4e236e5a75087c45803b077c1c84ecc74e54899fb7a6309b88819e3c668e73a3f4b903e48ca9123853f8c
+EBUILD curl-7.86.0.ebuild 8253 BLAKE2B da0ca8206baead3da48b2a63ba6311933fa5fd8710a54cc4448a221596cdab57b86f1bfd67368c5357e06053de591b21575b7fe655fec6f7569375d569ff639b SHA512 a70e80311df4cd5eee6eaa0960390df71982c3d5465e6392c7e1068abbe97aacef1dddb1a3b1572063f0c7daf383a3bf31e8ea8f96b2c3291829a1bd9944dd3b
+MISC metadata.xml 2103 BLAKE2B beb97305069a47f8eee68278dca5c0f10467d374c9fdab2ea27808b79a68cd921e2ab60bbb2455cbce2cdcada72e8c68290b40ec87ba31dad6ea580820f5c800 SHA512 27c15624622b074926307369bb41ad6cf532300154a70573618a072418358f5fc543eb56873e9836703073e8b42134a0387f3077e741377827a685cbf69faaab
diff --git a/net-misc/curl/curl-7.79.1-r1.ebuild b/net-misc/curl/curl-7.79.1-r1.ebuild
deleted file mode 100644
index ac8292e30cfe..000000000000
--- a/net-misc/curl/curl-7.79.1-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
-	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use openssl || use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use winssl || use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_winssl; then
-			einfo "Default SSL provided by Windows"
-			myconf+=( --with-default-ssl-backend=winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-crypto-auth
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		--disable-ntlm-wb
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-hidden-symbols
-		--enable-http-auth
-		$(use_enable ipv6)
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--disable-sspi
-		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--without-cyassl
-		--without-fish-functions-dir
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		--without-libpsl
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		$(use_with quiche)
-		$(use_with rtmp librtmp)
-		--without-rustls
-		--without-schannel
-		--without-secure-transport
-		--without-spnego
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.83.1.ebuild b/net-misc/curl/curl-7.86.0.ebuild
index a3fd859195dc..4dbd6a99bbe3 100644
--- a/net-misc/curl/curl-7.83.1.ebuild
+++ b/net-misc/curl/curl-7.86.0.ebuild
@@ -12,16 +12,14 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
 
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
+# Only one default ssl provider can be enabled
 REQUIRED_USE="
-	threads? ( !adns )
 	ssl? (
 		^^ (
 			curl_ssl_gnutls
@@ -51,6 +49,7 @@ RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 		)
 		nss? (
 			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			dev-libs/nss-pem
 			app-misc/ca-certificates
 		)
 	)
@@ -202,8 +201,8 @@ multilib_src_configure() {
 		--enable-proxy
 		--disable-sspi
 		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
+		--enable-pthreads
+		--enable-threaded-resolver
 		--disable-versioned-symbols
 		--without-amissl
 		--without-bearssl
@@ -223,14 +222,14 @@ multilib_src_configure() {
 		--without-rustls
 		--without-schannel
 		--without-secure-transport
+		$(use_enable websockets)
 		--without-winidn
 		--without-wolfssl
 		--with-zlib
 		$(use_with zstd)
 	)
 
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
 	if ! multilib_is_native_abi; then
 		# avoid building the client
@@ -265,7 +264,7 @@ multilib_src_configure() {
 	sed -i -r \
 		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
 		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
 }
 
 multilib_src_test() {
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index a6e835644b81..1ed68e6f5340 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -28,7 +28,7 @@
 		<flag name="sslv3">Support for the old/insecure SSLv3 protocol</flag>
 		<flag name="telnet">Enable Telnet protocol support</flag>
 		<flag name="tftp">Enable TFTP support</flag>
-		<flag name="winssl">Enable winssl ssl backend</flag>
+		<flag name="websockets">Enable websockets support</flag>
 		<flag name="zstd">Enable zstd compression</flag>
 	</use>
 	<upstream>
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.201.0.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.201.0.ebuild
deleted file mode 100644
index cb39422f2c42..000000000000
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.201.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=PMQS
-DIST_TEST=parallel
-DIST_VERSION=2.201
-inherit perl-module
-
-DESCRIPTION="Low-Level Interface to zlib compression library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# We use the bundled version of zlib as the minimum version for the system copy
-# Check on bumps! Look in https://github.com/pmqs/Compress-Raw-Zlib/commits/master/zlib-src.
-RDEPEND=">=sys-libs/zlib-1.2.12"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-src_prepare() {
-	rm -rf "${S}"/zlib-src/ || die
-	sed -i '/^zlib-src/d' "${S}"/MANIFEST || die
-	perl-module_src_prepare
-}
-
-src_configure() {
-	BUILD_ZLIB=False ZLIB_INCLUDE="${ESYSROOT}"/usr/include \
-		ZLIB_LIB="${ESYSROOT}"/usr/$(get_libdir) perl-module_src_configure
-}
diff --git a/perl-core/Compress-Raw-Zlib/Manifest b/perl-core/Compress-Raw-Zlib/Manifest
index 7d7cec594a17..8efb7e6a7a93 100644
--- a/perl-core/Compress-Raw-Zlib/Manifest
+++ b/perl-core/Compress-Raw-Zlib/Manifest
@@ -1,5 +1,3 @@
-DIST Compress-Raw-Zlib-2.201.tar.gz 480467 BLAKE2B e2c706447cdd82c712b0613da69903adb3e9f51dd3e791bea51c836a767ca1df03f18870d377fea20af5f5ffb074925b0a70c80ef507622264d21b657bda4ea2 SHA512 1262f5be347e1efe71f0308385a5b8b927854b1e061d69d9a38c74e6dfacf2ffbec0891bdeb76092de28a5049e1fd1eb3e784e0570b34612a8256d955d7f1ab7
 DIST Compress-Raw-Zlib-2.202.tar.gz 480563 BLAKE2B 8e9eef5fae7dcac500b08ee7315e6d05912fe954e18560f1ecc195800343102cd0f97690c46c5e06bc6c734877e48356cb93fa70d7070c954e62dc2a7bd2d6c5 SHA512 add25f83ecd83fe3beaad12a6f8b37ca046fdfccfa44c03f32b104a9ec6c132407dc606ba0e30fad67151f1b1d4f6886991b19948c12e2964df13a6daa703e72
-EBUILD Compress-Raw-Zlib-2.201.0.ebuild 1022 BLAKE2B a6118f7f2aed28c197caa2b02f9888407142d187dbbfa7c91b23b3ff5a07a8baebeb91f63a1ece9e5285d266628a49dcc829ef729e976b67c76db5bbc1782a52 SHA512 43f17e50386dfc5583464bc2852458f151ce0c94d65cf2bd8758f7328c08b820fae80412f5a4e217d4a99f9ec2ba638731a08fecd3ddd77110ab17f74522452c
 EBUILD Compress-Raw-Zlib-2.202.0.ebuild 1014 BLAKE2B 47e47672c319e2603b96b088dba98526cb57bacb98b5cb4e1d94bd7641708f2ad325699eab5c6c14abf45d7865539bf78153d1c9cd20a3690bcaf25df1ecc04e SHA512 f529594fe0665c8010e6b7f15432f854e1d34ae326406bcba1ca6c6d8713959e29f4b09933922c2ad45583ea15dfa697331245960110645c1a5432ff6094bf0e
 MISC metadata.xml 408 BLAKE2B 3f82618b044265b3f70d4a3462905fdaff9a2ed200a05b4f4eebb03a76452d73f7162ccec4225a5039ac27c0a867bf41293e16cb3d85592f04cd2967c866a057 SHA512 2138a8048939760d1fc0da310b1e16cb35a7ae6a819980639946fb495a4be24a102153f004ac8a382c736f18f25b006abcd8e3d347a6b37e1e8fe8f50991228d
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 77bb7db2d8a2..6d32ab1fee5d 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3dd59443bc84..5dd31b564ae6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 8f10534062c6..c5f46e98ac62 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-10-28)
+# Please upgrade to >=media-libs/fontconfig-2.14.1-r1 for fixed
+# cache dir to avoid sandbox violation errors, bug #878471.
+=media-libs/fontconfig-2.14.1
+
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-10-28)
+# Unmaintained upstream, no reverse dependencies, fails tests
+# Removal in 30 days
+dev-python/pweave
+
+# Michał Górny <mgorny@gentoo.org> (2022-10-28)
+# Originally last rited in Aug 2020 due to lack of Python 3 support.
+# The last rites were undone, however this package never got fixed.
+# Instead, it has been covered by incorrect "downgrade" mask since then.
+# Removal on 2022-11-11.  Bug #695010.
+app-i18n/scim-sunpinyin
+
 # Jonas Stein <jstein@gentoo.org> (2022-10-26)
 # Dead upstream, open bugs.
 # Removal after 2022-12-24.  Bug #878337.
@@ -642,12 +659,6 @@ media-plugins/kodi-game-libretro-dosbox
 # bug #705554, bug #689408.
 >=dev-scheme/guile-3.0.4
 
-# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-09-01)
-# Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
-# (Mask should remain after ebuilds are deleted, until 2021-03-01 or
-# until new upstream release with proper versioning.)
-~app-i18n/scim-sunpinyin-3.0.0_rc1
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d0877ad6f7ee..559c4a3731a3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6409,7 +6409,7 @@ net-misc/curl:ssl - Enable crypto engine support (via openssl if USE='-gnutls -n
 net-misc/curl:sslv3 - Support for the old/insecure SSLv3 protocol
 net-misc/curl:telnet - Enable Telnet protocol support
 net-misc/curl:tftp - Enable TFTP support
-net-misc/curl:winssl - Enable winssl ssl backend
+net-misc/curl:websockets - Enable websockets support
 net-misc/curl:zstd - Enable zstd compression
 net-misc/dahdi:flash - Support (short) flash on FXS
 net-misc/dahdi:oslec - Enable OSLEC (software) echo canceller (require ECHO in kernel)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5658b8beec29..b69c35c333a1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index cf1b9e6b7619..4096463be512 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,12 +1,2 @@
-AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
-AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475
-AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd
-AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
-DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598
-DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
-DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
-DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
-EBUILD systemd-tmpfiles-249.7.ebuild 6091 BLAKE2B 63064cd496f780af754185f05a47551804f05d2b21c58d4b173d2a2ec82b7ba986c947ca1fc15cfc793f411caebf2b7586315ef7e741c534e00649c26c5d5bcf SHA512 e56de86404b80d686e233a17761adfd7f7f59afd1a8f90c2a50658d1fd04e8d1a8b62acbc4cc1d882d094fac10ed5964a03edc1f182c00b3821c856245e33eb3
-EBUILD systemd-tmpfiles-249.9.ebuild 5989 BLAKE2B 3aef19d9a002b4a697e778073d0ad59bb50150f5b5a4a2277f3d1fbb26098934ce1c84610943ad0219053a348c8c3c5e3ed0eeba4d0c47fbd267a890868213c4 SHA512 201c85c33567feb6dacde41f69c5e25f1f412fcf37af99fc211b161f55293b41cee199a3ae437f5b056d40e25218e5e985c145c9416c799c060b1102039b5afd
 EBUILD systemd-tmpfiles-250.ebuild 371 BLAKE2B a68a8de1e3d9a4315e6eded9106ee0a80aa1574155baefb448082b9023b08326d53f2bc6de201da8af4ade36b65b4bd1b89f3dad8b1594d2fb647bc73b302e69 SHA512 c947ea7946727efe39d9f5280e8ba1ad182aeab0c9c77f1ae20c667884bbe8bdc9ecfcf55e63008058c9ee57a38b44220eb0e3e93d04d235b5f441b0cd1e2027
 MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch b/sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch
deleted file mode 100644
index e063d303c7d8..000000000000
--- a/sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Tue, 21 Dec 2021 20:10:09 +0900
-Subject: [PATCH] meson: fix cross compiling
-
-(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 02495d16c9..c76cab535d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
- conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
- conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
- conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
--conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>'))
-+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
- 
- decl_headers = '''
- #include <uchar.h>
diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd b/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd
deleted file mode 100644
index 0952ef12cc2c..000000000000
--- a/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Released under the 2-clause BSD license.
-
-description="Set up tmpfiles.d entries for /dev"
-
-depend()
-{
-	provide stmpfiles-dev stmpfiles.dev tmpfiles-dev tmpfiles.dev
-	use dev-mount
-	before dev
-	keyword -prefix -vserver
-}
-
-start()
-{
-	ebegin "Setting up tmpfiles.d entries for /dev"
-	/bin/systemd-tmpfiles --prefix=/dev --create --boot ${stmpfiles_opts}
-	eend $?
-}
diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd b/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd
deleted file mode 100644
index a55163d3fd65..000000000000
--- a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Released under the 2-clause BSD license.
-
-description="Set up tmpfiles.d entries"
-
-depend()
-{
-	provide stmpfiles-setup stmpfiles.setup tmpfiles-setup tmpfiles.setup
-	need localmount
-}
-
-start()
-{
-	ebegin "Setting up tmpfiles.d entries"
-	/bin/systemd-tmpfiles --exclude-prefix=/dev --create --remove --boot \
-		${stmpfiles_opts}
-	eend $?
-}
diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles.confd b/sys-apps/systemd-tmpfiles/files/stmpfiles.confd
deleted file mode 100644
index 2ec4b5f0d8b8..000000000000
--- a/sys-apps/systemd-tmpfiles/files/stmpfiles.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Extra options to pass to stmpfiles
-#stmpfiles_opts=""
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild
deleted file mode 100644
index f9142ca4addc..000000000000
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *.* ]]; then
-	MY_PN=systemd-stable
-else
-	 MY_PN=systemd
-fi
-
-MINKV="3.11"
-MUSL_PATCHSET="249.5-r1"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit flag-o-matic meson python-any-r1
-
-DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
-	https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz
-	elibc_musl? (
-		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-	)"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/acl:0=
-	>=sys-apps/util-linux-2.30:0=
-	sys-libs/libcap:0=
-	selinux? ( sys-libs/libselinux:0= )
-	virtual/libcrypt:=
-	!sys-apps/opentmpfiles
-	!sys-apps/systemd
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${EPREFIX} ]]; then
-		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/systemd-249.7-CVE-2021-3997"
-
-	# musl patchset from:
-	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
-	# we share patch tarball with sys-fs/udev
-	if use elibc_musl; then
-		einfo "applying musl patches and workarounds"
-		eapply "${WORKDIR}/musl-patches"
-
-		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
-		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
-
-		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
-		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
-		# not a nice workaround, but it comes from debug messages and we don't really use this component.
-		append-cflags '-Wno-error=format'
-	fi
-
-	default
-
-	# https://bugs.gentoo.org/767403
-	python_fix_shebang src/test/*.py
-	python_fix_shebang test/*.py
-	python_fix_shebang tools/*.py
-}
-
-src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
-	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
-	local systemd_disable_options=(
-		adm-group
-		analyze
-		apparmor
-		audit
-		backlight
-		binfmt
-		blkid
-		bzip2
-		coredump
-		dbus
-		efi
-		elfutils
-		environment-d
-		fdisk
-		gcrypt
-		glib
-		gshadow
-		gnutls
-		hibernate
-		hostnamed
-		hwdb
-		idn
-		ima
-		initrd
-		firstboot
-		kernel-install
-		kmod
-		ldconfig
-		libcryptsetup
-		libcurl
-		libfido2
-		libidn
-		libidn2
-		libiptc
-		link-networkd-shared
-		link-systemctl-shared
-		link-timesyncd-shared
-		link-udev-shared
-		localed
-		logind
-		lz4
-		machined
-		microhttpd
-		networkd
-		nscd
-		nss-myhostname
-		nss-resolve
-		nss-systemd
-		oomd
-		openssl
-		p11kit
-		pam
-		pcre2
-		polkit
-		portabled
-		pstore
-		pwquality
-		randomseed
-		resolve
-		rfkill
-		seccomp
-		smack
-		sysext
-		sysusers
-		timedated
-		timesyncd
-		tpm
-		qrencode
-		quotacheck
-		userdb
-		utmp
-		vconsole
-		wheel-group
-		xdg-autostart
-		xkbcommon
-		xz
-		zlib
-		zstd
-	)
-
-	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
-	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
-	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Dacl=true
-		-Dtmpfiles=true
-		-Dstandalone-binaries=true # this and below option does the magic
-		-Dstatic-libsystemd=true
-		-Dsysvinit-path=''
-		${systemd_disable_options[@]}
-		$(meson_use selinux)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
-	# https://github.com/systemd/systemd/pull/16061 original implementation
-	# we just need to pass -Dstandalone-binaries=true and
-	# use <name>.standalone target below.
-	# check meson.build for if have_standalone_binaries condition per target.
-	local mytargets=(
-		systemd-tmpfiles.standalone
-		man/tmpfiles.d.5
-		man/systemd-tmpfiles.8
-	)
-	meson_src_compile "${mytargets[@]}"
-}
-
-src_install() {
-	# lean and mean installation, single binary and man-pages
-	pushd "${BUILD_DIR}" > /dev/null || die
-	into /
-	newbin systemd-tmpfiles.standalone systemd-tmpfiles
-
-	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-
-	popd > /dev/null || die
-
-	# service files adapter from opentmpfiles
-	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
-	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
-
-	# same content, but install as different file
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
-}
-
-src_test() {
-	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" test/test-systemd-tmpfiles.py \
-		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
-}
-
-# stolen from opentmpfiles ebuild
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		add_service stmpfiles-dev sysinit
-		add_service stmpfiles-setup boot
-	fi
-}
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild
deleted file mode 100644
index f6a77f0f5c88..000000000000
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *.* ]]; then
-	MY_PN=systemd-stable
-else
-	 MY_PN=systemd
-fi
-
-MINKV="3.11"
-MUSL_PATCHSET="249.5-r1"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit flag-o-matic meson python-any-r1
-
-DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
-	elibc_musl? (
-		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-	)"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/acl:0=
-	>=sys-apps/util-linux-2.30:0=
-	sys-libs/libcap:0=
-	selinux? ( sys-libs/libselinux:0= )
-	virtual/libcrypt:=
-	!sys-apps/opentmpfiles
-	!sys-apps/systemd
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${EPREFIX} ]]; then
-		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/249.9-cross-compile.patch"
-	)
-
-	# musl patchset from:
-	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
-	# we share patch tarball with sys-fs/udev
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/musl-patches" )
-
-		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
-		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
-
-		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
-		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
-		# not a nice workaround, but it comes from debug messages and we don't really use this component.
-		append-cflags '-Wno-error=format'
-	fi
-
-	default
-
-	# https://bugs.gentoo.org/767403
-	python_fix_shebang src/test/*.py
-	python_fix_shebang test/*.py
-	python_fix_shebang tools/*.py
-}
-
-src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
-	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
-	local systemd_disable_options=(
-		adm-group
-		analyze
-		apparmor
-		audit
-		backlight
-		binfmt
-		blkid
-		bzip2
-		coredump
-		dbus
-		efi
-		elfutils
-		environment-d
-		fdisk
-		gcrypt
-		glib
-		gshadow
-		gnutls
-		hibernate
-		hostnamed
-		hwdb
-		idn
-		ima
-		initrd
-		firstboot
-		kernel-install
-		kmod
-		ldconfig
-		libcryptsetup
-		libcurl
-		libfido2
-		libidn
-		libidn2
-		libiptc
-		link-networkd-shared
-		link-systemctl-shared
-		link-timesyncd-shared
-		link-udev-shared
-		localed
-		logind
-		lz4
-		machined
-		microhttpd
-		networkd
-		nscd
-		nss-myhostname
-		nss-resolve
-		nss-systemd
-		oomd
-		openssl
-		p11kit
-		pam
-		pcre2
-		polkit
-		portabled
-		pstore
-		pwquality
-		randomseed
-		resolve
-		rfkill
-		seccomp
-		smack
-		sysext
-		sysusers
-		timedated
-		timesyncd
-		tpm
-		qrencode
-		quotacheck
-		userdb
-		utmp
-		vconsole
-		wheel-group
-		xdg-autostart
-		xkbcommon
-		xz
-		zlib
-		zstd
-	)
-
-	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
-	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
-	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Dacl=true
-		-Dtmpfiles=true
-		-Dstandalone-binaries=true # this and below option does the magic
-		-Dstatic-libsystemd=true
-		-Dsysvinit-path=''
-		${systemd_disable_options[@]}
-		$(meson_use selinux)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
-	# https://github.com/systemd/systemd/pull/16061 original implementation
-	# we just need to pass -Dstandalone-binaries=true and
-	# use <name>.standalone target below.
-	# check meson.build for if have_standalone_binaries condition per target.
-	local mytargets=(
-		systemd-tmpfiles.standalone
-		man/tmpfiles.d.5
-		man/systemd-tmpfiles.8
-	)
-	meson_src_compile "${mytargets[@]}"
-}
-
-src_install() {
-	# lean and mean installation, single binary and man-pages
-	pushd "${BUILD_DIR}" > /dev/null || die
-	into /
-	newbin systemd-tmpfiles.standalone systemd-tmpfiles
-
-	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-
-	popd > /dev/null || die
-
-	# service files adapter from opentmpfiles
-	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
-	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
-
-	# same content, but install as different file
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
-}
-
-src_test() {
-	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" test/test-systemd-tmpfiles.py \
-		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
-}
-
-# stolen from opentmpfiles ebuild
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		add_service stmpfiles-dev sysinit
-		add_service stmpfiles-setup boot
-	fi
-}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 58bfa71cd6fa..0be74294bce4 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest
index 420317793813..4f29f7a62ece 100644
--- a/sys-block/hpssacli/Manifest
+++ b/sys-block/hpssacli/Manifest
@@ -4,8 +4,10 @@ DIST hpssacli-2.40-13.0.x86_64.rpm 11772990 BLAKE2B e8d5def139939342183d8edb6990
 DIST ssacli-3.40-3.0.x86_64.rpm 15201025 BLAKE2B a4307ffad4b01f11fea5bf51a27dc8971b46d08afedba5b522b67c43c811ef8f48245e1831f0b9f34cda267d6dd039de33719e53da861bbd60f1a796231aadcf SHA512 372a08098cb4769455e0ced7ebe3e25589353f2feb689fba6234272b79c21fac7e419d559279dedca1e18b7fe0250efb624b0e1b7a8a8ea4720a67701b507d3d
 DIST ssacli-4.21-7.0.x86_64.rpm 15888806 BLAKE2B 65577085cb3b32bd0bb30ef6eec8e1f8c903e1619eb386142864e52fb1ed2d43520ae79b1831fd6c17673a992980d06092c67ed7808ddf3cf6df5f18d3e150ef SHA512 55fb5d533d2b072ea0491f58aef054d53e744350bbf1a812c1a639f5c5964a23bb895fdf363c6dcb4531de8dab5a09d51f483389714172f3aa70a23fcf8fd3aa
 DIST ssacli-5.30-6.0.x86_64.rpm 16639836 BLAKE2B 6df471b0db7ad948adf7d135b724800e768bd530b4e8e681472723e13b1f717b2ac48fee0b8a1652bed729a8b090f1ed135f0a531f16c7c0741923d04c69ced2 SHA512 ec79e865ffaa9477e5aa0cdc7c93c70ffb82dc8968f146aae18f1314a727d74636ab6e4c3906e770b422cf04aef92a4830757c4b351fd545b9359ab5d8fe5f9a
+DIST ssacli-6.10-14.0.x86_64.rpm 17308417 BLAKE2B cf095faaf6e40f894328a7d2b23793a2b7dc927f0346fc2115b2b25a8db91ce8c52d45fed2d14de838b584d4120b5718140a470e27282dc61623929f9c377224 SHA512 e709bd193e703a3136f280bd90b95ee7fcd36f1be24310681727004f7c81b5244f0ee5c87ffd8d44223ec9fac3ab2d8a77eccc9008ced1a9b4ec39527c596580
 EBUILD hpssacli-2.40.13.0-r1.ebuild 1813 BLAKE2B 38a6dfaaaf13ad267ee68dbf98e0070f0083dbbd3b7a69b86f68ca7c72409dee5088d913129dae0ada17b3018fa989384553055f491b8684d4a64bbfe965a131 SHA512 ec7c7e0c0118332eff213066a74699d91803317b3a06a1f4d28eebd50d0103dc2baa786747cf9feb901c94ee3e387afcb1680c088be53ef12040467ecadeac5f
 EBUILD hpssacli-3.40.3.0.ebuild 1824 BLAKE2B 97784741cdcee9cd8228a6f87fce6c25058f727feea5067413482fabf520e116b22cfbe953d7b63185c9247e4fdf6a5bbce7336994f94bc00617e6d22242e7c3 SHA512 0748ef6142865d403851e82852ddbe041386d9900fb7ec73924b66b7a520705bec7a48a0abc510ddaf08b4b34d4f0113e9e0848e93c7bd974a53bf60c7062b0c
 EBUILD hpssacli-4.21.7.0.ebuild 845 BLAKE2B 5b6daabba59f0bcd28bf752d1fb43c6a2a94c7077debb4c57debf4d28635945052949f59039bbc92b34e145d0f8bd53c2a24c5cff7c104259118240c2de454db SHA512 48722a44c23204b6b4a6a05fa63a2cbc3d35fccd4de263d2d2e89fafd85efbe36e693659dcf0990bf5c05fcc1e11a663f2ef1fcb4bd867bb83ea2281aba329d7
 EBUILD hpssacli-5.30.6.0.ebuild 953 BLAKE2B 0b58af75ee392a0ed4f8ec4e342f4eadba35b73fa0f029ea3b5504946ad7537b8c69ad3b5c7e4c11259879e08450c45b856adbca1cd68f544f2e79dfe46d1efe SHA512 1c2c4bff91e3e84eb57cc96f827fa1461799968afef8b6bc0565f68bee25ef746e2502bf46273d3b88a0edd0fa67ba8769c84f88b810c5e8222ec07116b5c185
+EBUILD hpssacli-6.10.14.0.ebuild 965 BLAKE2B 61ae2d6cdd617a0d62a89e11cc65e577b28dd5f8cf23088ed5010333466b5fa37c50b608e70dbdf5ab0c6de647d464fc576419d734a91def261f81eeedf5d6f2 SHA512 4c5d757edef246a67b59c557b1d5a18bf12b6e3516d0bd724261fe99ed4bab8fd6c8291a6350239020725ef651a0733438d194167c6471167baa7098a55d72dc
 MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/sys-block/hpssacli/hpssacli-6.10.14.0.ebuild b/sys-block/hpssacli/hpssacli-6.10.14.0.ebuild
new file mode 100644
index 000000000000..45a073f0681d
--- /dev/null
+++ b/sys-block/hpssacli/hpssacli-6.10.14.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)"
+HOMEPAGE="https://support.hpe.com/connect/s/softwaredetails?language=es&softwareId=MTX_95c2c88d976c467ab58c30279f"
+SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v211181/ssacli-${MY_PV}.x86_64.rpm"
+
+LICENSE="hp-proliant-essentials"
+SLOT="0"
+KEYWORDS="-* amd64"
+
+S="${WORKDIR}"
+
+RDEPEND="sys-libs/glibc"
+
+QA_FLAGS_IGNORED="
+	usr/sbin/ssacli
+	usr/sbin/ssascripting
+	usr/sbin/rmstr
+"
+
+src_install() {
+	local -r ssacli_bindir="opt/smartstorageadmin/ssacli/bin"
+
+	dosbin "${ssacli_bindir}"/ssacli
+	dosbin "${ssacli_bindir}"/ssascripting
+	dosbin "${ssacli_bindir}"/rmstr
+
+	dodoc "${ssacli_bindir}/ssacli-${MY_PV}.x86_64.txt"
+
+	gunzip usr/man/man8/ssacli.8.gz || die
+	doman usr/man/man8/ssacli.8
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 406d4139b355..5b929fee4801 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index b70b5d2eac71..da285316610e 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,6 +1,2 @@
-AUX 249-libshared-static.patch 881 BLAKE2B 436aa658b7f24cafad5126c5ce867508639e876a35168fa834591646dfbff6c8132348d33298d47627e1497d41be2ed1b73c288a2c0d504d2687dbdbc3f8a38b SHA512 5bb94984cddc26f35bec6edd02c7574ebd851e45efe551454d4372174ba2bca86c92c7be71936ddce4c2792886395467354e976a6a1f6e1505e95ba464a9466f
-AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
-DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
-EBUILD systemd-boot-249.9.ebuild 2866 BLAKE2B e769da9ec703348ef505df75cf9f2e1f308e8875c01022efc5dd8f9e8edde39c07d33851f91ad1bbbe3831901010d2c4a9d4ea9b4e4adf709cc14f06986faeaf SHA512 fc16cf363ff03778a5109952ca8110d41e5cfa8a241fda47cdaecf75a788e560f1ceec22427d9e8cb63adb95339a365f5087308c642a474c70fd2a64b5bec836
 EBUILD systemd-boot-250-r1.ebuild 302 BLAKE2B 6d967192962d2235ae0a635eeee50babfdbb9d0a42f98d226904a1784d75fa67c6d13f0c401666e3d63c5d1fce035f8a557088cf2da39b21be81d0d5a85f0562 SHA512 44036cd593cceda8a87935747c4bfdc003bea875ec98817075546b311dcc431d69e1215e0f0c00becbe992cbf89509a31fac3cd2ce96abbfa17a63a9f49f3b7a
 MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8
diff --git a/sys-boot/systemd-boot/files/249-libshared-static.patch b/sys-boot/systemd-boot/files/249-libshared-static.patch
deleted file mode 100644
index c08e451af9fc..000000000000
--- a/sys-boot/systemd-boot/files/249-libshared-static.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From eac425295227c5deda4536fd647ecf11b643e1ca Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 29 Aug 2021 09:22:33 -0400
-Subject: [PATCH] Link bootctl against libshared_static
-
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 738879eb21..96042b6906 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2150,9 +2150,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
-                 'bootctl',
-                 'src/boot/bootctl.c',
-                 include_directories : includes,
--                link_with : [libshared],
-+                link_with : [libshared_static, libsystemd_static],
-                 dependencies : [libblkid],
--                install_rpath : rootlibexecdir,
-                 install : true)
- 
-         public_programs += executable(
--- 
-2.33.0
-
diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch b/sys-boot/systemd-boot/files/249.9-cross-compile.patch
deleted file mode 100644
index e063d303c7d8..000000000000
--- a/sys-boot/systemd-boot/files/249.9-cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Tue, 21 Dec 2021 20:10:09 +0900
-Subject: [PATCH] meson: fix cross compiling
-
-(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 02495d16c9..c76cab535d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
- conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
- conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
- conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
--conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>'))
-+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
- 
- decl_headers = '''
- #include <uchar.h>
diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
deleted file mode 100644
index 0a48d6771a9b..000000000000
--- a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
-if [[ ${PV} == *.* ]]; then
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> systemd-stable-${PV}.tar.gz"
-	S="${WORKDIR}/systemd-stable-${PV}"
-else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	S="${WORKDIR}/systemd-${PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-boot/gnu-efi-3.0.2
-	sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-PATCHES=(
-	"${FILESDIR}/249-libshared-static.patch"
-	"${FILESDIR}/249.9-cross-compile.patch"
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/725794
-	tc-export OBJCOPY
-
-	local emesonargs=(
-		-Dblkid=true
-		-Defi=true
-		-Dgnu-efi=true
-		-Defi-cc="$(tc-getCC)"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="/usr/$(get_libdir)"
-		-Dsplit-usr=true
-		-Drootprefix="${EPREFIX:-/}"
-
-		-Dacl=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbzip2=false
-		-Delfutils=false
-		-Dgcrypt=false
-		-Dgnutls=false
-		-Dkmod=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlz4=false
-		-Dmicrohttpd=false
-		-Dpam=false
-		-Dqrencode=false
-		-Dseccomp=false
-		-Dselinux=false
-		-Dxkbcommon=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-set_efi_arch() {
-	case "$(tc-arch)" in
-		amd64) efi_arch=x64 ;;
-		arm)   efi_arch=arm ;;
-		arm64) efi_arch=aa64 ;;
-		x86)   efi_arch=x86 ;;
-	esac
-}
-
-src_compile() {
-	local efi_arch
-	set_efi_arch
-	local targets=(
-		bootctl
-		man/bootctl.1
-		man/kernel-install.8
-		src/boot/efi/linux${efi_arch}.{efi,elf}.stub
-		src/boot/efi/systemd-boot${efi_arch}.efi
-	)
-	meson_src_compile "${targets[@]}"
-}
-
-src_install() {
-	local efi_arch
-	set_efi_arch
-	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-	exeinto usr/lib/kernel/install.d
-	doexe src/kernel-install/*.install
-	insinto usr/lib/systemd/boot/efi
-	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.{efi,elf}.stub,systemd-boot${efi_arch}.efi}
-	einstalldocs
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 7dd4fc701fe8..e2c90329484c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index e98483b3471f..73b30d3f96d0 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -31,4 +31,4 @@ DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f
 DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
 EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e
 EBUILD lvm2-2.03.16.ebuild 10055 BLAKE2B 86b12b246425bd349ede5dd62e54bd1251343fffd558ccd3bfb7f5cb246c36f6ec85ca98793ea4c749bdc9c755ee1b54edebf22ddc9dab1ed2a45984ba264828 SHA512 b6bcb929f0d40a87afda4a7e9e60accdf444c32190074bd4942214454d56153d1504dd26a26b37852952574b78f715f0e351a9ac5e217d1c7747d9f5a1230467
-MISC metadata.xml 924 BLAKE2B f8999a0d015771eab5a4f84adac00267d7bd04b5890838e155e75208eb4ba0d8440db090b6fd877c34528fd89fd25bc68051f127a43c75af978f2fedcc9d787a SHA512 670cc840de3818ee976269902fc4ef8e7b57c38960475f702e9340c9e847a2121f92fcd58ea506e2907e4939b5596cdf72207a3a276dcfa1374be14530268c00
+MISC metadata.xml 976 BLAKE2B 62a8892f78c85315386a5d52acbc2eddc957e9dcceba6b762e57a2229f78648a1e5ec3b1adc3eeecda3c0730a23c83ff3e08c4eef374a06cbfef2463fc053115 SHA512 4c058826b51181cd230b813390fd11d30697e2ff352d6af5ba576f30c35703c336c5390663d7aeb6e74203b9d457d45d3079fad88a79d89b21272b07a21f7e39
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index a9013d489689..1f13a2e87d3b 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -18,5 +18,6 @@
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id>
+		<remote-id type="github">lvmteam/lvm2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6feaa459b5c4..fee5580fff16 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,5 +6,5 @@ DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3 SHA512 a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 EBUILD zfs-kmod-2.1.5-r1.ebuild 5580 BLAKE2B aa39c05aefd62f464322515d88ad98c084afcc024c4f5744feafabe1ad3723f701ab37f8d533c564b175b59b09fd0f369c55434a26aa7a8713750d10b850ed6b SHA512 d9e6e7ea21c87d12fd29372eda8d0fd2f6f85c1949278c253762de3cae816f2b145ee374e9835a8938f015ca9dce72e9ae9762012aa3e5bcdf012b1d59f1bed6
 EBUILD zfs-kmod-2.1.6.ebuild 5479 BLAKE2B c7952dfa617b1d8fc6d1705730f220ec36c09d557db27f5747672b3e2efe704216087c8b4ad773515318068a0a9fd54e1b1bd26271db25a943134cf33f79c216 SHA512 f24bb931adf0acbfd825caf404511ea0ce7d95212c0bdc65dd72bc900fabda003562a4701951ab1a7b52d4f802616d239c523457044d01a19a828838ca4c32d3
-EBUILD zfs-kmod-9999.ebuild 5226 BLAKE2B 71b7a19934d71f46912afba91522af071e5ea29144a9b45d0db5d8e683a50240d3a3326639766f05ac765d8c6cb427e2e90474d2f0f846924a943b1103e48040 SHA512 85a8a515135a3275403b8281571c2bcc650dfb3d466321271af1459885c59258460e892b233f1424cbc509fd813722479d278765265fcb788951ec2344c12e00
+EBUILD zfs-kmod-9999.ebuild 5225 BLAKE2B 0b6c54b2421e5e06ee98b85e93f5cb29a5b7ff98aed1a8b76956671646024d567a26f4e306e89eabf2683eb171a95ab892db9294a948c7bff499958ea47bbf9e SHA512 2d4d876c9da7435fc6a791a73f4b3d2f24d44395dafebca39edd3b92af248e69a7d44a89028649f52feb8d199b2771ce6711a5238ed567f5bf7e43a2deef3ecb
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index e0888f5b3a45..8edf8733327b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.19"
+	ZFS_KERNEL_COMPAT="6.0"
 
 	#  increments minor eg 5.14 -> 5.15, and still supports override.
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 038aeb8b5a5b..4742db2e8429 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 89a469e460a3..e1142ea67cad 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -43,6 +43,9 @@ DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7
 DIST genpatches-5.10-159.base.tar.xz 4292244 BLAKE2B f2afd1af247c7c7833787f4fcba41f36793233de4f3c14602afb18b6ebd7ac918ab49f8be4c1f8481cd9f6249992a7cdd7b532df029e436ff7f05780c8671578 SHA512 f8cdf11ffa78229db60eb33134b7648c75b2ea08e9f521126497abd19dcd6aa7b50b638a9ebc61871c249bd2e8f117b2faad96b3d6afed0235f56f25ec073976
 DIST genpatches-5.10-159.experimental.tar.xz 16872 BLAKE2B b80656a9633b29f2f10bf1a95cccb9392a3336c5feaf782286c92c0f13c2f5bd7a0e04b4d3a640d689c7afd2d5991cb935e09a54bbd0cc69a38ea5d9b2c7bb7e SHA512 34b8fa832d77e4398e2f859d4dccd18576a528d28a8c50b87fca8d9c911e65b34b02e38fcf93df5f86412ab3b413260c9d5a63e92a561e81be7b1ad5d33cf527
 DIST genpatches-5.10-159.extras.tar.xz 3868 BLAKE2B 2cd0fc67c5b6f89303e3dcf5492b944eb048623c3ee865521933793af8cc2837d841e5f740035b1ad46a5b2f805f6fa8f1004f824ee3967c545c417e7c3b2513 SHA512 3b5b76c7220c1068ee2d29c48635655af4a227f542a870c3c140f7eea256f3d3e2c3df160c6bf193e595f150c2b51f66818c646af1ba679f94ec0c4086fe8b27
+DIST genpatches-5.10-160.base.tar.xz 4292896 BLAKE2B 23f6fc8d45f13b190f6fcf4532c266550dd186d48b67d8d48b839f683d453394b29c8898abbe730699c52385e28815d9353fec8c2efd8fdccb25d4102f5c2f3d SHA512 0f5ad6a3fad45ffc8ec01d43f02caf872d819e7f5e744207b2f6bebab3ec356e83e5208ac08ef23065ace4a67295621d2a5aa74b1c720f1643311b2819ecce08
+DIST genpatches-5.10-160.experimental.tar.xz 16864 BLAKE2B e095bea1d0b4e65afb1b14ce448ef9b360c86ae11e57afbcc00df59f094b355decf2be6db8cfc00c9954610945b5bdda706ecf5f6b5bdc1d5885e0aadb0d8e94 SHA512 66313f86e42ce5f413b6e0509acba1de6e784265f6ba11e78747a769bd229e81e9de83196502ad6d622729b03b72999c3ac8cc4e0caffcf3d22495cef86b37b7
+DIST genpatches-5.10-160.extras.tar.xz 3872 BLAKE2B 4168fd4f59232f91d3f50faff5bdff7da05e6b0decbfe5fa8b0cf7ac21a083eaec162d0be6422667a2e895b0005ea526ff134a4a353f035b442687716033178c SHA512 2876f3dcaee91cd20d5f41f77e0f375c3548b9d0a988ded464c9a39ca53f3b0ab7eb1f9cbe75b6397106fc48a869131724814cd7d01261d5f511dc3e6c00a3e5
 DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
 DIST genpatches-5.15-78.experimental.tar.xz 5420 BLAKE2B bf4aea35df32ae2a9b936804af40e994b65a91bd8f6d89e86e43c573bfaad5110c42ef30cc78c798d3d61b0e210851105a1fb6265c54361aa4b7f9110caf730c SHA512 5d583b5fa677f69b38a7d7e919fa2633c10faf30b7d6478b06f647fbcacc6a2cd1961a07c59983446fd27e2bf0863107720a714e0ab928a731c450240cd8ee53
 DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
@@ -87,6 +90,7 @@ EBUILD gentoo-sources-4.9.330.ebuild 742 BLAKE2B f08b8f1e4d1402a75d8cbfefe9c0b92
 EBUILD gentoo-sources-4.9.331.ebuild 742 BLAKE2B d6ed761901e2a757a14532208608c54721fa7f39333f7bb3d08a6e9a479d43d2978cfc40867ea3b711266b6cdee0ecd7124c1453b2868e0282d0935c6427865d SHA512 7afa1e07ec2c39d7b880fb35070af650041653f713f1d8ed56d7484114558a9d73bb05fe537ff1a8c6cdaac68b4623defb566f7a41d011a33e23a81dbf6a41e4
 EBUILD gentoo-sources-5.10.149.ebuild 741 BLAKE2B baab5ce976169f3307165030922df507b491967ce5620006e8d32cade5197ef9f0304bbdd0042e52fe6cfde2fd4666f7288651aead223444301e12dda4e66bbc SHA512 054e5c9a4b30fc8c1a39810b8f31ea7fe126b2ccd62204b2d78c3251fd78d1de3e012c31fb6a826353e33590b3532bcc18ff3d9a5bf4f512bc3e857c5fb94fee
 EBUILD gentoo-sources-5.10.150.ebuild 741 BLAKE2B 065a9625b63aff715ceb2a04b62a203086046981d57fc5f8ceaeba58320104d9489fee5d3e5f6b2ddcd4f19c97aa0e72dfa20a9fdee7cef00a6b317147e3c752 SHA512 ca2aa36ba127991f4feb587eeb33b4729c9ce161fe5660a0f601d91a479446bd64fbd8f56b26037abe319c04dfa955f1a8b430e2503aaf4687d7a7eac0fdce7d
+EBUILD gentoo-sources-5.10.151.ebuild 749 BLAKE2B fd82593d1e9d5fac3dd7a95be52dd7beb3b13aa3abbb2b27f367c1ddde5e64a9b502f8bf972c8993f37ccc01ed1615967334d437b8e7543f891b3cff6196906e SHA512 4e3dbc04a0760401ea105b838174d1a23a4ccf1f481e6f60fc81c6238857e7e6323721b2414fae5216d23394b9b0466cc3ab9055579f76c708a5b360b7f37a34
 EBUILD gentoo-sources-5.15.74.ebuild 740 BLAKE2B fb89c3c7a6e33ab5c8fdb37e9ddf9f9c7cfc3c15baf505c5036b14f12d876b497edaba51723ce85283d9734b53ebb84b5ae089e65eacbef748253f7ee7bd78cb SHA512 517c90929232ffa17c783ca4243d7f955a6a19d5da244770d6739596df4929a7ee0462c5cca76565e5287fb35f950c6f1f5a85a905a0acb21787aaa9038cb923
 EBUILD gentoo-sources-5.15.75.ebuild 740 BLAKE2B c86e533cf8dbdded46665e03dc0a4d369a992257f42da69aeb42112bddbf0abc396452149a0ffbfda885e5a3302211d5db6a91f5ee86d21ee0616ec4da184fca SHA512 d8f5e3ca35aeaf2a4a4ef962ec753dd55868f69ab445fcef6095889cc6cccc2df731bbde917fc56cf54106ff0e9a3be5068b4503649c99b08227e6790743a626
 EBUILD gentoo-sources-5.19.17.ebuild 757 BLAKE2B 6e24c356b5467f2d9e34b9b11587f0220b39114945ad8c8523e877ff37527789383a8d88f464ce5aab945d7e43e740d967df9c1c87584972ba85ec29cc49a11f SHA512 14961c8e6525c0fd38e3346ddca99c85782e68ba75aa919e866524a264db853ed2c997741a86a1aa6b7e59eff4e5fa15015f9b9ad933aaf6456e2f2db672dc96
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.151.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.151.ebuild
new file mode 100644
index 000000000000..f044906a6750
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.151.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="160"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index badd80453926..31d86eb2e148 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -5,24 +5,15 @@ DIST genpatches-5.19-1.extras.tar.xz 3772 BLAKE2B 1d418c3d5d328e9704ba10d7483cd5
 DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a14108c86e89d2611e7886459405b743e690b5fa9f682a3e8ad3215c821f4e04552978da0e309be9cb586f0e2fb53c50f SHA512 da56f7e72c400aa149d481fc42651debea9ff90144b4d731dbd167cd5061da63f34b1b4fc937c8a3508f9bcdbbe3b645d25cfa67ce05db1d5c25667214840d9d
 DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
 DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
-DIST linux-5.19-pf1.tar.gz 212145719 BLAKE2B 20264648efeac1589dfc76fc065860d9c7134661dd5ff1bb76996864ec7fee1f3cf6198d76da0d7cb5c1b9ca5fb1cccd2c63bb33e4d5fc9ba012c2cea8a38357 SHA512 eeef1d04add939a7826e7a25f5286606070e508c8ca4817a7e7616f947bdb1684819954d068e45964aa297df105a26dd996ee4662a182b3726010607df98edf7
-DIST linux-5.19-pf2.tar.gz 212143056 BLAKE2B 75f4c627ac88de7d2ab4b62d6b463d6832534e96353819ee1f7b2dc37473fe659dab613908f358824d91605c8223e6c5da49d6ecec7f84f4e56f345c8694d7ef SHA512 36f2381177de874f199d6549425be592aab4b86081d2db33bdb351614a426b3c529e707beef26d57e9d0f9270ad495acd574ab0b89f3f09125b37ee9f052adc0
-DIST linux-5.19-pf3.tar.gz 212207383 BLAKE2B 9630bbefdee791020ee623da621811e614259ed24744dceca851b55f25fc649a62be2f2feb61ad2c081bf8282fcd8ab48118fede042ed08ee4c69433e9b34738 SHA512 45f4f31af66a097b37ba00cb23e1452c80823626f5b0040ae8ed81d084cc329a820272e3a9ecaa54dfefbcc810e03eaf65919173eb99c21d7898a156b801321f
-DIST linux-5.19-pf4.tar.gz 212225287 BLAKE2B e6e96c998336bfd39725f5f7da8e91e12911d2c9c04917665a2b058884f4d2a362aa9c0126d93ebbec60e4d76e58ee7914616015b7a01b0803b680bce50f5256 SHA512 29138616917f890ee3b3d0e4ee5b855236efedf464bea73ba0cdb701882e35112e9757fe183231c063fffdddbddef5e550f345c26446a4af1704e0e661bc55fd
-DIST linux-5.19-pf5.tar.gz 212240899 BLAKE2B dcdd4208335427217662e571c60373559504c0322d8718c22fb72f7d6dca3fbb1d95c9ef1b480938508ae22338d229285b3da5f6c2b0050d7f70d4b792761b0f SHA512 3b0887cf21272c22d3d4e821ec36994af7160ca66b84910c7103d46d72449d3e8c1f8bfdaf1e568111c7c601b61a521bada3f10696b5a27f4f41494b746c76fe
 DIST linux-5.19-pf6.tar.gz 212237665 BLAKE2B 7ecace44c0bff940009fdb1cd8924096cc4cc337688c7d73883a996bc191d40b9589efbca2e30ba413e1516b790ad48be4839f9d48bb8ad5c40d3f8549a63db1 SHA512 7f5e60c20ba577102818139b0eb61fff5d8b2f3ecdcd42e3ad116fdebdfa58da4f08dd151844cd6e1d764aad5f5a2254e4a1c5aad5b3628df9d03911a2cd8e3f
 DIST linux-6.0-pf1.tar.gz 218275822 BLAKE2B bb283adca2398ef3e09a9c02e5a6609f898c765cc322376e5621c736a2b38832e1e13bc53fc3b21b1dae8214bd039ce43be57e97e7b129624124e58cd1123f51 SHA512 e97c449693b5702e18560c86a65dac2022828d2d57a8734a3cd26b304f8c0d5aa5773041701c8bd5a63b31481191b501070ad9d811a08382e8c846517a7930e0
 DIST linux-6.0-pf2.tar.gz 218282377 BLAKE2B 753efa1e2e05255540301f9bbf9aa85eff8eb2c45c9092e9b9e09e288df626c93bab2621af6ee1758631ea7759890dc69a124201bde5151b429885a014cf782e SHA512 faa581fa6d3deda5ee67a82f49e19e7680f134fc198a50bd8a37bbe495c70663bea8e5887615e0d4315ef8086359c9da74fb3ecc222170a06f5b7702f6b2f8da
+DIST linux-6.0-pf3.tar.gz 218344594 BLAKE2B e71a0c0a9bd67f34610a59858c911b5a10c858baad18b18d459f973ce7499d194aebb5d3a8827e50eeab40bcd88e6e22a17903b534f6ef11e62febb0ead8a4b5 SHA512 9e075a088bc85eafaf24426f70ee46291b0e67b295598b20d6fa69e395cc13c41ecd36ef424ad08f3af814af3f3b3ac533e57dd8581ce016825bf6f87ee6aafe
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
-DIST prjc_v5.19-r0.patch 271689 BLAKE2B 6bc109b462670602eba8ccba55cbcf9902402c627e40c62a3a574828847a518d84d35d30e786b2f1edd4365a3eaa3a2b358f20c013bb2789b30804c37fe12d45 SHA512 27011aa6586ca8c7ec953593f68289b437a7ddab841eb5e45dfca1fdfed5ddb59cf0e197703d4c62c2cd792fca9f2c97f341ffc5ee48a9ca3aff26f9505280ba
 EBUILD pf-sources-5.18_p5.ebuild 2797 BLAKE2B c0b8bfafb97b85d6e74fd0eecddd7bc915dd1935001288c9123fe08890e0f82e3c91aff441c2fec3a42e374548b5fc31e616ca72fb3b226eaea0773cac6ea421 SHA512 e88beb6362b6526327c28d8a19e04a10149fead1e12edc2a134aa749bd19dbc89e3e14338c64afc57eeea117b310ad5ffa1e2b26b44fdc32eb60715bf2d1ce8c
-EBUILD pf-sources-5.19_p1.ebuild 2797 BLAKE2B 2d3f13c1225bd222ddeda09b34e19e642db5eddc6ce330f6c371f0b2c9de6edf32e661cd82f86c10bf56003724d7d5e4c13d733bd8d573e49c8b04043cd3ed72 SHA512 5de55fe144ae59111ea58b9f0bd2afa3f7ae370512fb35d6769d524905a1a4274f4b031cc4e36c42eaa383ccc1bcbf29eacc85850841a2734312b0995ba1c9e3
-EBUILD pf-sources-5.19_p2.ebuild 2797 BLAKE2B 2d3f13c1225bd222ddeda09b34e19e642db5eddc6ce330f6c371f0b2c9de6edf32e661cd82f86c10bf56003724d7d5e4c13d733bd8d573e49c8b04043cd3ed72 SHA512 5de55fe144ae59111ea58b9f0bd2afa3f7ae370512fb35d6769d524905a1a4274f4b031cc4e36c42eaa383ccc1bcbf29eacc85850841a2734312b0995ba1c9e3
-EBUILD pf-sources-5.19_p3.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
-EBUILD pf-sources-5.19_p4.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
-EBUILD pf-sources-5.19_p5.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
 EBUILD pf-sources-5.19_p6.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
 EBUILD pf-sources-6.0_p1.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 EBUILD pf-sources-6.0_p2.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
+EBUILD pf-sources-6.0_p3.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-5.19_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.19_p2.ebuild
deleted file mode 100644
index edc3b63a6ddd..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.19_p2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=0
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.19_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.19_p3.ebuild
deleted file mode 100644
index 6122df43812f..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.19_p3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=0
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
-	https://gitlab.com/torvic9/linux519-vd/-/raw/master/prjc-519-r1-vd-test.patch"
-#	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-#PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-PATCHES=( "${DISTDIR}/prjc-519-r1-vd-test.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.19_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.19_p4.ebuild
deleted file mode 100644
index 6122df43812f..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.19_p4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=0
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
-	https://gitlab.com/torvic9/linux519-vd/-/raw/master/prjc-519-r1-vd-test.patch"
-#	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-#PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-PATCHES=( "${DISTDIR}/prjc-519-r1-vd-test.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.19_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.19_p5.ebuild
deleted file mode 100644
index 6122df43812f..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.19_p5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=0
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
-	https://gitlab.com/torvic9/linux519-vd/-/raw/master/prjc-519-r1-vd-test.patch"
-#	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-#PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-PATCHES=( "${DISTDIR}/prjc-519-r1-vd-test.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.19_p1.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p3.ebuild
index edc3b63a6ddd..3f80ddc991c8 100644
--- a/sys-kernel/pf-sources/pf-sources-5.19_p1.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-6.0_p3.ebuild
@@ -28,10 +28,6 @@ SHPV="${PV/_p*/}"
 # Replace "_p" with "-pf"
 PFPV="${PV/_p/-pf}"
 
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=0
-
 inherit kernel-2 optfeature
 detect_version
 
@@ -40,15 +36,12 @@ HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
 	https://dev.gentoo.org/~mpagano/genpatches/"
 SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
 	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 S="${WORKDIR}/linux-${PFPV}"
 
-PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-
 K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
 	see: ${HOMEPAGE}."
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 68432d3af22f..1c97eb05c04d 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index b4c83e9bc884..1027f8b581f5 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Compress-Raw-Bzip2-2.101.0-r1.ebuild 544 BLAKE2B 59cb2334b18918ce83a388108cfb6479623baf8f35ada5990cd6ce6cb381fbb6c27434e0045b2bc5baca804922612e4a1ca40bb756d794aa7973e63f17e4cd76 SHA512 283ec789a70c2fa0e5b80618539d23e2aec08accc013e42ce6444b5a91b9db1611f6cfacb94383636aa08e7608d898d39139538bdb9ffa994810fa4583c6bc62
-EBUILD perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild 553 BLAKE2B b32810f76942f91563ba30d1b8dd22ec07c46c9e459d183d38d0976429f036a6b9c9611add73f7be1944dbf0d7872eb5baa752dc8314ff72639b4f74b34e74ab SHA512 f0c9cc9c8af375dbb3078ed2afc334682c00459dc4ec757d9496ca8dada2c4be4dc02cbdfa5ebf1b0b9ca0069fca3e41527385c9e15d51a24d7cfdaeafb6d077
+EBUILD perl-Compress-Raw-Bzip2-2.103.0-r3.ebuild 553 BLAKE2B 9b876961637ae08d5c7760bebcb89b5d4801d23136ca943e8fddee8a137323f80fd69d654f1601ec389ceb48fd4b4149b29c1da4a03049441daf8b6e70303306 SHA512 cd89be19b502fb0a928b99f85958a3f52c00c739beef02f4ff5fc3cbe4215e96bfca2daf81007a513cfd1dc79bd505aa2d4558d4072cde976fea61635c1fdf0e
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0-r1.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0-r1.ebuild
deleted file mode 100644
index 91783b7ea3ba..000000000000
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( ~dev-lang/perl-5.34.0 =dev-lang/perl-5.34.1 ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r3.ebuild
index 13cde306ef1d..0670e386c0b8 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r3.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.36* =dev-lang/perl-5.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.36* =dev-lang/perl-5.34.1-r4 ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 3f59fe07a984..5eaa03485414 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,6 +1,2 @@
-EBUILD perl-Compress-Raw-Zlib-2.101.0-r1.ebuild 544 BLAKE2B 59cb2334b18918ce83a388108cfb6479623baf8f35ada5990cd6ce6cb381fbb6c27434e0045b2bc5baca804922612e4a1ca40bb756d794aa7973e63f17e4cd76 SHA512 283ec789a70c2fa0e5b80618539d23e2aec08accc013e42ce6444b5a91b9db1611f6cfacb94383636aa08e7608d898d39139538bdb9ffa994810fa4583c6bc62
-EBUILD perl-Compress-Raw-Zlib-2.103.0-r1.ebuild 532 BLAKE2B 0fe458c05766be2861c2724de4bd09ef3971f1860266fbae1ea7e0c169847bcc23ddef36d4b44b1c84a988207ab927f0d9f09c0259beee131c58a91829e49942 SHA512 d35b1a59841f0bfb2229356915cababf325e4a2a2ea58b9a993d4f972ab7a2dd59bb8ed9e8385edf6503303249346e3b2e6ac0e30fcdb042bdb2ec98c6f7c27b
-EBUILD perl-Compress-Raw-Zlib-2.105.0.ebuild 536 BLAKE2B 6d0dd3ed17890340518416594b6e5277fb0c63dc60204f259f3abef0f3bf003c3dd0a51a5e937150ae5696dcb92fa966e80a19e0336dbf10a9ad9adb8ee8add3 SHA512 4faf85dae4fa8fa59cde84b02690be17f635ec5237c1c0142d26d585678a5634c376746b84bff18e67b8d15c1c67b584ca62835e330cb4ab62abef8d2afa9f41
-EBUILD perl-Compress-Raw-Zlib-2.201.0.ebuild 508 BLAKE2B 370b08f4893edd195b4dbdf62b8b9118d7817323ef7cfbf8242dbfb6749eb72adff01fc67fc4866a746167257cea7e551facb39b738ee0e9dee8ae1b86c3d331 SHA512 cebc681869f4657f1f2fc8c09d9c7112fd3819486f51b3bc30d46e2d1c44aa62ccf8984354f03b9cd0dcf49696cfbfa53592a542bbd64e4c16e52a710686dcb2
 EBUILD perl-Compress-Raw-Zlib-2.202.0.ebuild 500 BLAKE2B a33f43a90147410c5a5c653a48a6f2c0448b6da6e2a64f6c699a695bfdfedece2a0473ad81e1709ef52111d5f0547a614e4a6cc2a82e8851f32e7dc2d292d118 SHA512 4cba01e7e935dec9cd8ada1f21faa0059b868c15b6ba2d5f037d1122011d9d002c004a1c6af4faa2fd4eeec6a0b5a319ea294e40667fc2ff3bafea82db921cd9
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0-r1.ebuild
deleted file mode 100644
index 91783b7ea3ba..000000000000
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( ~dev-lang/perl-5.34.0 =dev-lang/perl-5.34.1 ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
deleted file mode 100644
index 5735af29b013..000000000000
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.105.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.105.0.ebuild
deleted file mode 100644
index b7a2344e8422..000000000000
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.105.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.36* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.201.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.201.0.ebuild
deleted file mode 100644
index 5eb3fbc0be32..000000000000
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.201.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	~perl-core/${PN#perl-}-${PV}
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index 4876b1b89d6f..75bbdbd1ea51 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,5 +1,3 @@
 EBUILD perl-Encode-3.120.0.ebuild 433 BLAKE2B 29540fa9be17a6368590636cc59b9ed281803048e7eb0944b8daa8212cd23edf1a88c72f4a8e793af82c4695c42f1ff2a9ffded6a1f971120a45b395c15eb6c6 SHA512 bf3b09e9e212144ccfe10bbdca54e5a59850cbeb1cdaf71d366c2dce42ce37a8a1947405d8af50a70eb1876b46ab974a095baeee92fc91e553e8f5b1fb7d8729
 EBUILD perl-Encode-3.170.0.ebuild 536 BLAKE2B 6d0dd3ed17890340518416594b6e5277fb0c63dc60204f259f3abef0f3bf003c3dd0a51a5e937150ae5696dcb92fa966e80a19e0336dbf10a9ad9adb8ee8add3 SHA512 4faf85dae4fa8fa59cde84b02690be17f635ec5237c1c0142d26d585678a5634c376746b84bff18e67b8d15c1c67b584ca62835e330cb4ab62abef8d2afa9f41
-EBUILD perl-Encode-3.80.0-r1.ebuild 523 BLAKE2B 0cc8bf0ed05076b27c298e3104a249eaa8326e45df195d16bdc05e5e185c229763937c79bdc0c307ee491820c5f62448be1e589aca6ec6d8c25d9e8c58cf7493 SHA512 9f6c247577d11965b44f0721205b55fee8a1028da52b980373660a4795c8feaa53028d42c6ed69ebd5aa75aff107326b8ce2fef92f76c1a752b04dfd09f25255
-EBUILD perl-Encode-3.80.100_rc.ebuild 538 BLAKE2B 28870596e78555547bfdab43e664bcc09b41824e96b5ec2303b9d595ebd318181b1b13910a657af8c8a165b503536f83094f1ac7c5e6d4786282f775ad415e08 SHA512 5429831b2ec037690b60ead188c8e5493f8e3ef1a6e34e7d891490d372bc5701d77bec6fbf6123b0f61609bb01607c81c7ad05f751bd6c29200563b31bc8e43c
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Encode/perl-Encode-3.80.0-r1.ebuild b/virtual/perl-Encode/perl-Encode-3.80.0-r1.ebuild
deleted file mode 100644
index 67265b5945f1..000000000000
--- a/virtual/perl-Encode/perl-Encode-3.80.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.34.0* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Encode/perl-Encode-3.80.100_rc.ebuild b/virtual/perl-Encode/perl-Encode-3.80.100_rc.ebuild
deleted file mode 100644
index 5ad6ebcaa73b..000000000000
--- a/virtual/perl-Encode/perl-Encode-3.80.100_rc.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.34.1* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index 6ab0d56024fb..4fc64bddacf4 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-IO-Compress-2.102.0-r1.ebuild 731 BLAKE2B 8daed2d1f2da5cd729cf653bcf9175b55b625e0adf70fc554473ab62d47f8a6ed7439c78ecf910e3af8f76450851c64fb82d273fc37751d535f50169781301b1 SHA512 8ef6b8089ca54baab2e2f44b226eb4d463c4b562398a3dc9e15b02827778100e1848b681e1e6b1414cd083e9518a3f2975aae1771b059fc742075e8f19d18599
-EBUILD perl-IO-Compress-2.103.0-r1.ebuild 715 BLAKE2B 56b39b8a1045c246b173d51adcf5c4e77232fde4b107628cba497ceedd2e28fb39f435dbbb3156539aa68aa8581b731ddcd67a549a8ec59c2dce092430d970c9 SHA512 e50880ac385e5fd6d121522e476458fa40a551f965eda4d11ebff5efe8f65d7e7a03548f52f81c17c770e822fb98715d33b600a96b5d8a4cc535628486f42bf2
+EBUILD perl-IO-Compress-2.103.0-r2.ebuild 715 BLAKE2B b7c85340aad6627fa06393224a19791bd86bb50830b1cd48ffb293fd24ec5c1cda58ee898934799385af946dc02dcea2a5b5208b357823024d60bf20c1ea9eb1 SHA512 e4b39589bf99038181464f3e271572a1ca2f952426688b755f69ff4c5bddf3f1bec5c87dc51ee4f9d418aa8994a25a9af3a4a2db374cc8fd7c26caa30d714705
 EBUILD perl-IO-Compress-2.106.0.ebuild 723 BLAKE2B fbddca40057c5cc4bc520f777b022928988636c3bb3fc21b95db3dd278797d30f0185b72a6578891d5d13b9100acadb10e85ae3e8c2a7e21c42fd94e0f680d7e SHA512 bddc65d984534b2627ad33848d6da630d1acdab05657112063361450850c37e6a09ecf0758fb413699d9256cf9985bb6b5627e6bc3b7e684c55687b14599dec2
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0-r1.ebuild
deleted file mode 100644
index abf408750850..000000000000
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0-r1.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
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( ~dev-lang/perl-5.34.0 =dev-lang/perl-5.34.1 ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-	>=virtual/perl-Compress-Raw-Zlib-2.101.0
-	>=virtual/perl-Compress-Raw-Bzip2-2.101.0
-"
-# Dependencies on Compress-Raw* must be kept in step
-# but sometimes not .... use ${PV} when you can.
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r2.ebuild
index 220590b04d6b..ed8b41974b90 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r2.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.34.1-r4 ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index 9cbbf394cacb..b1b548fe472f 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Module-CoreList-5.202.105.200.ebuild 643 BLAKE2B 61ffb8d64b14d242d084417e8f6da66ec3feb7e4411f14793597087a05ceb18ec368729af4fabba6e36c70cb85291715d54e7decb5d364bc7b5e258002d7750f SHA512 2d07a943e6b9ccaecc505271a3865e44854ca4ba7b98a351a22863d0a631e7a66bdefc25e2165614a8cb72c6a871208de9d5c8ee6302509a17df2f3aa5f0bee2
 EBUILD perl-Module-CoreList-5.202.203.130.ebuild 650 BLAKE2B fefee5df50d1650d493bc701ebe32cdaa168618bc3510d02ba8e2f68f263f38198c6e5cc7c02791b795c559c08f56fb9fbf8bdb246b90115312055b57c18adec SHA512 d6089fa5d39fb64ac87ade301d1aaeea1e0179b635a870bff48c5e76c785ca09f701cfcc84c1167646ec4e83405edf0018a36bcf9178bb752840ccfc4f84c5b3
 EBUILD perl-Module-CoreList-5.202.205.200-r1.ebuild 658 BLAKE2B a32ce62d26445c067433a4b7395e0745340f9327cfed0ac9c97f5902691bbbf23f5b15e416e88dca2594910a9280282a2f064f943c2f7b55d0ef922f24e3f187 SHA512 67901c39979662959626eda8898b6ed9b160760de9292161988b4c367ff7928803b6bdaff3dfa38bd4eefbdb6762d0aacc7a2227b74b062e874fd7befaf59914
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
deleted file mode 100644
index 5e12470c2f0f..000000000000
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
-# When bumping this package.
-RDEPEND="
-	|| ( =dev-lang/perl-5.34.0* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 0aa6bcb1c00c..94bf5f715f8f 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 51b1514e4c6e..ae5d8d9bc137 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -3,6 +3,6 @@ AUX elinks-0.15.1-no-mouse-build.patch 1363 BLAKE2B 226f194389aa48520089c62a15c9
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
 DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
 EBUILD elinks-0.13.5-r100.ebuild 3790 BLAKE2B 776e05d0e117f418c3a6b287e458b7fc928769516b1212518c369f2f3c8fd060ae8650dfec516dde7181ae8baa03f607d4b67732af5c629e6c60b5dd856ef7e3 SHA512 e05697df2ea94642e0a5cc8a970b4a52e2bd50b4013d4db0f2dc8b6d9337f2dd8416fc4a1f8ae7e8cefc4087c595014d3a772c1344e08cac8a793808bd1badcc
-EBUILD elinks-0.15.1-r1.ebuild 3967 BLAKE2B b6ee6fb00cf947c9cd88483e50e5b21e6acc8d32d5fa1f73ef4b8137bf893ccc6ae38ff31663e3b2878b04308094bc01461d9c2c9d9ceef2531ce82ecb34fb9f SHA512 8af45854ecb80577b5835ae4af724ca6f205e0ec6cc557cab1aefcc213d8c6ef2e75b400ba455937e974aad548e655cfbf53c53718086d9dc0f267b4f92ce441
+EBUILD elinks-0.15.1-r1.ebuild 3978 BLAKE2B 4f63ecb1b0014efaa34dd4ecac26df07b05e6e4d35a1cf71c4e5e957b4bf1d192875b108626730044aed00e96a6b965159d392433e3b591a7d7755c2b7052477 SHA512 3b2fe6c3bb9b56f9ecfe46f6b4b7e5ae5f779abb76747e67d303879edd91d31c6ca2237245b14683c969f4e2c87126ee2d9d41a2cbd90a5f8c31cbf187159130
 EBUILD elinks-9999.ebuild 3913 BLAKE2B 8aec699ce63d79d01874c1df8560e28b2f6ca92d1499f8a41c92aaa68d8e75d056273d4db8d3ba86503067bfefc961fd8b4f1481d1f4b8bee3886d0d53448346 SHA512 3c7c939b3b77df70d98f8ff2e55e7d1ab6bff5240cf9b5a3adba8f6872937598db928c2e862d278e855b81beacd1bb8239056bdae63b49946abf36f09d11a517
 MISC metadata.xml 1005 BLAKE2B 1e40dd6ba072df609a2ec93e5ae5af079137e19d38b058df45dbe63e4ecfb6facc9d89a206991713616d9c0671eece6ebbe8eeaa9e4c284e982bada17c149570 SHA512 432636be610931a5087b3ebcf70d250b212b8c4f7c236679a2a5207996393329b3db31432228fa6ac2e2fd8348d8e2c04dba9b817526ecbe314276f55e0dfe2e
diff --git a/www-client/elinks/elinks-0.15.1-r1.ebuild b/www-client/elinks/elinks-0.15.1-r1.ebuild
index 655204af0f0f..1ce0f06489b9 100644
--- a/www-client/elinks/elinks-0.15.1-r1.ebuild
+++ b/www-client/elinks/elinks-0.15.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-LUA_COMPAT=( lua5-{1,2} )
+LUA_COMPAT=( lua5-{1,2,3,4} luajit )
 
 inherit meson lua-single python-any-r1
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 287831db68c0..f9d5aa5f4784 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index f63459b56a19..da1d45ce8867 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,7 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
 DIST mozo-1.24.1.tar.xz 231032 BLAKE2B 27938aca9810943d19074cc5761ac58bb1dc2c1918b2fefea983f7a1b8788cb555311555515bb4387944c7b48a309de4a80da9003d212ca68ea257fa9ab06c8d SHA512 04b7e93e7302b46a3959f78655de4a6f8b17896be2c506c0e8a9041a9a2d5247e8c2ac00b5c8f86616f6c39a533584923feacfe4b81ae58d41080632af2a24bd
+DIST mozo-1.26.1.tar.xz 242836 BLAKE2B 59047b087e531792c0e831779d06a2dc7d9d2709bef7a7c8ba4a21d6f9fe1a79f917e2ba4e4912d655ad94391c0f7789e6ad6394be1a7bcb482881781f81c9ff SHA512 8570db4719d88bb34269a23acaa63638c5b7e50bf840bca73db718040c9d585670f1fd3be128c51ff22b4314f59dad6050907db8ce60bb506e4d46c3f807707e
 EBUILD mozo-1.24.0-r1.ebuild 1310 BLAKE2B a335916b37a5948cd10f85394b8e556df823ce0ff67c8baabc18e64493bcf72f60e6cb21ba27d23d2812452646dfab138ea93dd690e7d920502208da49ee737c SHA512 94d4ab540b5aa03028bbf68512b254785f0cbc8079718c9aa847b009080bf72ea22ff59f1084052b1032f8d12abf5d8eda5e3e24bb8142de23795182ddb27569
 EBUILD mozo-1.24.1.ebuild 1339 BLAKE2B bc9be46005376f8a4e725b5ed56d8b6c36b294ce675b8400325df847b479112f524d7ca6c3a8078b5e7bf7f9db80a81114b16e63205374d5854a710e15bab7b2 SHA512 7c6893c10bf218fdc4947e6ee736cb6836311b99cecfc2fa7db317f09816c23a41bf07d3673870366c2dd21ed7c9ce1e43908e8826365a85a562857d91f274eb
+EBUILD mozo-1.26.1.ebuild 1286 BLAKE2B df73dac5e3f77e7b95d6e22d97acad3fc8e6d1f1ddd3bece9875021f8df516be92c60b093b6bb7efd592b6116cb1b520eeb0148c7d649bc21435d2e2052ff08d SHA512 99c637f236e8e9538064e6239e1242c094bd4b498de2b3c1c22d77467c9e8d25b0269e2e82c2e70421062993d2deb1bf0debf777dc31e05359f333c8086fa9c3
 MISC metadata.xml 334 BLAKE2B 2d3b282a39f97386fb0986f460903c132a59464c1f408bcf1e081198aa07ff38cdd50fe460d2bb20a2dd17ccd6a6d7e49b31d5615b892591466a019001bd5727 SHA512 d04ccb64388d150947f281085fe3c70e5285d56518eb6359bb81d533fbaf2a44aee23e2d3f04896bbe15df07a5260a688949ed8505b9c87a857fc0882a425d74
diff --git a/x11-misc/mozo/mozo-1.26.1.ebuild b/x11-misc/mozo/mozo-1.26.1.ebuild
new file mode 100644
index 000000000000..740abab3bffb
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.26.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit mate python-r1
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.21.0[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	!!x11-misc/mate-menu-editor
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+		python_optimize
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-28 15:59:37 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-28 15:59:37 +0100
commit	cf7630078a53ff74b245b148bd722994068e28f9 (patch)
tree	b2410f6c46e821d66a697e1b7e551607357264f0
parent	8eb973cc2247ee4fe34e4d907fdc6cf5b94709e3 (diff)